Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo

[firefly-linux-kernel-4.4.55.git] / include / linux / efi.h

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 42c662729e13537559ac5a9bf9da5f85a0c30124..6c100ff0cae4b6eb886e48530c9f48c858b0f257 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -814,6 +814,7 @@ extern struct efi {
        efi_reset_system_t *reset_system;
        efi_set_virtual_address_map_t *set_virtual_address_map;
        struct efi_memory_map *memmap;
+       unsigned long flags;
 } efi;
 
 static inline int
@@ -900,18 +901,17 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_ARCH_1             6       /* First arch-specific bit */
 
 #ifdef CONFIG_EFI
-# ifdef CONFIG_X86
-extern int efi_enabled(int facility);
-# else
-static inline int efi_enabled(int facility)
+/*
+ * Test whether the above EFI_* bits are enabled.
+ */
+static inline bool efi_enabled(int feature)
 {
-       return 1;
+       return test_bit(feature, &efi.flags) != 0;
 }
-# endif
 #else
-static inline int efi_enabled(int facility)
+static inline bool efi_enabled(int feature)
 {
-       return 0;
+       return false;
 }
 #endif