diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
| commit | 165415f700b0c77fa1f8db6198f48582639adf78 (patch) | |
| tree | 088e305b0b5b0c6753072e13be1177824c3ed59d /mm/swapfile.c | |
| parent | c324b44c34050cf2a9b58830e11c974806bd85d8 (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
| download | kernel_samsung_aries-165415f700b0c77fa1f8db6198f48582639adf78.zip kernel_samsung_aries-165415f700b0c77fa1f8db6198f48582639adf78.tar.gz kernel_samsung_aries-165415f700b0c77fa1f8db6198f48582639adf78.tar.bz2 | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
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); } |