diff options
| author |  Matthew Garrett <mjg@redhat.com>
| 2011-07-06 16:52:37 -0400 |
|---|---|---|
| committer |  Ingo Molnar <mingo@elte.hu>
| 2011-07-07 11:35:05 +0200 |
| commit | f70e957cda22d309c769805cbb932407a5232219 (patch) | |
| tree | 550629ad27a8b8d3896fbdce4b9a9848753ee611 | |
| parent | x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup (diff) | |
| download | linux-f70e957cda22d309c769805cbb932407a5232219.tar.gz linux-f70e957cda22d309c769805cbb932407a5232219.tar.bz2 linux-f70e957cda22d309c769805cbb932407a5232219.zip | |
x86: Don't use the EFI reboot method by default
Testing suggests that at least some Lenovos and some Intels will
fail to reboot via EFI, attempting to jump to an unmapped
physical address. In the long run we could handle this by
providing a page table with a 1:1 mapping of physical addresses,
but for now it's probably just easier to assume that ACPI or
legacy methods will be present and reboot via those.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Cox <alan@linux.intel.com>
Link: http://lkml.kernel.org/r/1309985557-15350-1-git-send-email-mjg@redhat.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 474356b98ede..899e393d8e73 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -504,9 +504,6 @@ void __init efi_init(void) x86_platform.set_wallclock = efi_set_rtc_mmss; #endif - /* Setup for EFI runtime service */ - reboot_type = BOOT_EFI; - #if EFI_DEBUG print_efi_memmap(); #endif |