From: Pavel Machek <[email protected]> This adds warning when someone tries them from atomic context. Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/base/power/resume.c | 1 + drivers/base/power/suspend.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c index 48e3d49..7cb62d6 100644 --- a/drivers/base/power/resume.c +++ b/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 --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c index 6453c25..ece136b 100644 --- a/drivers/base/power/suspend.c +++ b/drivers/base/power/suspend.c @@ -140,6 +140,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) { -- 1.4.2.1 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- References:
- [GIT PATCH] Driver Core patches for 2.6.18
- From: Greg KH <[email protected]>
- [PATCH 1/47] Documentation/ABI: devfs is not obsolete, but removed!
- From: Greg KH <[email protected]>
- [PATCH 2/47] deprecate PHYSDEV* keys
- From: Greg KH <[email protected]>
- [PATCH 3/47] class_device_create(): make fmt argument 'const char *'
- From: Greg KH <[email protected]>
- [PATCH 4/47] device_create(): make fmt argument 'const char *'
- From: Greg KH <[email protected]>
- [PATCH 5/47] Driver core: add const to class_create
- From: Greg KH <[email protected]>
- [PATCH 6/47] sysfs: Make poll behaviour consistent
- From: Greg KH <[email protected]>
- [PATCH 7/47] Debugfs: kernel-doc fixes for debugfs
- From: Greg KH <[email protected]>
- [PATCH 8/47] SYSFS: allow sysfs_create_link to create symlinks in the root of sysfs
- From: Greg KH <[email protected]>
- [PATCH 9/47] Suspend infrastructure cleanup and extension
- From: Greg KH <[email protected]>
- [PATCH 10/47] Suspend changes for PCI core
- From: Greg KH <[email protected]>
- [PATCH 11/47] make suspend quieter
- From: Greg KH <[email protected]>
- [PATCH 12/47] fix broken/dubious driver suspend() methods
- From: Greg KH <[email protected]>
- [PATCH 13/47] PM: define PM_EVENT_PRETHAW
- From: Greg KH <[email protected]>
- [PATCH 14/47] PM: PCI and IDE handle PM_EVENT_PRETHAW
- From: Greg KH <[email protected]>
- [PATCH 15/47] PM: video drivers and PM_EVENT_PRETHAW
- From: Greg KH <[email protected]>
- [PATCH 16/47] PM: USB HCDs use PM_EVENT_PRETHAW
- From: Greg KH <[email protected]>
- [PATCH 17/47] PM: issue PM_EVENT_PRETHAW
- From: Greg KH <[email protected]>
- [PATCH 18/47] updated Documentation/power/devices.txt
- From: Greg KH <[email protected]>
- [PATCH 19/47] PM: update docs for writing .../power/state
- From: Greg KH <[email protected]>
- [PATCH 20/47] PM: add kconfig option for deprecated .../power/state files
- From: Greg KH <[email protected]>
- [PATCH 22/47] PM: no suspend_prepare() phase
- From: Greg KH <[email protected]>
- [PATCH 23/47] PM: add /sys/power documentation to Documentation/ABI
- From: Greg KH <[email protected]>
- [GIT PATCH] Driver Core patches for 2.6.18
- Prev by Date: [PATCH 19/47] PM: update docs for writing .../power/state
- Next by Date: [PATCH 18/47] updated Documentation/power/devices.txt
- Previous by thread: [PATCH 23/47] PM: add /sys/power documentation to Documentation/ABI
- Next by thread: [PATCH 25/47] PM: platform_bus and late_suspend/early_resume
- Index(es):
 |