1 files changed, 5 insertions, 0 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5675b3073854..22b15a4cde8a 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();