diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /mm/page_alloc.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8e5726ab0d85..d6e7ba7373be 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -2195,7 +2195,7 @@ nopage: | |||
| 2195 | current->comm, order, gfp_mask); | 2195 | current->comm, order, gfp_mask); |
| 2196 | dump_stack(); | 2196 | dump_stack(); |
| 2197 | if (!should_suppress_show_mem()) | 2197 | if (!should_suppress_show_mem()) |
| 2198 | __show_mem(filter); | 2198 | show_mem(filter); |
| 2199 | } | 2199 | } |
| 2200 | return page; | 2200 | return page; |
| 2201 | got_pg: | 2201 | got_pg: |