Commit 1013f563 authored by Uros Bizjak's avatar Uros Bizjak Committed by Ingo Molnar
Browse files

genksyms: Handle typeof_unqual keyword and __seg_{fs,gs} qualifiers 

Handle typeof_unqual, __typeof_unqual and __typeof_unqual__ keywords
using TYPEOF_KEYW token in the same way as typeof keyword.

Also ignore x86 __seg_fs and __seg_gs named address space qualifiers
using X86_SEG_KEYW token in the same way as const, volatile or
restrict qualifiers.

Fixes: ac053946 ("compiler.h: introduce TYPEOF_UNQUAL() macro")
Closes: https://lore.kernel.org/lkml/81a25a60-de78-43fb-b56a-131151e1c035@molgen.mpg.de/


Reported-by: default avatarPaul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Link: https://lore.kernel.org/r/20250413220749.270704-1-ubizjak@gmail.com
parent d833dc59

scripts/genksyms/keywords.c

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ static struct resword { 
	{ "__signed__", SIGNED_KEYW },

	{ "__typeof", TYPEOF_KEYW },

	{ "__typeof__", TYPEOF_KEYW },

	{ "__typeof_unqual", TYPEOF_KEYW },

	{ "__typeof_unqual__", TYPEOF_KEYW },

	{ "__volatile", VOLATILE_KEYW },

	{ "__volatile__", VOLATILE_KEYW },

	{ "__builtin_va_list", VA_LIST_KEYW },
@@ -40,6 +42,10 @@ static struct resword { 
	// KAO. },

	// { "attribute", ATTRIBUTE_KEYW },



	// X86 named address space qualifiers

	{ "__seg_gs", X86_SEG_KEYW },

	{ "__seg_fs", X86_SEG_KEYW },



	{ "auto", AUTO_KEYW },

	{ "char", CHAR_KEYW },

	{ "const", CONST_KEYW },
@@ -57,6 +63,7 @@ static struct resword { 
	{ "struct", STRUCT_KEYW },

	{ "typedef", TYPEDEF_KEYW },

	{ "typeof", TYPEOF_KEYW },

	{ "typeof_unqual", TYPEOF_KEYW },

	{ "union", UNION_KEYW },

	{ "unsigned", UNSIGNED_KEYW },

	{ "void", VOID_KEYW },

scripts/genksyms/parse.y

+4 −1
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ static void record_compound(struct string_list **keyw, 
%token TYPEOF_KEYW

%token VA_LIST_KEYW



%token X86_SEG_KEYW



%token EXPORT_SYMBOL_KEYW



%token ASM_PHRASE
@@ -292,7 +294,8 @@ type_qualifier_seq: 
	;



type_qualifier:

	CONST_KEYW | VOLATILE_KEYW

	X86_SEG_KEYW

	| CONST_KEYW | VOLATILE_KEYW

	| RESTRICT_KEYW

		{ /* restrict has no effect in prototypes so ignore it */

		  remove_node($1);