Commit 52d3c036 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "oom: oom_kill_process: fix the child_points logic"



This reverts the parent commit.  I hate doing that, but it's generating
some discussion ("half of it is right"), and since I am planning on
doing the 2.6.38 release later today we can punt it to stable if
required. Let's not rock the boat right now.
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dc1b83ab
...@@ -458,10 +458,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, ...@@ -458,10 +458,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
struct mem_cgroup *mem, nodemask_t *nodemask, struct mem_cgroup *mem, nodemask_t *nodemask,
const char *message) const char *message)
{ {
struct task_struct *victim; struct task_struct *victim = p;
struct task_struct *child; struct task_struct *child;
struct task_struct *t; struct task_struct *t = p;
unsigned int victim_points; unsigned int victim_points = 0;
if (printk_ratelimit()) if (printk_ratelimit())
dump_header(p, gfp_mask, order, mem, nodemask); dump_header(p, gfp_mask, order, mem, nodemask);
...@@ -487,15 +487,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, ...@@ -487,15 +487,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
* parent. This attempts to lose the minimal amount of work done while * parent. This attempts to lose the minimal amount of work done while
* still freeing memory. * still freeing memory.
*/ */
victim_points = oom_badness(p, mem, nodemask, totalpages);
victim = p;
t = p;
do { do {
list_for_each_entry(child, &t->children, sibling) { list_for_each_entry(child, &t->children, sibling) {
unsigned int child_points; unsigned int child_points;
if (child->mm == t->mm)
continue;
/* /*
* oom_badness() returns 0 if the thread is unkillable * oom_badness() returns 0 if the thread is unkillable
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment