diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/kernel.h | 1 | ||||
-rw-r--r-- | include/linux/memory_hotplug.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index d9725a28a265..5fdbc814c2eb 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -35,6 +35,7 @@ extern const char linux_proc_banner[]; | |||
35 | #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) | 35 | #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) |
36 | #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) | 36 | #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) |
37 | #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) | 37 | #define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a))) |
38 | #define IS_ALIGNED(x,a) (((x) % ((typeof(x))(a))) == 0) | ||
38 | 39 | ||
39 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) | 40 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) |
40 | 41 | ||
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 0a14dad95453..665951ef0390 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
@@ -58,7 +58,10 @@ extern int add_one_highpage(struct page *page, int pfn, int bad_ppro); | |||
58 | extern void online_page(struct page *page); | 58 | extern void online_page(struct page *page); |
59 | /* VM interface that may be used by firmware interface */ | 59 | /* VM interface that may be used by firmware interface */ |
60 | extern int online_pages(unsigned long, unsigned long); | 60 | extern int online_pages(unsigned long, unsigned long); |
61 | 61 | #ifdef CONFIG_MEMORY_HOTREMOVE | |
62 | extern int offline_pages(unsigned long, unsigned long, unsigned long); | ||
63 | extern void __offline_isolated_pages(unsigned long, unsigned long); | ||
64 | #endif | ||
62 | /* reasonably generic interface to expand the physical pages in a zone */ | 65 | /* reasonably generic interface to expand the physical pages in a zone */ |
63 | extern int __add_pages(struct zone *zone, unsigned long start_pfn, | 66 | extern int __add_pages(struct zone *zone, unsigned long start_pfn, |
64 | unsigned long nr_pages); | 67 | unsigned long nr_pages); |