aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/oom_kill.c4
-rw-r--r--mm/page_alloc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 59666d905f19..e20d559edbaf 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -253,12 +253,12 @@ 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 */
256void out_of_memory(unsigned int __nocast gfp_mask) 256void 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 printk("oom-killer: gfp_mask=0x%x, order=%d\n", gfp_mask, order);
262 /* print memory stats */ 262 /* print memory stats */
263 show_mem(); 263 show_mem();
264 264
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3c9f7f881125..7fbd3ea8765c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -936,7 +936,7 @@ rebalance:
936 goto got_pg; 936 goto got_pg;
937 } 937 }
938 938
939 out_of_memory(gfp_mask); 939 out_of_memory(gfp_mask, order);
940 goto restart; 940 goto restart;
941 } 941 }
942 942