Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35607
b: refs/heads/master
c: b72f160
h: refs/heads/master
i:
  35605: fd58a72
  35603: 5b128f2
  35599: 323bfcc
v: v3
  • Loading branch information
Nick Piggin authored and Linus Torvalds committed Sep 26, 2006
1 parent 7d12aa7 commit d3f0105
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: 5081dde33f7a61d28d9b185cc386f12cb837c7a4
refs/heads/master: b72f160443cb78b2f8addae6e331d2adaa70f869
5 changes: 3 additions & 2 deletions trunk/mm/oom_kill.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,9 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
return;

if (printk_ratelimit()) {
printk("oom-killer: gfp_mask=0x%x, order=%d\n",
gfp_mask, order);
printk(KERN_WARNING "%s invoked oom-killer: "
"gfp_mask=0x%x, order=%d, oomkilladj=%d\n",
current->comm, gfp_mask, order, current->oomkilladj);
dump_stack();
show_mem();
}
Expand Down

0 comments on commit d3f0105

Please sign in to comment.