aboutsummaryrefslogtreecommitdiffstats
path: root/mm/oom_kill.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r--mm/oom_kill.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 4bbb1cb10495..59666d905f19 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -258,6 +258,10 @@ void out_of_memory(unsigned int __nocast gfp_mask)
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);
262 /* print memory stats */
263 show_mem();
264
261 read_lock(&tasklist_lock); 265 read_lock(&tasklist_lock);
262retry: 266retry:
263 p = select_bad_process(); 267 p = select_bad_process();
@@ -268,12 +272,9 @@ retry:
268 /* Found nothing?!?! Either we hang forever, or we panic. */ 272 /* Found nothing?!?! Either we hang forever, or we panic. */
269 if (!p) { 273 if (!p) {
270 read_unlock(&tasklist_lock); 274 read_unlock(&tasklist_lock);
271 show_free_areas();
272 panic("Out of memory and no killable processes...\n"); 275 panic("Out of memory and no killable processes...\n");
273 } 276 }
274 277
275 printk("oom-killer: gfp_mask=0x%x\n", gfp_mask);
276 show_free_areas();
277 mm = oom_kill_process(p); 278 mm = oom_kill_process(p);
278 if (!mm) 279 if (!mm)
279 goto retry; 280 goto retry;