diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-24 19:38:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-24 19:38:25 -0700 |
| commit | 93c32483808c5d82c9bd1eef2208854a6d1326db (patch) | |
| tree | fd8190ca7ce4b210f4e9fff135041f5c02456682 /kernel/kexec.c | |
| parent | d5a877e8dd409d8c702986d06485c374b705d340 (diff) | |
| parent | 32bdfac5462d777f35b00838893c4f87baf23efe (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Do not hold dpm_list_mtx while disabling/enabling nonboot CPUs
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 5a758c6e4950..e4983770913b 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -1451,7 +1451,6 @@ int kernel_kexec(void) error = device_suspend(PMSG_FREEZE); if (error) goto Resume_console; - device_pm_lock(); /* At this point, device_suspend() has been called, * but *not* device_power_down(). We *must* * device_power_down() now. Otherwise, drivers for @@ -1489,7 +1488,6 @@ int kernel_kexec(void) enable_nonboot_cpus(); device_power_up(PMSG_RESTORE); Resume_devices: - device_pm_unlock(); device_resume(PMSG_RESTORE); Resume_console: resume_console(); |