Browse Source

PM: device_suspend/resume may sleep

This adds warning when someone tries them from atomic context.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pavel Machek 18 years ago
parent
commit
bb84c89f94
2 changed files with 2 additions and 0 deletions
  1. 1 0
      drivers/base/power/resume.c
  2. 1 0
      drivers/base/power/suspend.c

+ 1 - 0
drivers/base/power/resume.c

@@ -96,6 +96,7 @@ void dpm_resume(void)
 
 
 void device_resume(void)
 void device_resume(void)
 {
 {
+	might_sleep();
 	down(&dpm_sem);
 	down(&dpm_sem);
 	dpm_resume();
 	dpm_resume();
 	up(&dpm_sem);
 	up(&dpm_sem);

+ 1 - 0
drivers/base/power/suspend.c

@@ -140,6 +140,7 @@ int device_suspend(pm_message_t state)
 {
 {
 	int error = 0;
 	int error = 0;
 
 
+	might_sleep();
 	down(&dpm_sem);
 	down(&dpm_sem);
 	down(&dpm_list_sem);
 	down(&dpm_list_sem);
 	while (!list_empty(&dpm_active) && error == 0) {
 	while (!list_empty(&dpm_active) && error == 0) {