diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-24 21:00:44 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-25 22:09:40 +0400 |
| commit | 5189c2a7c7769ee9d037d76c1a7b8550ccf3481c (patch) | |
| tree | 29582d23f219fbefe00c216ec8a619ab8bf9996f /arch/x86/include/asm/efi.h | |
| parent | 78bef24e8477653853eb028dfc18471f05e54955 (diff) | |
| download | linux-5189c2a7c7769ee9d037d76c1a7b8550ccf3481c.tar.xz | |
x86: efi: Turn off efi_enabled after setup on mixed fw/kernel
When 32-bit EFI is used with 64-bit kernel (or vice versa), turn off
efi_enabled once setup is done. Beyond setup, it is normally used to
determine if runtime services are available and we will have none.
This will resolve issues stemming from efivars modprobe panicking on a
32/64-bit setup, as well as some reboot issues on similar setups.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=45991
Reported-by: Marko Kohtala <marko.kohtala@gmail.com>
Reported-by: Maxim Kammerer <mk@dee.su>
Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: stable@kernel.org # 3.4 - 3.6
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/include/asm/efi.h')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index c9dcc181d4d1..029189db84de 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -98,6 +98,7 @@ extern void efi_set_executable(efi_memory_desc_t *md, bool executable); extern int efi_memblock_x86_reserve_range(void); extern void efi_call_phys_prelog(void); extern void efi_call_phys_epilog(void); +extern void efi_unmap_memmap(void); #ifndef CONFIG_EFI /* |