[kernel] r11847 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series

[Maximilian Attems]

Author: maks
Date: Wed Jul 16 18:22:22 2008
New Revision: 11847

Log:
2.6.26 acpi sleep regression patch

fixes kernel #11064, will probably ship soon in stable,
better have it already now to not scare users away.

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/x86-acpi-sleep-x61s.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/x86-acpi-sleep-x61s.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/x86-acpi-sleep-x61s.patch	Wed Jul 16 18:22:22 2008
@@ -0,0 +1,42 @@
+From: H. Peter Anvin <hpa at zytor.com>
+
+fixes regression concering 4b4f7280 see
+http://bugzilla.kernel.org/show_bug.cgi?id=11064
+http://marc.info/?l=linux-kernel&m=121584459809675&w=4
+
+diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
+index 36af01f..130711f 100644
+--- a/arch/x86/kernel/acpi/sleep.c
++++ b/arch/x86/kernel/acpi/sleep.c
+@@ -23,6 +23,15 @@ static unsigned long acpi_realmode;
+ static char temp_stack[10240];
+ #endif
+ 
++/* XXX: this macro should move to asm-x86/segment.h and be shared with the
++   boot code... */
++#define GDT_ENTRY(flags, base, limit)		\
++	(((u64)(base & 0xff000000) << 32) |	\
++	 ((u64)flags << 40) |			\
++	 ((u64)(limit & 0x00ff0000) << 32) |	\
++	 ((u64)(base & 0x00ffffff) << 16) |	\
++	 ((u64)(limit & 0x0000ffff)))
++
+ /**
+  * acpi_save_state_mem - save kernel state
+  *
+@@ -58,11 +67,11 @@ int acpi_save_state_mem(void)
+ 			((char *)&header->wakeup_gdt - (char *)acpi_realmode))
+ 				<< 16);
+ 	/* GDT[1]: real-mode-like code segment */
+-	header->wakeup_gdt[1] = (0x009bULL << 40) +
+-		((u64)acpi_wakeup_address << 16) + 0xffff;
++	header->wakeup_gdt[1] =
++		GDT_ENTRY(0x809b, acpi_wakeup_address, 0xfffff);
+ 	/* GDT[2]: real-mode-like data segment */
+-	header->wakeup_gdt[2] = (0x0093ULL << 40) +
+-		((u64)acpi_wakeup_address << 16) + 0xffff;
++	header->wakeup_gdt[2] =
++		GDT_ENTRY(0x8093, acpi_wakeup_address, 0xfffff);
+ 
+ #ifndef CONFIG_64BIT
+ 	store_gdt((struct desc_ptr *)&header->pmode_gdt);

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Jul 16 18:22:22 2008
@@ -49,3 +49,4 @@
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
 #+ features/all/0001-iwlwifi-Set-monitor-mode-for-3945.patch
 + features/all/xen/tip-x86.patch
++ bugfix/all/x86-acpi-sleep-x61s.patch