summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2010-10-07 00:52:29 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2010-10-12 00:59:01 +0200
commit236260b90dd94516982ad67aa6f5449c4c37db7b (patch)
tree45fc2bc1053e41630f88a1a4c4757bba817f34e8 /mm
parentMerge commit 'v2.6.36-rc7' into core/memblock (diff)
downloadlinux-236260b90dd94516982ad67aa6f5449c4c37db7b.tar.xz
linux-236260b90dd94516982ad67aa6f5449c4c37db7b.zip
memblock: Allow memblock_init to be called early
The Xen setup code needs to call memblock_x86_reserve_range() very early, so allow it to initialize the memblock subsystem before doing so. The second memblock_init() is ignored. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> LKML-Reference: <4CACFDAD.3090900@goop.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/memblock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index 9ad39690a2bd..ae8b06c828c7 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -752,6 +752,12 @@ void __init memblock_analyze(void)
void __init memblock_init(void)
{
+ static int init_done __initdata = 0;
+
+ if (init_done)
+ return;
+ init_done = 1;
+
/* Hookup the initial arrays */
memblock.memory.regions = memblock_memory_init_regions;
memblock.memory.max = INIT_MEMBLOCK_REGIONS;