EFI: warn only for pre-1.00 system tables

We used to warn unless the EFI system table major revision was exactly 1.
But EFI 2.00 firmware is starting to appear, and the 2.00 changes don't
affect anything in Linux.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 7 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
          */