Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc

[~andy/linux] / arch / x86 / boot / compressed / cmdline.c

diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c
index 10f6b1178c683cb1901a0704b25e653f949e0c31..bffd73b45b1f27a4dc6cdd2ab6ee5451cd1bbd0d 100644 (file)
--- a/arch/x86/boot/compressed/cmdline.c
+++ b/arch/x86/boot/compressed/cmdline.c
@@ -13,13 +13,21 @@ static inline char rdfs8(addr_t addr)
        return *((char *)(fs + addr));
 }
 #include "../cmdline.c"
+static unsigned long get_cmd_line_ptr(void)
+{
+       unsigned long cmd_line_ptr = real_mode->hdr.cmd_line_ptr;
+
+       cmd_line_ptr |= (u64)real_mode->ext_cmd_line_ptr << 32;
+
+       return cmd_line_ptr;
+}
 int cmdline_find_option(const char *option, char *buffer, int bufsize)
 {
-       return __cmdline_find_option(real_mode->hdr.cmd_line_ptr, option, buffer, bufsize);
+       return __cmdline_find_option(get_cmd_line_ptr(), option, buffer, bufsize);
 }
 int cmdline_find_option_bool(const char *option)
 {
-       return __cmdline_find_option_bool(real_mode->hdr.cmd_line_ptr, option);
+       return __cmdline_find_option_bool(get_cmd_line_ptr(), option);
 }
 
 #endif