Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71439
b: refs/heads/master
c: 7b1915a
h: refs/heads/master
i:
  71437: ff4ef0b
  71435: f6616a7
  71431: 5ce832a
  71423: a710eea
v: v3
  • Loading branch information
Matthias Kaehlcke authored and Linus Torvalds committed Oct 19, 2007
1 parent 80b69d6 commit a271650
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2e1975868ac9d41211fcaa6f2c5e44c4e7ff9e5b
refs/heads/master: 7b1915a989ea4d426d0fd98974ab80f30ef1d779
4 changes: 1 addition & 3 deletions trunk/mm/oom_kill.c
Original file line number Diff line number Diff line change
Expand Up @@ -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: "
Expand All @@ -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))
Expand Down

0 comments on commit a271650

Please sign in to comment.