[kernel] r18093 - in dists/squeeze/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Sep 16 02:22:17 2011
New Revision: 18093

Log:
pm: Fix definition of SET_SYSTEM_SLEEP_PM_OPS used in backported drivers (fixes FTBFS on ia64)

Added:
   dists/squeeze/linux-2.6/debian/patches/features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS-2.patch
   dists/squeeze/linux-2.6/debian/patches/series/37
Modified:
   dists/squeeze/linux-2.6/debian/changelog

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Sep 16 02:07:00 2011	(r18092)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Sep 16 02:22:17 2011	(r18093)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.32-37) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * pm: Fix definition of SET_SYSTEM_SLEEP_PM_OPS used in backported drivers
+    (fixes FTBFS on ia64)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 14 Sep 2011 14:47:36 +0100
+
 linux-2.6 (2.6.32-36) stable; urgency=low
 
   [ maximilian attems ]

Added: dists/squeeze/linux-2.6/debian/patches/features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS-2.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS-2.patch	Fri Sep 16 02:22:17 2011	(r18093)
@@ -0,0 +1,36 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 14 Sep 2011 14:44:42 +0100
+Subject: [PATCH] pm: Define SET_SYSTEM_SLEEP_PM_OPS()
+
+From commit d690b2cd222afc75320b9b8e9da7df02e9e630ca upstream.
+Second try, with #ifdef CONFIG_PM_SLEEP.
+---
+ include/linux/pm.h |   12 ++++++++++++
+ 1 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/include/linux/pm.h b/include/linux/pm.h
+index 3b7e04b..fe277b5 100644
+--- a/include/linux/pm.h
++++ b/include/linux/pm.h
+@@ -213,6 +213,18 @@ struct dev_pm_ops {
+ 	int (*runtime_idle)(struct device *dev);
+ };
+ 
++#ifdef CONFIG_PM_SLEEP
++#define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn) \
++	.suspend = suspend_fn, \
++	.resume = resume_fn, \
++	.freeze = suspend_fn, \
++	.thaw = resume_fn, \
++	.poweroff = suspend_fn, \
++	.restore = resume_fn,
++#else
++#define SET_SYSTEM_SLEEP_PM_OPS(suspend_fn, resume_fn)
++#endif
++
+ /*
+  * Use this if you want to use the same suspend and resume callbacks for suspend
+  * to RAM and hibernation.
+-- 
+1.7.5.4
+

Added: dists/squeeze/linux-2.6/debian/patches/series/37
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/series/37	Fri Sep 16 02:22:17 2011	(r18093)
@@ -0,0 +1,2 @@
+- features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS.patch
++ features/all/pm-Define-SET_SYSTEM_SLEEP_PM_OPS-2.patch