diff options
| -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 5ec8da12cfd..ac3bf33e537 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 4b6e8bf986b..0184f510aac 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); } |