diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /mm/swapfile.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-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 4b6e8bf986bc..0184f510aace 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -1153,8 +1153,7 @@ asmlinkage long sys_swapoff(const char __user * specialfile) | |||
| 1153 | p->highest_bit = 0; /* cuts scans short */ | 1153 | p->highest_bit = 0; /* cuts scans short */ |
| 1154 | while (p->flags >= SWP_SCANNING) { | 1154 | while (p->flags >= SWP_SCANNING) { |
| 1155 | spin_unlock(&swap_lock); | 1155 | spin_unlock(&swap_lock); |
| 1156 | set_current_state(TASK_UNINTERRUPTIBLE); | 1156 | schedule_timeout_uninterruptible(1); |
| 1157 | schedule_timeout(1); | ||
| 1158 | spin_lock(&swap_lock); | 1157 | spin_lock(&swap_lock); |
| 1159 | } | 1158 | } |
| 1160 | 1159 | ||