From 2d13a38358177ef78c4e245cf0b89add99738ee8 Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Fri, 5 Mar 2010 13:41:47 -0800 Subject: [PATCH] --- yaml --- r: 186196 b: refs/heads/master c: 76ca542d880ebe59a7a03c1597e73e1ded271857 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/vmscan.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0adb95119cc3..6acd45f25618 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84b18490d1f1bc7ed5095c929f78bc002eb70f26 +refs/heads/master: 76ca542d880ebe59a7a03c1597e73e1ded271857 diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index 62782057fcb9..bc0f8db8340f 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -2557,6 +2557,7 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) * and RECLAIM_SWAP. */ p->flags |= PF_MEMALLOC | PF_SWAPWRITE; + lockdep_set_current_reclaim_state(gfp_mask); reclaim_state.reclaimed_slab = 0; p->reclaim_state = &reclaim_state; @@ -2600,6 +2601,7 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) p->reclaim_state = NULL; current->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE); + lockdep_clear_current_reclaim_state(); return sc.nr_reclaimed >= nr_pages; }