diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2013-01-24 12:19:55 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-29 15:20:41 -0800 |
| commit | 1b8c78be01203e1c95ec5dfef6db307796fe0bc7 (patch) | |
| tree | 033de5c16064fc080a3eb7c792fb61e193d64058 /arch/x86/kernel/head32.c | |
| parent | 100542306f644fc580857a8ca4896fb12b794d41 (diff) | |
| download | op-kernel-dev-1b8c78be01203e1c95ec5dfef6db307796fe0bc7.zip op-kernel-dev-1b8c78be01203e1c95ec5dfef6db307796fe0bc7.tar.gz | |
x86: Merge early_reserve_initrd for 32bit and 64bit
They are the same, could move them out from head32/64.c to setup.c.
We are using memblock, and it could handle overlapping properly, so
we don't need to reserve some at first to hold the location, and just
need to make sure we reserve them before we are using memblock to find
free mem to use.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-15-git-send-email-yinghai@kernel.org
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/head32.c')
| -rw-r--r-- | arch/x86/kernel/head32.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index 6773c91..a795b54 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -36,17 +36,6 @@ void __init i386_start_kernel(void) memblock_reserve(__pa_symbol(&_text), __pa_symbol(&__bss_stop) - __pa_symbol(&_text)); -#ifdef CONFIG_BLK_DEV_INITRD - /* Reserve INITRD */ - if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) { - /* Assume only end is not page aligned */ - u64 ramdisk_image = boot_params.hdr.ramdisk_image; - u64 ramdisk_size = boot_params.hdr.ramdisk_size; - u64 ramdisk_end = PAGE_ALIGN(ramdisk_image + ramdisk_size); - memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image); - } -#endif - /* Call the subarch specific early setup function */ switch (boot_params.hdr.hardware_subarch) { case X86_SUBARCH_MRST: |
