---

yaml --- r: 8414 b: refs/heads/master c: 13e4b57 h: refs/heads/master v: v3
git-mirror · Sep 10, 2005 · 426bf57 · 426bf57
1 parent 46d3538
commit 426bf57
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75bcc8c5e1de78616b04ef9f317a293a7c1c163c
+refs/heads/master: 13e4b57f6a4e23ceb99794a650d777e74831f4a6
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
@@ -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
 	 * retry to allocate memory.
 	 */
-	__set_current_state(TASK_INTERRUPTIBLE);
-	schedule_timeout(1);
+	schedule_timeout_interruptible(1);
 }
diff --git a/trunk/mm/swapfile.c b/trunk/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);
 	}