Commit cb43c54c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown

Freezer: Fix APM emulation breakage

The APM emulation is currently broken as a result of commit
83144186
"Freezer: make kernel threads nonfreezable by default"
that removed the PF_NOFREEZE annotations from apm_ioctl() without adding
the appropriate freezer hooks.  Fix it and remove the unnecessary variable flags
from apm_ioctl().

Special thanks to Franck Bui-Huu <vagabon.xyz@gmail.com> for pointing out the
problem.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Franck Bui-Huu <vagabon.xyz@gmail.com>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2ffbb837
...@@ -295,7 +295,6 @@ static int ...@@ -295,7 +295,6 @@ static int
apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
{ {
struct apm_user *as = filp->private_data; struct apm_user *as = filp->private_data;
unsigned long flags;
int err = -EINVAL; int err = -EINVAL;
if (!as->suser || !as->writer) if (!as->suser || !as->writer)
...@@ -331,10 +330,16 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) ...@@ -331,10 +330,16 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
* Wait for the suspend/resume to complete. If there * Wait for the suspend/resume to complete. If there
* are pending acknowledges, we wait here for them. * are pending acknowledges, we wait here for them.
*/ */
flags = current->flags; freezer_do_not_count();
wait_event(apm_suspend_waitqueue, wait_event(apm_suspend_waitqueue,
as->suspend_state == SUSPEND_DONE); as->suspend_state == SUSPEND_DONE);
/*
* Since we are waiting until the suspend is done, the
* try_to_freeze() in freezer_count() will not trigger
*/
freezer_count();
} else { } else {
as->suspend_state = SUSPEND_WAIT; as->suspend_state = SUSPEND_WAIT;
mutex_unlock(&state_lock); mutex_unlock(&state_lock);
...@@ -362,14 +367,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg) ...@@ -362,14 +367,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
* Wait for the suspend/resume to complete. If there * Wait for the suspend/resume to complete. If there
* are pending acknowledges, we wait here for them. * are pending acknowledges, we wait here for them.
*/ */
flags = current->flags; wait_event_freezable(apm_suspend_waitqueue,
wait_event_interruptible(apm_suspend_waitqueue,
as->suspend_state == SUSPEND_DONE); as->suspend_state == SUSPEND_DONE);
} }
current->flags = flags;
mutex_lock(&state_lock); mutex_lock(&state_lock);
err = as->suspend_result; err = as->suspend_result;
as->suspend_state = SUSPEND_NONE; as->suspend_state = SUSPEND_NONE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment