diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
| commit | 7b0386921db20add25afd8678ed34a9253e512fc (patch) | |
| tree | 8c6b888b76211e38e6c1c3006553dc4b2b24c75e /mm/page_alloc.c | |
| parent | c5580a7ecb859c6821dd761c95fa150ec7695ae1 (diff) | |
| parent | 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 (diff) | |
Merge branch 'upstream-fixes'
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 208812b2559..791690d7d3f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1015,7 +1015,7 @@ rebalance: if (page) goto got_pg; - out_of_memory(gfp_mask, order); + out_of_memory(zonelist, gfp_mask, order); goto restart; } |