Skip to contentSkip to conversation

scripts: fix the gfp flags header path in gfp-translate

PATCH Applied Prathu Baronia 3 participants 3 messages Jun 8, 2023 – Jun 12, 2023 Memory management

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts: fix the gfp flags header path in gfp-translate

Since gfp flags have been shifted to gfp_types.h so update the path in the gfp-translate script.

---
 scripts/gfp-translate | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
scripts/gfp-translate +3 -3
index b2ce416d944b..6c9aed17cf56 100755
@@ -63,11 +63,11 @@ fi
 
 # Extract GFP flags from the kernel source
 TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1
-grep -q ___GFP $SOURCE/include/linux/gfp.h
+grep -q ___GFP $SOURCE/include/linux/gfp_types.h
 if [ $? -eq 0 ]; then
-	grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE
+	grep "^#define ___GFP" $SOURCE/include/linux/gfp_types.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
+	grep "^#define __GFP" $SOURCE/include/linux/gfp_types.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE
 fi
 
 # Parse the flags

base-commit: 44c026a73be8038f03dbdeef028b642880cf1511

Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 11 lines · On Thu, 8 Jun 2023 21:14:49 +0530 Prathu Baronia…

Since gfp flags have been shifted to gfp_types.h so update the path in the gfp-translate script.

...

scripts/gfp-translate +0 -0
@@ -63,11 +63,11 @@ fi
 
 # Extract GFP flags from the kernel source
 TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1

scripts/gfp-translate fi · line 72

Quoted 10 lines
scripts/gfp-translate +3 -3
-grep -q ___GFP $SOURCE/include/linux/gfp.h
+grep -q ___GFP $SOURCE/include/linux/gfp_types.h
 if [ $? -eq 0 ]; then
-	grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE
+	grep "^#define ___GFP" $SOURCE/include/linux/gfp_types.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
+	grep "^#define __GFP" $SOURCE/include/linux/gfp_types.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE
 fi
 

Thanks. I added

Fixes cb5a065b4ea9c ("headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>")
Reviewed-by on v1 1/1
#2 lore raw
In reply to Prathu Baronia
Quoted 28 lines · Prathu Baronia

Since gfp flags have been shifted to gfp_types.h so update the path in the gfp-translate script.

---
  scripts/gfp-translate | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
scripts/gfp-translate +3 -3
index b2ce416d944b..6c9aed17cf56 100755
@@ -63,11 +63,11 @@ fi
 
  # Extract GFP flags from the kernel source
  TMPFILE=`mktemp -t gfptranslate-XXXXXX` || exit 1
-grep -q ___GFP $SOURCE/include/linux/gfp.h
+grep -q ___GFP $SOURCE/include/linux/gfp_types.h
  if [ $? -eq 0 ]; then
-	grep "^#define ___GFP" $SOURCE/include/linux/gfp.h | sed -e 's/u$//' | grep -v GFP_BITS > $TMPFILE
+	grep "^#define ___GFP" $SOURCE/include/linux/gfp_types.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
+	grep "^#define __GFP" $SOURCE/include/linux/gfp_types.h | sed -e 's/(__force gfp_t)//' | sed -e 's/u)/)/' | grep -v GFP_BITS | sed -e 's/)\//) \//' > $TMPFILE
  fi
 
  # Parse the flags
Quoted 1 line

base-commit: 44c026a73be8038f03dbdeef028b642880cf1511

Yes, works for me then

Signature · 3 lines
Cheers,

David / dhildenb