2 files changed, 21 insertions, 2 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index f277184e2ac1..f4bdab1dbf66 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -1100,6 +1100,10 @@ struct boot_params *make_boot_params(struct efi_config *c)
         else
                 initrd_addr_max = hdr->initrd_addr_max;
 
+        status = efi_parse_options(cmdline_ptr);
+        if (status != EFI_SUCCESS)
+                goto fail2;
+
         status = handle_cmdline_files(sys_table, image,
                                       (char *)(unsigned long)hdr->cmd_line_ptr,
                                       "initrd=", initrd_addr_max,
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 850da94fef30..a1f745b0bf1d 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -943,8 +943,23 @@ static int __init parse_efi_cmdline(char *str)
         if (*str == '=')
                 str++;
 
-        if (!strncmp(str, "old_map", 7))
-                set_bit(EFI_OLD_MEMMAP, &efi.flags);
+        while (*str) {
+                if (!strncmp(str, "old_map", 7)) {
+                        set_bit(EFI_OLD_MEMMAP, &efi.flags);
+                        str += strlen("old_map");
+                }
+
+                /*
+                 * Skip any options we don't understand. Presumably
+                 * they apply to the EFI boot stub.
+                 */
+                while (*str && *str != ',')
+                        str++;
+
+                /* If we hit a delimiter, skip it */
+                if (*str == ',')
+                        str++;
+        }
 
         return 0;
 }