Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776Ab0KWIWb (ORCPT ); Tue, 23 Nov 2010 03:22:31 -0500 Received: from gir.skynet.ie ([193.1.99.77]:56805 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176Ab0KWIWa (ORCPT ); Tue, 23 Nov 2010 03:22:30 -0500 Date: Tue, 23 Nov 2010 08:22:15 +0000 From: Mel Gorman To: Am?rico Wang Cc: Andrew Morton , Namhyung Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] scripts: Fix gfp-translate for recent changes to gfp.h Message-ID: <20101123082215.GC19571@csn.ul.ie> References: <20101122120002.GB1890@csn.ul.ie> <20101123043710.GA5187@cr0.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <20101123043710.GA5187@cr0.nay.redhat.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1919 Lines: 54 On Tue, Nov 23, 2010 at 12:37:10PM +0800, Am?rico Wang wrote: > On Mon, Nov 22, 2010 at 12:00:02PM +0000, Mel Gorman wrote: > >The recent changes to gfp.h to satisfy sparse broke > >scripts/gfp-translate. This patch fixes it up to work with old and new > >versions of gfp.h . > > > >Signed-off-by: Mel Gorman > >--- > > scripts/gfp-translate | 7 ++++++- > > 1 files changed, 6 insertions(+), 1 deletions(-) > > > >diff --git a/scripts/gfp-translate b/scripts/gfp-translate > >index d81b968..128937e 100644 > >--- a/scripts/gfp-translate > >+++ b/scripts/gfp-translate > >@@ -63,7 +63,12 @@ fi > > > > # Extract GFP flags from the kernel source > > TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1 > >-grep "^#define __GFP" $SOURCE/include/linux/gfp.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE > >+grep ___GFP $SOURCE/include/linux/gfp.h > /dev/null > > You might want 'grep -q'. :) > I *do* want grep -q :) . Andrew has already applied a relevant fix, thanks Andrew. > > >+if [ $? -eq 0 ]; then > >+ grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE > >+else > >+ grep "^#define __GFP" $SOURCE/include/linux/gfp.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE > >+fi > > > > # Parse the flags > > IFS=" > > Other than that, this patch looks fine for me. > > Reviewed-by: WANG Cong > Cheers. -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/