2 files changed, 7 insertions, 8 deletions

diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index da5b462e6de6..741b99c1a0b1 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -477,6 +477,9 @@ efi_init (void)
         char *cp, vendor[100] = "unknown";
         int i;
 
+        set_bit(EFI_BOOT, &efi.flags);
+        set_bit(EFI_64BIT, &efi.flags);
+
         /*
          * It's too early to be able to use the standard kernel command line
          * support...
@@ -529,6 +532,8 @@ efi_init (void)
                efi.systab->hdr.revision >> 16,
                efi.systab->hdr.revision & 0xffff, vendor);
 
+        set_bit(EFI_SYSTEM_TABLES, &efi.flags);
+
         palo_phys      = EFI_INVALID_TABLE_ADDR;
 
         if (efi_config_init(arch_tables) != 0)
@@ -657,6 +662,8 @@ efi_enter_virtual_mode (void)
                 return;
         }
 
+        set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
+
         /*
          * Now that EFI is in virtual mode, we call the EFI functions more
          * efficiently:
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 214833b4a97d..64d532ca890a 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -660,8 +660,6 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_ARCH_1              6       /* First arch-specific bit */
 
 #ifdef CONFIG_EFI
-# ifdef CONFIG_X86
-
 /*
  * Test whether the above EFI_* bits are enabled.
  */
@@ -669,12 +667,6 @@ static inline bool efi_enabled(int feature)
 {
         return test_bit(feature, &efi.flags) != 0;
 }
-# else
-static inline bool efi_enabled(int feature)
-{
-        return true;
-}
-# endif
 #else
 static inline bool efi_enabled(int feature)
 {