Skip to content

Commit

Permalink
sh: bump up extra LMB reservations in bootmem init.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed May 7, 2010
1 parent 36fa06d commit 080e71e
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions arch/sh/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit 080e71e

Please sign in to comment.