rpms/kernel/devel linux-2.6-acpi-clear-wake-status.patch, NONE, 1.1 kernel.spec, 1.856, 1.857

[Matthew Garrett (mjg59)]

Author: mjg59

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30802

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi-clear-wake-status.patch 
Log Message:
* Wed Aug 06 2008 Matthew Garrett <mjg at redhat.com>
- Fix reboot after resume on various AMI-bios machines


linux-2.6-acpi-clear-wake-status.patch:

--- NEW FILE linux-2.6-acpi-clear-wake-status.patch ---
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index dba3cfb..130a44b 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -627,6 +627,13 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
 	}
 	/* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */
 
+	/*
+	 * Some BIOSes assume that WAK_STS will be cleared on resume and use
+	 * it to determine whether the system is rebooting or resuming. Clear
+	 * it for compatibility.
+	 */
+	acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
+
 	acpi_gbl_system_awake_and_running = TRUE;
 
 	/* Enable power button */


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.856
retrieving revision 1.857
diff -u -r1.856 -r1.857
--- kernel.spec	6 Aug 2008 18:18:39 -0000	1.856
+++ kernel.spec	6 Aug 2008 18:21:53 -0000	1.857
@@ -572,6 +572,7 @@
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
+Patch392: linux-2.6-acpi-clear-wake-status.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 Patch420: linux-2.6-squashfs.patch
@@ -1050,6 +1051,7 @@
 
 ApplyPatch linux-2.6-defaults-acpi-video.patch 
 ApplyPatch linux-2.6-acpi-video-dos.patch
+ApplyPatch linux-2.6-acpi-clear-wake-status.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1731,6 +1733,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Aug 06 2008 Matthew Garrett <mjg at redhat.com>
+- Fix reboot after resume on various AMI-bios machines
+
 * Wed Aug 06 2008 Jarod Wilson <jwilson at redhat.com>
 - Have kernel-%%{variant}-firmware Provides: kernel-firmware