浏览代码

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>
Paul Mundt 15 年之前
父节点
当前提交
080e71e13d
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      arch/sh/kernel/setup.c

+ 6 - 4
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