The patch titled
device_suspend/resume may sleep
has been added to the -mm tree. Its filename is
device_suspend-resume-may-sleep.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: device_suspend/resume may sleep
From: Pavel Machek <pavel@xxxxxxx>
This adds warning when someone tries them from atomic context.
Signed-off-by: Pavel Machek <pavel@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/base/power/resume.c | 1 +
drivers/base/power/suspend.c | 1 +
2 files changed, 2 insertions(+)
diff -puN drivers/base/power/resume.c~device_suspend-resume-may-sleep drivers/base/power/resume.c
--- a/drivers/base/power/resume.c~device_suspend-resume-may-sleep
+++ a/drivers/base/power/resume.c
@@ -96,6 +96,7 @@ void dpm_resume(void)
void device_resume(void)
{
+ might_sleep();
down(&dpm_sem);
dpm_resume();
up(&dpm_sem);
diff -puN drivers/base/power/suspend.c~device_suspend-resume-may-sleep drivers/base/power/suspend.c
--- a/drivers/base/power/suspend.c~device_suspend-resume-may-sleep
+++ a/drivers/base/power/suspend.c
@@ -167,6 +167,7 @@ int device_suspend(pm_message_t state)
{
int error = 0;
+ might_sleep();
down(&dpm_sem);
down(&dpm_list_sem);
while (!list_empty(&dpm_active) && error == 0) {
_
Patches currently in -mm which might be from pavel@xxxxxxx are
git-gfs2.patch
libata_resume_fix.patch
git-netdev-all.patch
swsusp-reorder-memory-allocating-functions.patch
swsusp-fix-alloc_pagedir.patch
device_suspend-resume-may-sleep.patch
fix-typo-in-rtc-kconfig.patch
submittingpatches-cleanups.patch
ibm-acpi-documentation-delete-irrelevant-how-to-compile-external-module.patch
network-block-device-is-mostly-known-as-nbd.patch
thinkpad_ec-new-driver-for-thinkpad-embedded-controller-access.patch
hdaps-use-thinkpad_ec-instead-of-direct-port-access.patch
hdaps-unify-and-cache-hdaps-readouts.patch
hdaps-unify-and-cache-hdaps-readouts-fix.patch
hdaps-correct-readout-and-remove-nonsensical-attributes.patch
hdaps-remember-keyboard-and-mouse-activity.patch
hdaps-limit-hardware-query-rate.patch
hdaps-delay-calibration-to-first-hardware-query.patch
hdaps-add-explicit-hardware-configuration-functions.patch
hdaps-add-explicit-hardware-configuration-functions-fix.patch
hdaps-add-new-sysfs-attributes.patch
hdaps-power-off-accelerometer-on-suspend-and-unload.patch
hdaps-stop-polling-timer-when-suspended.patch
hdaps-simplify-whitelist.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
