diff options
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 59666d905f19..1e56076672f5 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -253,14 +253,16 @@ static struct mm_struct *oom_kill_process(struct task_struct *p) | |||
253 | * OR try to be smart about which process to kill. Note that we | 253 | * OR try to be smart about which process to kill. Note that we |
254 | * don't have to be perfect here, we just have to be good. | 254 | * don't have to be perfect here, we just have to be good. |
255 | */ | 255 | */ |
256 | void out_of_memory(unsigned int __nocast gfp_mask) | 256 | void out_of_memory(unsigned int __nocast gfp_mask, int order) |
257 | { | 257 | { |
258 | struct mm_struct *mm = NULL; | 258 | struct mm_struct *mm = NULL; |
259 | task_t * p; | 259 | task_t * p; |
260 | 260 | ||
261 | printk("oom-killer: gfp_mask=0x%x\n", gfp_mask); | 261 | if (printk_ratelimit()) { |
262 | /* print memory stats */ | 262 | printk("oom-killer: gfp_mask=0x%x, order=%d\n", |
263 | show_mem(); | 263 | gfp_mask, order); |
264 | show_mem(); | ||
265 | } | ||
264 | 266 | ||
265 | read_lock(&tasklist_lock); | 267 | read_lock(&tasklist_lock); |
266 | retry: | 268 | retry: |