summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Machek2005-09-04 00:56:53 +0200
committerLinus Torvalds2005-09-05 09:06:14 +0200
commit2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d (patch)
tree60eede3a1a0a92837c0207de2750880d9a309db1
parent[PATCH] unify x86/x86-64 semaphore code (diff)
downloadkernel-qcow2-linux-2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d.tar.gz
kernel-qcow2-linux-2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d.tar.xz
kernel-qcow2-linux-2a23b5d1e119fd10e25b8e93464c8d549f5a5c5d.zip
[PATCH] remove busywait in refrigerator
This should make refrigerator sleep properly, not busywait after the first schedule() returns. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/power/process.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 3bd0d261818f..f7da5bfc914e 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -38,7 +38,6 @@ void refrigerator(void)
processes around? */
long save;
save = current->state;
- current->state = TASK_UNINTERRUPTIBLE;
pr_debug("%s entered refrigerator\n", current->comm);
printk("=");
@@ -47,8 +46,10 @@ void refrigerator(void)
recalc_sigpending(); /* We sent fake signal, clean it up */
spin_unlock_irq(&current->sighand->siglock);
- while (frozen(current))
+ while (frozen(current)) {
+ current->state = TASK_UNINTERRUPTIBLE;
schedule();
+ }
pr_debug("%s left refrigerator\n", current->comm);
current->state = save;
}