diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
| commit | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (patch) | |
| tree | b4b5e472bafb3d5d0d8ea26680e1d8cc87365c30 /mm/page_alloc.c | |
| parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
| parent | efed792d6738964f399a508ef9e831cd60fa4657 (diff) | |
| download | kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.gz kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.xz kernel-crypto-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.zip | |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5c44ed49ca9..a3803ea8c27 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1479,6 +1479,8 @@ __alloc_pages_internal(gfp_t gfp_mask, unsigned int order, unsigned long did_some_progress; unsigned long pages_reclaimed = 0; + lockdep_trace_alloc(gfp_mask); + might_sleep_if(wait); if (should_fail_alloc_page(gfp_mask, order)) @@ -1578,12 +1580,15 @@ nofail_alloc: */ cpuset_update_task_memory_state(); p->flags |= PF_MEMALLOC; + + lockdep_set_current_reclaim_state(gfp_mask); reclaim_state.reclaimed_slab = 0; p->reclaim_state = &reclaim_state; did_some_progress = try_to_free_pages(zonelist, order, gfp_mask); p->reclaim_state = NULL; + lockdep_clear_current_reclaim_state(); p->flags &= ~PF_MEMALLOC; cond_resched(); |