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

[PATCH] scripts: fix the gfp flags header path in gfp-translate

Posted by Prathu Baronia 2 years, 8 months ago

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

Signed-off-by: Prathu Baronia <prathubaronia2011@gmail.com>
---
 scripts/gfp-translate | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/gfp-translate b/scripts/gfp-translate
index b2ce416d944b..6c9aed17cf56 100755
--- a/scripts/gfp-translate
+++ b/scripts/gfp-translate
@@ -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
-- 
2.34.1

Re: [PATCH] scripts: fix the gfp flags header path in gfp-translate

Posted by David Hildenbrand 2 years, 8 months ago

On 08.06.23 17:44, Prathu Baronia wrote:
> Since gfp flags have been shifted to gfp_types.h so update the path in
> the gfp-translate script.
> 
> Signed-off-by: Prathu Baronia <prathubaronia2011@gmail.com>
> ---
>   scripts/gfp-translate | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/gfp-translate b/scripts/gfp-translate
> index b2ce416d944b..6c9aed17cf56 100755
> --- a/scripts/gfp-translate
> +++ b/scripts/gfp-translate
> @@ -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

Yes, works for me then

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Cheers,

David / dhildenb

Re: [PATCH] scripts: fix the gfp flags header path in gfp-translate

Posted by Andrew Morton 2 years, 8 months ago

On Thu,  8 Jun 2023 21:14:49 +0530 Prathu Baronia <prathubaronia2011@gmail.com> wrote:

> Since gfp flags have been shifted to gfp_types.h so update the path in
> the gfp-translate script.
> 
> ...
>
> --- a/scripts/gfp-translate
> +++ b/scripts/gfp-translate
> @@ -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
>  

Thanks.  I added

Fixes: cb5a065b4ea9c ("headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>")
Cc: <stable@vger.kernel.org>