From 048cf9be3538a64548604556266e5f37ba4e8cea Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 7 May 2010 15:10:42 +0900 Subject: [PATCH] --- yaml --- r: 191704 b: refs/heads/master c: 080e71e13d99d850875c0335c364766162eae7c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/setup.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 991a556a30ae..702f279c1efc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36fa06d6b5ef1874d012c04b23d5b8982b1f8dea +refs/heads/master: 080e71e13d99d850875c0335c364766162eae7c6 diff --git a/trunk/arch/sh/kernel/setup.c b/trunk/arch/sh/kernel/setup.c index 08001729f5ee..e3f0da7b865d 100644 --- a/trunk/arch/sh/kernel/setup.c +++ b/trunk/arch/sh/kernel/setup.c @@ -275,6 +275,12 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) __add_active_range(0, start_pfn, end_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