Commit 13e4b57f authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds

[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: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 75bcc8c5
...@@ -300,6 +300,5 @@ void out_of_memory(unsigned int __nocast gfp_mask, int order) ...@@ -300,6 +300,5 @@ void out_of_memory(unsigned int __nocast gfp_mask, int order)
* Give "p" a good chance of killing itself before we * Give "p" a good chance of killing itself before we
* retry to allocate memory. * retry to allocate memory.
*/ */
__set_current_state(TASK_INTERRUPTIBLE); schedule_timeout_interruptible(1);
schedule_timeout(1);
} }
...@@ -1153,8 +1153,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile) ...@@ -1153,8 +1153,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile)
p->highest_bit = 0; /* cuts scans short */ p->highest_bit = 0; /* cuts scans short */
while (p->flags >= SWP_SCANNING) { while (p->flags >= SWP_SCANNING) {
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout_uninterruptible(1);
schedule_timeout(1);
spin_lock(&swap_lock); spin_lock(&swap_lock);
} }
......
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