diff --git a/[refs] b/[refs] index 3c376c4eef73..e2aba5c1922c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e87be1143472d841c1907e6e7ae4862a30e3595c +refs/heads/master: 433ecb4ab312f873870b67ee374502e84f6dcf92 diff --git a/trunk/kernel/power/process.c b/trunk/kernel/power/process.c index 6d566bf7085c..0eb5c420e8ed 100644 --- a/trunk/kernel/power/process.c +++ b/trunk/kernel/power/process.c @@ -47,8 +47,10 @@ void refrigerator(void) recalc_sigpending(); /* We sent fake signal, clean it up */ spin_unlock_irq(¤t->sighand->siglock); - while (frozen(current)) { - current->state = TASK_UNINTERRUPTIBLE; + for (;;) { + set_current_state(TASK_UNINTERRUPTIBLE); + if (!frozen(current)) + break; schedule(); } pr_debug("%s left refrigerator\n", current->comm);