aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-05-07 15:10:42 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-05-07 15:10:42 +0900
commit080e71e13d99d850875c0335c364766162eae7c6 (patch)
tree8612d86e668186303044e89ff0a5073dbea6d2c0 /arch/sh/kernel
parentsh: convert initrd reservation to LMB. (diff)
downloadlinux-dev-080e71e13d99d850875c0335c364766162eae7c6.tar.xz
linux-dev-080e71e13d99d850875c0335c364766162eae7c6.zip
sh: bump up extra LMB reservations in bootmem init.
This bumps up the extra LMB reservations in ordering so that they're accounted for prior to iterating over the region list. This ensures that reservations are visible both within the LMB and bootmem context. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r--arch/sh/kernel/setup.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 08001729f5ee..e3f0da7b865d 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -276,6 +276,12 @@ void __init setup_bootmem_allocator(unsigned long free_pfn)
}
/*
+ * Handle additional early reservations
+ */
+ check_for_initrd();
+ reserve_crashkernel();
+
+ /*
* Add all physical memory to the bootmem map and mark each
* area as present.
*/
@@ -290,10 +296,6 @@ void __init setup_bootmem_allocator(unsigned long free_pfn)
node_set_online(0);
sparse_memory_present_with_active_regions(0);
-
- check_for_initrd();
-
- reserve_crashkernel();
}
#ifndef CONFIG_NEED_MULTIPLE_NODES