diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-01-15 14:21:22 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-04 17:16:16 +0100 |
| commit | 3e909599215456928e6b42a04f11c2517881570b (patch) | |
| tree | a3b8608015b94258abc7f5773d8f3a9a5a7c5219 /arch/x86/kernel/setup.c | |
| parent | Linux 3.14-rc3 (diff) | |
| download | linux-3e909599215456928e6b42a04f11c2517881570b.tar.xz linux-3e909599215456928e6b42a04f11c2517881570b.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 06853e670354..3b5d278b7d5b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -926,11 +926,11 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_EFI if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, "EL32", 4)) { - set_bit(EFI_BOOT, &x86_efi_facility); + set_bit(EFI_BOOT, &efi.flags); } else if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature, "EL64", 4)) { - set_bit(EFI_BOOT, &x86_efi_facility); - set_bit(EFI_64BIT, &x86_efi_facility); + set_bit(EFI_BOOT, &efi.flags); + set_bit(EFI_64BIT, &efi.flags); } if (efi_enabled(EFI_BOOT)) |