aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-07-14 21:54:08 -0400
committerRusty Russell <rusty@rustcorp.com.au>2013-07-14 21:55:05 -0400
commit6b4f2b56a48c8ea9775bd2b29681725d4474367a (patch)
treebfafbd5af394d8d40064d51696ef4a0e3b8dd505
parent8a1d41cfeaf59a07acc7b1b3620ad6aa5cf47dc2 (diff)
mm/oom_kill: remove weird use of ERR_PTR()/PTR_ERR().
The normal expectation for ERR_PTR() is to put a negative errno into a pointer. oom_kill puts the magic -1 in the result (and has since pre-git), which is probably clearer with an explicit cast. Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--mm/oom_kill.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 79e451a78c9e..98e75f2ac7bc 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -288,7 +288,7 @@ enum oom_scan_t oom_scan_process_thread(struct task_struct *task,
288 288
289/* 289/*
290 * Simple selection loop. We chose the process with the highest 290 * Simple selection loop. We chose the process with the highest
291 * number of 'points'. 291 * number of 'points'. Returns -1 on scan abort.
292 * 292 *
293 * (not docbooked, we don't want this one cluttering up the manual) 293 * (not docbooked, we don't want this one cluttering up the manual)
294 */ 294 */
@@ -314,7 +314,7 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
314 continue; 314 continue;
315 case OOM_SCAN_ABORT: 315 case OOM_SCAN_ABORT:
316 rcu_read_unlock(); 316 rcu_read_unlock();
317 return ERR_PTR(-1UL); 317 return (struct task_struct *)(-1UL);
318 case OOM_SCAN_OK: 318 case OOM_SCAN_OK:
319 break; 319 break;
320 }; 320 };
@@ -657,7 +657,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
657 dump_header(NULL, gfp_mask, order, NULL, mpol_mask); 657 dump_header(NULL, gfp_mask, order, NULL, mpol_mask);
658 panic("Out of memory and no killable processes...\n"); 658 panic("Out of memory and no killable processes...\n");
659 } 659 }
660 if (PTR_ERR(p) != -1UL) { 660 if (p != (void *)-1UL) {
661 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, 661 oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
662 nodemask, "Out of memory"); 662 nodemask, "Out of memory");
663 killed = 1; 663 killed = 1;