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>
struct mem_cgroup *mem, nodemask_t *nodemask,
const char *message)
{
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 *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);
if (printk_ratelimit())
dump_header(p, gfp_mask, order, mem, nodemask);
* parent. This attempts to lose the minimal amount of work done while
* still freeing memory.
*/
* 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;
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
*/
/*
* oom_badness() returns 0 if the thread is unkillable
*/