diff options
| author | Yinghai Lu | 2013-01-29 05:16:44 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2013-01-30 04:32:33 +0100 |
| commit | ee92d815027a76ef92f3ec7b155b0c8aa345f239 (patch) | |
| tree | a5315ec33bba27ada3247e7e045912827f05a5e1 /arch/x86/kernel/head64.c | |
| parent | x86, kexec, 64bit: Only set ident mapping for ram. (diff) | |
| download | kernel-qcow2-linux-ee92d815027a76ef92f3ec7b155b0c8aa345f239.tar.gz kernel-qcow2-linux-ee92d815027a76ef92f3ec7b155b0c8aa345f239.tar.xz kernel-qcow2-linux-ee92d815027a76ef92f3ec7b155b0c8aa345f239.zip | |
x86, boot: Support loading bzImage, boot_params and ramdisk above 4G
xloadflags bit 1 indicates that we can load the kernel and all data
structures above 4G; it is set if kernel is relocatable and 64bit.
bootloader will check if xloadflags bit 1 is set to decide if
it could load ramdisk and kernel high above 4G.
bootloader will fill value to ext_ramdisk_image/size for high 32bits
when it load ramdisk above 4G.
kernel use get_ramdisk_image/size to use ext_ramdisk_image/size to get
right positon for ramdisk.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Rob Landley <rob@landley.net>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Gokul Caushik <caushik1@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Joe Millenbach <jmillenbach@gmail.com>
Link: http://lkml.kernel.org/r/1359058816-7615-26-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/head64.c')
| -rw-r--r-- | arch/x86/kernel/head64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 62c8ce44cac4..6873b070d72c 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -116,6 +116,8 @@ static unsigned long get_cmd_line_ptr(void) { unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr; + cmd_line_ptr |= (u64)boot_params.ext_cmd_line_ptr << 32; + return cmd_line_ptr; } |