| From b117fcfd45fa6ec7c8d6075c5f47d9108097e636 Mon Sep 17 00:00:00 2001 |
| From: Matthew Garrett <mjg@redhat.com> |
| Date: Wed, 6 Jul 2011 16:52:37 -0400 |
| Subject: [PATCH] x86: Don't use the EFI reboot method by default |
| |
| commit f70e957cda22d309c769805cbb932407a5232219 upstream. |
| |
| 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> |
| [PG: in 2.6.34, file is x86/platform/efi/efi.c --> x86/kernel/efi.c] |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c |
| index c2fa9b8..0084548 100644 |
| --- a/arch/x86/kernel/efi.c |
| +++ b/arch/x86/kernel/efi.c |
| @@ -459,9 +459,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 |
| -- |
| 1.7.12.1 |
| |
