3 files changed, 11 insertions, 13 deletions

diff --git a/arch/i386/kernel/efi.c b/arch/i386/kernel/efi.c
index dd9e7faafa7c..a1808022ea19 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
@@ -347,14 +347,12 @@ void __init efi_init(void)
                 printk(KERN_ERR PFX "Woah! Couldn't map the EFI system table.\n");
         if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
                 printk(KERN_ERR PFX "Woah! EFI system table signature incorrect\n");
-        if ((efi.systab->hdr.revision ^ EFI_SYSTEM_TABLE_REVISION) >> 16 != 0)
-                printk(KERN_ERR PFX
-                       "Warning: EFI system table major version mismatch: "
-                       "got %d.%02d, expected %d.%02d\n",
+        if ((efi.systab->hdr.revision >> 16) == 0)
+                printk(KERN_ERR PFX "Warning: EFI system table version "
+                       "%d.%02d, expected 1.00 or greater\n",
                        efi.systab->hdr.revision >> 16,
-                       efi.systab->hdr.revision & 0xffff,
-                       EFI_SYSTEM_TABLE_REVISION >> 16,
-                       EFI_SYSTEM_TABLE_REVISION & 0xffff);
+                       efi.systab->hdr.revision & 0xffff);
+
         /*
          * Grab some details from the system table
          */
diff --git a/arch/ia64/hp/sim/boot/fw-emu.c b/arch/ia64/hp/sim/boot/fw-emu.c
index 5a0a7afcfc3a..300acd913d9c 100644
--- a/arch/ia64/hp/sim/boot/fw-emu.c
+++ b/arch/ia64/hp/sim/boot/fw-emu.c
@@ -287,7 +287,7 @@ sys_fw_init (const char *args, int arglen)
 
         memset(efi_systab, 0, sizeof(efi_systab));
         efi_systab->hdr.signature = EFI_SYSTEM_TABLE_SIGNATURE;
-        efi_systab->hdr.revision  = EFI_SYSTEM_TABLE_REVISION;
+        efi_systab->hdr.revision  = ((1 << 16) | 00);
         efi_systab->hdr.headersize = sizeof(efi_systab->hdr);
         efi_systab->fw_vendor = __pa("H\0e\0w\0l\0e\0t\0t\0-\0P\0a\0c\0k\0a\0r\0d\0\0");
         efi_systab->fw_revision = 1;
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index 78d29b79947d..75ec3478d8a2 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -445,11 +445,11 @@ efi_init (void)
                 panic("Woah! Can't find EFI system table.\n");
         if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
                 panic("Woah! EFI system table signature incorrect\n");
-        if ((efi.systab->hdr.revision ^ EFI_SYSTEM_TABLE_REVISION) >> 16 != 0)
-                printk(KERN_WARNING "Warning: EFI system table major version mismatch: "
-                       "got %d.%02d, expected %d.%02d\n",
-                       efi.systab->hdr.revision >> 16, efi.systab->hdr.revision & 0xffff,
-                       EFI_SYSTEM_TABLE_REVISION >> 16, EFI_SYSTEM_TABLE_REVISION & 0xffff);
+        if ((efi.systab->hdr.revision >> 16) == 0)
+                printk(KERN_WARNING "Warning: EFI system table version "
+                       "%d.%02d, expected 1.00 or greater\n",
+                       efi.systab->hdr.revision >> 16,
+                       efi.systab->hdr.revision & 0xffff);
 
         config_tables = __va(efi.systab->tables);