openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-03-14 15:17:07 -07:00
parent dc1b83ab08
commit 52d3c03675
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mm/oom_kill.c
View File

@ -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,
const char *message)
{
struct task_struct *victim;
struct task_struct *victim = p;
struct task_struct *child;
struct task_struct *t;
unsigned int victim_points;
struct task_struct *t = p;
unsigned int victim_points = 0;
if (printk_ratelimit())
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,
* parent. This attempts to lose the minimal amount of work done while
* still freeing memory.
*/
victim_points = oom_badness(p, mem, nodemask, totalpages);
victim = p;
t = p;
do {
list_for_each_entry(child, &t->children, sibling) {
unsigned int child_points;
if (child->mm == t->mm)
continue;
/*
* oom_badness() returns 0 if the thread is unkillable
*/