From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752261Ab0ALFQo (ORCPT ); Tue, 12 Jan 2010 00:16:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750894Ab0ALFQn (ORCPT ); Tue, 12 Jan 2010 00:16:43 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:35052 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750741Ab0ALFQn (ORCPT ); Tue, 12 Jan 2010 00:16:43 -0500 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: LKML Subject: [resend][PATCH] mm, lockdep: annotate reclaim context to zone reclaim too Cc: kosaki.motohiro@jp.fujitsu.com, linux-mm , Andrew Morton , Nick Piggin , Peter Zijlstra , Ingo Molnar Message-Id: <20100112141330.B3A6.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Tue, 12 Jan 2010 14:16:33 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit cf40bd16fd (lockdep: annotate reclaim context) introduced reclaim context annotation. But it didn't annotate zone reclaim. This patch do it. Signed-off-by: KOSAKI Motohiro Cc: Nick Piggin Cc: Peter Zijlstra Cc: Ingo Molnar --- mm/vmscan.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 2bbee91..a039e78 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2547,6 +2547,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; @@ -2590,6 +2591,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; } -- 1.6.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org