The patch titled
PowerMac: force only suspend-to-disk to be valid
has been added to the -mm tree. Its filename is
powermac-force-only-suspend-to-disk-to-be-valid.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: PowerMac: force only suspend-to-disk to be valid
From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
This patch adds the .valid callback to pm_ops on PowerMac so that only the
suspend to disk state can be entered. Note that just returning 0 would
suffice since the upper layers don't pass PM_SUSPEND_DISK down, but we
handle it there regardless just in case that changes.
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/platforms/powermac/setup.c | 12 ++++++++++++
1 files changed, 12 insertions(+)
diff -puN arch/powerpc/platforms/powermac/setup.c~powermac-force-only-suspend-to-disk-to-be-valid arch/powerpc/platforms/powermac/setup.c
--- devel/arch/powerpc/platforms/powermac/setup.c~powermac-force-only-suspend-to-disk-to-be-valid 2006-05-25 07:41:55.000000000 -0700
+++ devel-akpm/arch/powerpc/platforms/powermac/setup.c 2006-05-25 07:41:55.000000000 -0700
@@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_
return 0;
}
+static int pmac_pm_valid(suspend_state_t state)
+{
+ switch (state) {
+ case PM_SUSPEND_DISK:
+ return 1;
+ /* can't do any other states via generic mechanism yet */
+ default:
+ return 0;
+ }
+}
+
static struct pm_ops pmac_pm_ops = {
.pm_disk_mode = PM_DISK_SHUTDOWN,
.prepare = pmac_pm_prepare,
.enter = pmac_pm_enter,
.finish = pmac_pm_finish,
+ .valid = pmac_pm_valid,
};
#endif /* CONFIG_SOFTWARE_SUSPEND */
_
Patches currently in -mm which might be from johannes@xxxxxxxxxxxxxxxx are
powermac-force-only-suspend-to-disk-to-be-valid.patch
via-pmu-add-input-device.patch
via-pmu-add-input-device-tidy.patch
git-netdev-all.patch
apple-motion-sensor-driver.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
