genksyms: Handle typeof_unqual keyword and __seg_{fs,gs} qualifiers
PATCH 1/1 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.
--- scripts/genksyms/keywords.c | 7 +++++++ scripts/genksyms/parse.y | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)
scripts/genksyms/keywords.c +7 -0
@@ -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
@@ -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);
Signature · 1 line
2.42.0
Ingo Molnar
AppliedQuoted 14 lines · Uros Bizjak
Handle
typeof_unqual,__typeof_unqualand__typeof_unqual__keywords usingTYPEOF_KEYWtoken in the same way as typeof keyword.Also ignore x86
__seg_fsand__seg_gsnamed address space qualifiers usingX86_SEG_KEYWtoken in the same way as const, volatile or restrict qualifiers.Signed-off-by Uros Bizjak <[email protected]>Reported-by Paul Menzel <[email protected]>Cc Masahiro Yamada <[email protected]>Cc Andrew Morton <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>
Quoted 4 lines
--- scripts/genksyms/keywords.c | 7 +++++++ scripts/genksyms/parse.y | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)
Thanks, applied to tip:core/urgent.
I've also added this tag for context:
Ingo
Quoted 23 lines · Ingo Molnar
Quoted 14 lines · Uros Bizjak
Handle
typeof_unqual,__typeof_unqualand__typeof_unqual__keywords usingTYPEOF_KEYWtoken in the same way as typeof keyword.Also ignore x86
__seg_fsand__seg_gsnamed address space qualifiers usingX86_SEG_KEYWtoken in the same way as const, volatile or restrict qualifiers.Signed-off-by Uros Bizjak <[email protected]>Reported-by Paul Menzel <[email protected]>Cc Masahiro Yamada <[email protected]>Cc Andrew Morton <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Quoted 4 lines
--- scripts/genksyms/keywords.c | 7 +++++++ scripts/genksyms/parse.y | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)
Quoted 5 lines
Thanks, applied to tip:core/urgent.
I've also added this tag for context:
Fixes ac053946f5c4 ("compiler.h: introduce TYPEOF_UNQUAL() macro")
Heh, I intentionally removed it because the patch now fixes genksyms.
No big deal, though.
Thanks,
Uros.
Quoted 24 lines · Uros Bizjak
Quoted 23 lines · Ingo Molnar
Quoted 18 lines · Uros Bizjak
Handle
typeof_unqual,__typeof_unqualand__typeof_unqual__keywords usingTYPEOF_KEYWtoken in the same way as typeof keyword.Also ignore x86
__seg_fsand__seg_gsnamed address space qualifiers usingX86_SEG_KEYWtoken in the same way as const, volatile or restrict qualifiers.Signed-off-by Uros Bizjak <[email protected]>Reported-by Paul Menzel <[email protected]>Cc Masahiro Yamada <[email protected]>Cc Andrew Morton <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>--- scripts/genksyms/keywords.c | 7 +++++++ scripts/genksyms/parse.y | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)
Quoted 7 lines
Quoted 5 lines
Thanks, applied to tip:core/urgent.
I've also added this tag for context:
Fixes ac053946f5c4 ("compiler.h: introduce TYPEOF_UNQUAL() macro")Heh, I intentionally removed it because the patch now fixes genksyms.
There's meritocratical value in generously accepting blame, even if you are only 10% to blame. ;-)
Ingo
The following commit has been merged into the core/urgent branch of tip:
The following commit has been merged into the core/urgent branch of tip:
Commit-ID: 1013f5636fd808569c1f4c40a58a4efc70713a28 Gitweb: https://git.kernel.org/tip/1013f5636fd808569c1f4c40a58a4efc70713a28 Author: Uros Bizjak <[email protected]> AuthorDate: Mon, 14 Apr 2025 00:07:34 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 14 Apr 2025 09:19:04 +02:00
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.
--- scripts/genksyms/keywords.c | 7 +++++++ scripts/genksyms/parse.y | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)
scripts/genksyms/keywords.c +7 -0
@@ -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
@@ -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);