[kernel/f17] Add patch to fix shutdown on some machines (rhbz 890547)

[Josh Boyer]

commit fff6e55c0a807aa5755286e8819cec1cb740a8d8
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Jan 8 08:28:32 2013 -0500

    Add patch to fix shutdown on some machines (rhbz 890547)

 ...ot-use-Lid-and-Sleep-button-for-S5-wakeup.patch |   46 ++++++++++++++++++++
 kernel.spec                                        |   11 ++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch b/ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
new file mode 100644
index 0000000..f6e997c
--- /dev/null
+++ b/ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
@@ -0,0 +1,46 @@
+From b7e383046c2c7c13ad928cd7407eafff758ddd4b Mon Sep 17 00:00:00 2001
+From: Zhang Rui <rui.zhang at intel.com>
+Date: Tue, 4 Dec 2012 23:23:16 +0100
+Subject: [PATCH] ACPI : do not use Lid and Sleep button for S5 wakeup
+
+When system enters power off, the _PSW of Lid device is enabled.
+But this may cause the system to reboot instead of power off.
+
+A proper way to fix this is to always disable lid wakeup capability for S5.
+
+References: https://bugzilla.kernel.org/show_bug.cgi?id=35262
+Signed-off-by: Zhang Rui <rui.zhang at intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
+---
+ drivers/acpi/scan.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index d0b38ab..bd523bf 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -917,8 +917,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
+ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
+ {
+ 	struct acpi_device_id button_device_ids[] = {
+-		{"PNP0C0D", 0},
+ 		{"PNP0C0C", 0},
++		{"PNP0C0D", 0},
+ 		{"PNP0C0E", 0},
+ 		{"", 0},
+ 	};
+@@ -930,6 +930,11 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
+ 	/* Power button, Lid switch always enable wakeup */
+ 	if (!acpi_match_device_ids(device, button_device_ids)) {
+ 		device->wakeup.flags.run_wake = 1;
++		if (!acpi_match_device_ids(device, &button_device_ids[1])) {
++			/* Do not use Lid/sleep button for S5 wakeup */
++			if (device->wakeup.sleep_state == ACPI_STATE_S5)
++				device->wakeup.sleep_state = ACPI_STATE_S4;
++		}
+ 		device_set_wakeup_capable(&device->dev, true);
+ 		return;
+ 	}
+-- 
+1.8.0.1
+
diff --git a/kernel.spec b/kernel.spec
index a1e8d14..ffacf0b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 4
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -793,6 +793,9 @@ Patch21238: don-t-do-blind-d_drop-in-nfs_prime_dcache.patch
 #rhbz 853064
 Patch21239: aoe-remove-extra-bdi_init.patch
 
+#rhbz 890547
+Patch21240: ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1540,6 +1543,9 @@ ApplyPatch don-t-do-blind-d_drop-in-nfs_prime_dcache.patch
 #rhbz 853064
 ApplyPatch aoe-remove-extra-bdi_init.patch
 
+#rhbz 890547
+ApplyPatch ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
+
 
 # END OF PATCH APPLICATIONS
 
@@ -2404,6 +2410,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Tue Jan 08 2013 Josh Boyer <jwboyer at redhat.com>
+- Add patch to fix shutdown on some machines (rhbz 890547)
+
 * Fri Jan 04 2013 Josh Boyer <jwboyer at redhat.com>
 - Fix oops on aoe module removal (rhbz 853064)