diff options
Diffstat (limited to 'include/linux/memory_hotplug.h')
-rw-r--r-- | include/linux/memory_hotplug.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4b08bc947578..01f03bc06eff 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #include <linux/mmzone.h> | 4 | #include <linux/mmzone.h> |
5 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
6 | #include <linux/mmzone.h> | ||
7 | #include <linux/notifier.h> | ||
6 | 8 | ||
7 | #ifdef CONFIG_MEMORY_HOTPLUG | 9 | #ifdef CONFIG_MEMORY_HOTPLUG |
8 | /* | 10 | /* |
@@ -46,6 +48,19 @@ static inline void zone_seqlock_init(struct zone *zone) | |||
46 | { | 48 | { |
47 | seqlock_init(&zone->span_seqlock); | 49 | seqlock_init(&zone->span_seqlock); |
48 | } | 50 | } |
51 | extern int zone_grow_free_lists(struct zone *zone, unsigned long new_nr_pages); | ||
52 | extern int zone_grow_waitqueues(struct zone *zone, unsigned long nr_pages); | ||
53 | extern int add_one_highpage(struct page *page, int pfn, int bad_ppro); | ||
54 | /* need some defines for these for archs that don't support it */ | ||
55 | extern void online_page(struct page *page); | ||
56 | /* VM interface that may be used by firmware interface */ | ||
57 | extern int add_memory(u64 start, u64 size); | ||
58 | extern int remove_memory(u64 start, u64 size); | ||
59 | extern int online_pages(unsigned long, unsigned long); | ||
60 | |||
61 | /* reasonably generic interface to expand the physical pages in a zone */ | ||
62 | extern int __add_pages(struct zone *zone, unsigned long start_pfn, | ||
63 | unsigned long nr_pages); | ||
49 | #else /* ! CONFIG_MEMORY_HOTPLUG */ | 64 | #else /* ! CONFIG_MEMORY_HOTPLUG */ |
50 | /* | 65 | /* |
51 | * Stub functions for when hotplug is off | 66 | * Stub functions for when hotplug is off |
@@ -65,5 +80,25 @@ static inline int zone_span_seqretry(struct zone *zone, unsigned iv) | |||
65 | static inline void zone_span_writelock(struct zone *zone) {} | 80 | static inline void zone_span_writelock(struct zone *zone) {} |
66 | static inline void zone_span_writeunlock(struct zone *zone) {} | 81 | static inline void zone_span_writeunlock(struct zone *zone) {} |
67 | static inline void zone_seqlock_init(struct zone *zone) {} | 82 | static inline void zone_seqlock_init(struct zone *zone) {} |
83 | |||
84 | static inline int mhp_notimplemented(const char *func) | ||
85 | { | ||
86 | printk(KERN_WARNING "%s() called, with CONFIG_MEMORY_HOTPLUG disabled\n", func); | ||
87 | dump_stack(); | ||
88 | return -ENOSYS; | ||
89 | } | ||
90 | |||
91 | static inline int __add_pages(struct zone *zone, unsigned long start_pfn, | ||
92 | unsigned long nr_pages) | ||
93 | { | ||
94 | return mhp_notimplemented(__FUNCTION__); | ||
95 | } | ||
68 | #endif /* ! CONFIG_MEMORY_HOTPLUG */ | 96 | #endif /* ! CONFIG_MEMORY_HOTPLUG */ |
97 | static inline int __remove_pages(struct zone *zone, unsigned long start_pfn, | ||
98 | unsigned long nr_pages) | ||
99 | { | ||
100 | printk(KERN_WARNING "%s() called, not yet supported\n", __FUNCTION__); | ||
101 | dump_stack(); | ||
102 | return -ENOSYS; | ||
103 | } | ||
69 | #endif /* __LINUX_MEMORY_HOTPLUG_H */ | 104 | #endif /* __LINUX_MEMORY_HOTPLUG_H */ |