diff --git a/[refs] b/[refs] index 296f1982ebb6..7d1bd4da8d08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff4da2e262d2509fe1bacff70dd00934be569c66 +refs/heads/master: 94c188d32996beac00426740974310e32f162c14 diff --git a/trunk/kernel/power/user.c b/trunk/kernel/power/user.c index a97406b86ef3..bbd4842104aa 100644 --- a/trunk/kernel/power/user.c +++ b/trunk/kernel/power/user.c @@ -139,12 +139,10 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, if (data->frozen) break; down(&pm_sem); - pm_prepare_console(); disable_nonboot_cpus(); if (freeze_processes()) { thaw_processes(); enable_nonboot_cpus(); - pm_restore_console(); error = -EBUSY; } up(&pm_sem); @@ -158,7 +156,6 @@ static int snapshot_ioctl(struct inode *inode, struct file *filp, down(&pm_sem); thaw_processes(); enable_nonboot_cpus(); - pm_restore_console(); up(&pm_sem); data->frozen = 0; break;