[kernel/f14/master] Disable asynchronous suspend by default.

[Chuck Ebbert]

commit 63fcde2459a3c8cd6b7960412488df20255b3b14
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Sep 10 10:17:06 2010 -0400

    Disable asynchronous suspend by default.

 kernel.spec                          |    7 ++++++-
 linux-2.6-defaults-no-pm-async.patch |   11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 18b2697..cccddb1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -616,6 +616,7 @@ Patch300: create-sys-fs-cgroup-to-mount-cgroupfs-on.patch
 
 Patch380: linux-2.6-defaults-pci_no_msi.patch
 Patch381: linux-2.6-defaults-pci_use_crs.patch
+Patch382: linux-2.6-defaults-no-pm-async.patch
 Patch383: linux-2.6-defaults-aspm.patch
 Patch384: pci-acpi-disable-aspm-if-no-osc.patch
 Patch385: pci-aspm-dont-enable-too-early.patch
@@ -1195,6 +1196,7 @@ ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch acpi-ec-add-delay-before-write.patch
 ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
+ApplyPatch linux-2.6-defaults-no-pm-async.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1926,7 +1928,10 @@ fi
 # and build.
 
 %changelog
-* Fri Sep 10 2010 Ben Skeggs <bskeggs at redhat.com>
+* Fri Sep 10 2010 Chuck Ebbert <cebbert at redhat.com>
+- Disable asynchronous suspend by default.
+
+* Fri Sep 10 2010 Ben Skeggs <bskeggs at redhat.com> - 2.6.35.4-23
 - nouveau: disable acceleration on nva3/nva5/nva8
 
 * Wed Sep 08 2010 Kyle McMartin <kyle at redhat.com>
diff --git a/linux-2.6-defaults-no-pm-async.patch b/linux-2.6-defaults-no-pm-async.patch
new file mode 100644
index 0000000..7050542
--- /dev/null
+++ b/linux-2.6-defaults-no-pm-async.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.34.noarch.orig/kernel/power/main.c
++++ linux-2.6.34.noarch/kernel/power/main.c
+@@ -45,7 +45,7 @@ int pm_notifier_call_chain(unsigned long
+ }
+ 
+ /* If set, devices may be suspended and resumed asynchronously. */
+-int pm_async_enabled = 1;
++int pm_async_enabled;
+ 
+ static ssize_t pm_async_show(struct kobject *kobj, struct kobj_attribute *attr,
+ 			     char *buf)