Commit 080e71e1 authored by Paul Mundt's avatar Paul Mundt

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 36fa06d6
...@@ -275,6 +275,12 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) ...@@ -275,6 +275,12 @@ void __init setup_bootmem_allocator(unsigned long free_pfn)
__add_active_range(0, start_pfn, end_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 * Add all physical memory to the bootmem map and mark each
* area as present. * area as present.
...@@ -290,10 +296,6 @@ void __init setup_bootmem_allocator(unsigned long free_pfn) ...@@ -290,10 +296,6 @@ void __init setup_bootmem_allocator(unsigned long free_pfn)
node_set_online(0); node_set_online(0);
sparse_memory_present_with_active_regions(0); sparse_memory_present_with_active_regions(0);
check_for_initrd();
reserve_crashkernel();
} }
#ifndef CONFIG_NEED_MULTIPLE_NODES #ifndef CONFIG_NEED_MULTIPLE_NODES
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment