x86, boot: Support loading bzImage, boot_params and ramdisk above 4G

[karo-tx-linux.git] / arch / x86 / kernel / head64.c

diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 62c8ce44cac437124324bc30cef664969ea157e8..6873b070d72cba1c8aeefb082cf8f7acef835854 100644 (file)
--- 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;
 }