diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-08 18:19:21 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-08 18:19:21 -0500 |
| commit | a8de0be688f565e69ca30f00327b8bc701820c7c (patch) | |
| tree | 4cc783a11e60c1c6645495cf5524e1d2d5f00e86 | |
| parent | 6c08940e0a984b1a1f8e661d65f5b1b8185a79d8 (diff) | |
| download | longterm-queue-2.6.34-a8de0be688f565e69ca30f00327b8bc701820c7c.tar.gz | |
add avoidance of EFI reboot method patch
| -rw-r--r-- | queue/series | 1 | ||||
| -rw-r--r-- | queue/x86-Don-t-use-the-EFI-reboot-method-by-default.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/queue/series b/queue/series index c2b30dd..d97f0fe 100644 --- a/queue/series +++ b/queue/series @@ -80,3 +80,4 @@ sched-rt-Fix-task-stack-corruption-under-__ARCH_WANT.patch rwsem-Remove-redundant-asmregparm-annotation.patch um-Use-RWSEM_GENERIC_SPINLOCK-on-x86.patch x86-Get-rid-of-asmregparm.patch +x86-Don-t-use-the-EFI-reboot-method-by-default.patch diff --git a/queue/x86-Don-t-use-the-EFI-reboot-method-by-default.patch b/queue/x86-Don-t-use-the-EFI-reboot-method-by-default.patch new file mode 100644 index 0000000..d214a93 --- /dev/null +++ b/queue/x86-Don-t-use-the-EFI-reboot-method-by-default.patch @@ -0,0 +1,40 @@ +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 + |