diff options
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 010d125bffbf..8f1a41951df9 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
| @@ -26,11 +26,12 @@ enum { | |||
| 26 | MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE = NODE_INFO, | 26 | MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE = NODE_INFO, |
| 27 | }; | 27 | }; |
| 28 | 28 | ||
| 29 | /* Types for control the zone type of onlined memory */ | 29 | /* Types for control the zone type of onlined and offlined memory */ |
| 30 | enum { | 30 | enum { |
| 31 | ONLINE_KEEP, | 31 | MMOP_OFFLINE = -1, |
| 32 | ONLINE_KERNEL, | 32 | MMOP_ONLINE_KEEP, |
| 33 | ONLINE_MOVABLE, | 33 | MMOP_ONLINE_KERNEL, |
| 34 | MMOP_ONLINE_MOVABLE, | ||
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| 36 | /* | 37 | /* |
| @@ -83,6 +84,7 @@ extern int zone_grow_waitqueues(struct zone *zone, unsigned long nr_pages); | |||
| 83 | extern int add_one_highpage(struct page *page, int pfn, int bad_ppro); | 84 | extern int add_one_highpage(struct page *page, int pfn, int bad_ppro); |
| 84 | /* VM interface that may be used by firmware interface */ | 85 | /* VM interface that may be used by firmware interface */ |
| 85 | extern int online_pages(unsigned long, unsigned long, int); | 86 | extern int online_pages(unsigned long, unsigned long, int); |
| 87 | extern int test_pages_in_a_zone(unsigned long, unsigned long); | ||
| 86 | extern void __offline_isolated_pages(unsigned long, unsigned long); | 88 | extern void __offline_isolated_pages(unsigned long, unsigned long); |
| 87 | 89 | ||
| 88 | typedef void (*online_page_callback_t)(struct page *page); | 90 | typedef void (*online_page_callback_t)(struct page *page); |
| @@ -258,6 +260,7 @@ static inline void remove_memory(int nid, u64 start, u64 size) {} | |||
| 258 | extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, | 260 | extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, |
| 259 | void *arg, int (*func)(struct memory_block *, void *)); | 261 | void *arg, int (*func)(struct memory_block *, void *)); |
| 260 | extern int add_memory(int nid, u64 start, u64 size); | 262 | extern int add_memory(int nid, u64 start, u64 size); |
| 263 | extern int zone_for_memory(int nid, u64 start, u64 size, int zone_default); | ||
| 261 | extern int arch_add_memory(int nid, u64 start, u64 size); | 264 | extern int arch_add_memory(int nid, u64 start, u64 size); |
| 262 | extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); | 265 | extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages); |
| 263 | extern bool is_memblock_offlined(struct memory_block *mem); | 266 | extern bool is_memblock_offlined(struct memory_block *mem); |
