diff options
authorMatt Fleming <matt.fleming@intel.com>2014-01-15 13:21:22 +0000
committerMark Brown <broonie@linaro.org>2014-08-08 20:21:07 +0100
commitb30449dd456694c746ac83d8f210308e6485ff75 (patch)
parentfe23789ddbdb7e8c8a3da4a5ff40f1a1940146a5 (diff)
efi: Move facility flags to struct efi
As we grow support for more EFI architectures they're going to want the ability to query which EFI features are available on the running system. Instead of storing this information in an architecture-specific place, stick it in the global 'struct efi', which is already the central location for EFI state. While we're at it, let's change the return value of efi_enabled() to be bool and replace all references to 'facility' with 'feature', which is the usual word used to describe the attributes of the running system. Signed-off-by: Matt Fleming <matt.fleming@intel.com> (cherry picked from commit 3e909599215456928e6b42a04f11c2517881570b) Signed-off-by: Mark Brown <broonie@linaro.org> Conflicts: arch/x86/platform/efi/efi.c Conflicts: arch/x86/platform/efi/efi.c
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index a4756ae4dc2e..8aee671ad05f 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -77,17 +77,6 @@ static __initdata efi_config_table_type_t arch_tables[] = {
u64 efi_setup; /* efi setup_data physical address */
- * Returns 1 if 'facility' is enabled, 0 otherwise.
- */
-int efi_enabled(int facility)
- return test_bit(facility, &x86_efi_facility) != 0;
-u64 efi_setup; /* efi setup_data physical address */
static bool __initdata disable_runtime = false;
static int __init setup_noefi(char *arg)