From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751459AbZHaHmc (ORCPT ); Mon, 31 Aug 2009 03:42:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751302AbZHaHmb (ORCPT ); Mon, 31 Aug 2009 03:42:31 -0400 Received: from mga03.intel.com ([143.182.124.21]:40822 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751273AbZHaHma (ORCPT ); Mon, 31 Aug 2009 03:42:30 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,271,1249282800"; d="scan'208";a="182261669" Date: Mon, 31 Aug 2009 15:42:21 +0800 From: Wu Fengguang To: Andrew Morton Cc: KOSAKI Motohiro , "linux-kernel@vger.kernel.org" , Nick Piggin , Christoph Lameter , linux-mm@kvack.org Subject: [PATCH] slqb: add common slab debug bits Message-ID: <20090831074221.GA10263@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a simple copy&paste from slub.c: - lockdep annotation - might sleep annotation - fault injection CC: Nick Piggin CC: Christoph Lameter Signed-off-by: Wu Fengguang --- mm/slqb.c | 7 +++++++ 1 file changed, 7 insertions(+) --- linux-mm.orig/mm/slqb.c 2009-08-28 15:51:15.000000000 +0800 +++ linux-mm/mm/slqb.c 2009-08-28 16:05:33.000000000 +0800 @@ -19,6 +19,7 @@ #include #include #include +#include /* * TODO @@ -1541,6 +1542,12 @@ static __always_inline void *slab_alloc( gfpflags &= gfp_allowed_mask; + lockdep_trace_alloc(gfpflags); + might_sleep_if(gfpflags & __GFP_WAIT); + + if (should_failslab(s->objsize, gfpflags)) + return NULL; + again: local_irq_save(flags); object = __slab_alloc(s, gfpflags, node);