X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Finternal.h;h=789727309f4d52ae03ce7f687dce1fac6bcfa383;hb=2c6f2db13a2428aa16f54f50232a589ddd5d7d01;hp=5a9a6200e034fb43aad09efe34ac1b2e49825509;hpb=c64768a7d671bcde80bca2aed93f9e07edc069c3;p=~andy%2Flinux

diff --git a/mm/internal.h b/mm/internal.h
index 5a9a6200e03..789727309f4 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -47,4 +47,17 @@ static inline unsigned long page_order(struct page *page)
 	VM_BUG_ON(!PageBuddy(page));
 	return page_private(page);
 }
+
+/*
+ * FLATMEM and DISCONTIGMEM configurations use alloc_bootmem_node,
+ * so all functions starting at paging_init should be marked __init
+ * in those cases. SPARSEMEM, however, allows for memory hotplug,
+ * and alloc_bootmem_node is not used.
+ */
+#ifdef CONFIG_SPARSEMEM
+#define __paginginit __meminit
+#else
+#define __paginginit __init
+#endif
+
 #endif