From a271650e8c7ea2921e7554cd6673c48955699438 Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Thu, 18 Oct 2007 23:39:58 -0700 Subject: [PATCH] --- yaml --- r: 71439 b: refs/heads/master c: 7b1915a989ea4d426d0fd98974ab80f30ef1d779 h: refs/heads/master i: 71437: ff4ef0b284af2bfed427bc51fa5e27db58209ab7 71435: f6616a74393bda0bcc23cdbb478c5c7ad457696e 71431: 5ce832ab0bde54f98473c91b926b77dbf22389fe 71423: a710eead3e4a1db4396808cb73ebd33d27d7f1a9 v: v3 --- [refs] | 2 +- trunk/mm/oom_kill.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 026a6bd69169..16d591cfef3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e1975868ac9d41211fcaa6f2c5e44c4e7ff9e5b +refs/heads/master: 7b1915a989ea4d426d0fd98974ab80f30ef1d779 diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c index b1c2d0f86222..a7cb4c43fd11 100644 --- a/trunk/mm/oom_kill.c +++ b/trunk/mm/oom_kill.c @@ -337,7 +337,6 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, unsigned long points, const char *message) { struct task_struct *c; - struct list_head *tsk; if (printk_ratelimit()) { printk(KERN_WARNING "%s invoked oom-killer: " @@ -360,8 +359,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, message, p->pid, p->comm, points); /* Try to kill a child first */ - list_for_each(tsk, &p->children) { - c = list_entry(tsk, struct task_struct, sibling); + list_for_each_entry(c, &p->children, sibling) { if (c->mm == p->mm) continue; if (!oom_kill_task(c))