diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:11:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-25 08:11:28 +0200 |
| commit | 675c00c3325723751864cc5867d736c58633cf3d (patch) | |
| tree | 1532b10be02615140ab9460a471294f651c4ab88 /include/linux/memory_hotplug.h | |
| parent | 99c12749b172758f6973fc023484f2fc8b91cd5a (diff) | |
| parent | b50694381cfc22dce3a60a291cdae294a5e5777c (diff) | |
| download | cachepc-linux-675c00c3325723751864cc5867d736c58633cf3d.tar.gz cachepc-linux-675c00c3325723751864cc5867d736c58633cf3d.zip | |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index e0e49b5b1ee1..2b0265265c28 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -216,6 +216,9 @@ void put_online_mems(void); void mem_hotplug_begin(void); void mem_hotplug_done(void); +extern void set_zone_contiguous(struct zone *zone); +extern void clear_zone_contiguous(struct zone *zone); + #else /* ! CONFIG_MEMORY_HOTPLUG */ #define pfn_to_online_page(pfn) \ ({ \ |