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 <mel@xxxxxxxxx> >--- > 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'. :) >+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 <xiyou.wangcong@xxxxxxxxx> Thanks. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>