summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-07-28 07:43:02 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-05 04:56:33 +0200
commit10d0643988e976360eb3497dcafb55b393b8e480 (patch)
treefa8f614dd7ab2ffc2f94700451e6c9e6d26c702e /include
parentmemblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK (diff)
downloadlinux-10d0643988e976360eb3497dcafb55b393b8e480.tar.xz
linux-10d0643988e976360eb3497dcafb55b393b8e480.zip
memblock: Option for the architecture to put memblock into the .init section
Arch code can define ARCH_DISCARD_MEMBLOCK in asm/memblock.h, which in turns causes memblock code and data to go respectively into the .init and .initdata sections. This will be used by the x86 architecture. If ARCH_DISCARD_MEMBLOCK is defined, the debugfs files to inspect the memblock arrays after boot are not created. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/memblock.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index c24b27849096..3978e6a8e824 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -149,6 +149,14 @@ static inline unsigned long memblock_region_pages(const struct memblock_region *
region++)
+#ifdef ARCH_DISCARD_MEMBLOCK
+#define __init_memblock __init
+#define __initdata_memblock __initdata
+#else
+#define __init_memblock
+#define __initdata_memblock
+#endif
+
#endif /* CONFIG_HAVE_MEMBLOCK */
#endif /* __KERNEL__ */