diff options
| author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-09-10 00:27:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 10:06:37 -0700 |
| commit | 13e4b57f6a4e23ceb99794a650d777e74831f4a6 (patch) | |
| tree | a585fdc3a2374dbedcf0114fa3c38d2fb7920774 | |
| parent | 75bcc8c5e1de78616b04ef9f317a293a7c1c163c (diff) | |
| download | kernel_samsung_tuna-13e4b57f6a4e23ceb99794a650d777e74831f4a6.zip kernel_samsung_tuna-13e4b57f6a4e23ceb99794a650d777e74831f4a6.tar.gz kernel_samsung_tuna-13e4b57f6a4e23ceb99794a650d777e74831f4a6.tar.bz2 | |
[PATCH] mm: fix-up schedule_timeout() usage
Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | mm/oom_kill.c | 3 | ||||
| -rw-r--r-- | mm/swapfile.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 5ec8da1..ac3bf33 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -300,6 +300,5 @@ retry: * Give "p" a good chance of killing itself before we * retry to allocate memory. */ - __set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_interruptible(1); } diff --git a/mm/swapfile.c b/mm/swapfile.c index 4b6e8bf..0184f51 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1153,8 +1153,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile) p->highest_bit = 0; /* cuts scans short */ while (p->flags >= SWP_SCANNING) { spin_unlock(&swap_lock); - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_uninterruptible(1); spin_lock(&swap_lock); } |