X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=d348b9035955e5a0ba91af683880ac0e41996fd0;hb=3c535952d86df83f817595068c9fd2b3cfbd3a4d;hp=5ec8da12cfd986523bb1968ffa9f2ea0be064868;hpb=0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a;p=~andy%2Flinux

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 5ec8da12cfd..d348b903595 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -263,7 +263,7 @@ static struct mm_struct *oom_kill_process(struct task_struct *p)
  * OR try to be smart about which process to kill. Note that we
  * don't have to be perfect here, we just have to be good.
  */
-void out_of_memory(unsigned int __nocast gfp_mask, int order)
+void out_of_memory(gfp_t gfp_mask, int order)
 {
 	struct mm_struct *mm = NULL;
 	task_t * p;
@@ -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);
 }