mirror of
https://github.com/torvalds/linux.git
synced 2024-10-28 15:51:43 +00:00
x86_64: do not reserve ramdisk two times
ramdisk is reserved via reserve_early in x86_64_start_kernel, later early_res_to_bootmem() will convert to reservation in bootmem. so don't need to reserve that again. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
4a3575fd43
commit
2b8106a0a3
|
@ -146,6 +146,7 @@ void __init x86_64_start_kernel(char * real_mode_data)
|
||||||
|
|
||||||
reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS");
|
reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS");
|
||||||
|
|
||||||
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
/* Reserve INITRD */
|
/* Reserve INITRD */
|
||||||
if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
|
if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
|
||||||
unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
|
unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
|
||||||
|
@ -153,6 +154,7 @@ void __init x86_64_start_kernel(char * real_mode_data)
|
||||||
unsigned long ramdisk_end = ramdisk_image + ramdisk_size;
|
unsigned long ramdisk_end = ramdisk_image + ramdisk_size;
|
||||||
reserve_early(ramdisk_image, ramdisk_end, "RAMDISK");
|
reserve_early(ramdisk_image, ramdisk_end, "RAMDISK");
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
reserve_ebda_region();
|
reserve_ebda_region();
|
||||||
|
|
||||||
|
|
|
@ -420,11 +420,14 @@ void __init setup_arch(char **cmdline_p)
|
||||||
unsigned long end_of_mem = end_pfn << PAGE_SHIFT;
|
unsigned long end_of_mem = end_pfn << PAGE_SHIFT;
|
||||||
|
|
||||||
if (ramdisk_end <= end_of_mem) {
|
if (ramdisk_end <= end_of_mem) {
|
||||||
reserve_bootmem_generic(ramdisk_image, ramdisk_size);
|
/*
|
||||||
|
* don't need to reserve again, already reserved early
|
||||||
|
* in x86_64_start_kernel, and early_res_to_bootmem
|
||||||
|
* convert that to reserved in bootmem
|
||||||
|
*/
|
||||||
initrd_start = ramdisk_image + PAGE_OFFSET;
|
initrd_start = ramdisk_image + PAGE_OFFSET;
|
||||||
initrd_end = initrd_start+ramdisk_size;
|
initrd_end = initrd_start+ramdisk_size;
|
||||||
} else {
|
} else {
|
||||||
/* Assumes everything on node 0 */
|
|
||||||
free_bootmem(ramdisk_image, ramdisk_size);
|
free_bootmem(ramdisk_image, ramdisk_size);
|
||||||
printk(KERN_ERR "initrd extends beyond end of memory "
|
printk(KERN_ERR "initrd extends beyond end of memory "
|
||||||
"(0x%08lx > 0x%08lx)\ndisabling initrd\n",
|
"(0x%08lx > 0x%08lx)\ndisabling initrd\n",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user