Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 27af038494ef2f3f3a23aa040bfc1ea29d99d76d

Authored by Mel Gorman
Committed by Linus Torvalds
1 parent da905873ef
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

scripts: fix gfp-translate for recent changes to gfp.h 

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 .

[akpm@linux-foundation.org: use `grep -q', per WANG Cong]
Signed-off-by: Mel Gorman <mel@csn.ul.ie>
Cc: Namhyung Kim <namhyung@gmail.com>
Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

scripts/gfp-translate
Diff comments   View file @ 27af038
... ... @@ -63,7 +63,12 @@
63 63  
64 64 # Extract GFP flags from the kernel source
65 65 TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1
66   -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
  66 +grep -q ___GFP $SOURCE/include/linux/gfp.h
  67 +if [ $? -eq 0 ]; then
  68 + grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE
  69 +else
  70 + 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
  71 +fi
67 72  
68 73 # Parse the flags
69 74 IFS="