[kernel] r19635 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Sun Dec 23 12:07:17 2012
New Revision: 19635

Log:
[x86] Don't use the EFI reboot method by default (Closes: #626022)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/47

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Dec 22 15:10:18 2012	(r19634)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Dec 23 12:07:17 2012	(r19635)
@@ -75,6 +75,7 @@
       + dmi: Feed DMI table to /dev/random driver
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.60
+  * [x86] Don't use the EFI reboot method by default (Closes: #626022)
 
   [ Jonathan Nieder ]
   * megaraid_sas: Backport changes up to Linux 3.0.56 (Closes: #666108)

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch	Sun Dec 23 12:07:17 2012	(r19635)
@@ -0,0 +1,38 @@
+From: Matthew Garrett <mjg at redhat.com>
+Date: Wed, 6 Jul 2011 16:52:37 -0400
+Subject: 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 at redhat.com>
+Cc: Linus Torvalds <torvalds at linux-foundation.org>
+Cc: Andrew Morton <akpm at linux-foundation.org>
+Cc: Alan Cox <alan at linux.intel.com>
+Link: http://lkml.kernel.org/r/1309985557-15350-1-git-send-email-mjg@redhat.com
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+[bwh: Backported to 2.6.32: adjust filename]
+---
+ arch/x86/kernel/efi.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
+index 474356b..899e393 100644
+--- a/arch/x86/kernel/efi.c
++++ b/arch/x86/kernel/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

Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47	Sat Dec 22 15:10:18 2012	(r19634)
+++ dists/squeeze/linux-2.6/debian/patches/series/47	Sun Dec 23 12:07:17 2012	(r19635)
@@ -167,3 +167,4 @@
 + debian/timer-Avoid_ABI-change-from-leap-second-fix.patch
 + bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch
 + bugfix/all/mm-fix-vma_resv_map-NULL-pointer.patch
++ bugfix/x86/x86-Don-t-use-the-EFI-reboot-method-by-default.patch