diff options
author | Palmer Dabbelt <palmer@rivosinc.com> | 2023-07-21 18:01:48 +0300 |
---|---|---|
committer | Luis Chamberlain <mcgrof@kernel.org> | 2023-07-24 22:09:47 +0300 |
commit | ff09f6fd297293175eaa0ed492495e36b3eb1a8e (patch) | |
tree | e8685220b9b73edbab65a3bb378951e01cbfec47 /include/linux/module_symbol.h | |
parent | 9ce170cef66916526dcaa868a67cfcc0c2f0c3d6 (diff) | |
download | linux-ff09f6fd297293175eaa0ed492495e36b3eb1a8e.tar.xz |
modpost, kallsyms: Treat add '$'-prefixed symbols as mapping symbols
Trying to restrict the '$'-prefix change to RISC-V caused some fallout,
so let's just treat all those symbols as special.
Fixes: c05780ef3c190 ("module: Ignore RISC-V mapping symbols too")
Link: https://lore.kernel.org/all/20230712015747.77263-1-wangkefeng.wang@huawei.com/
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'include/linux/module_symbol.h')
-rw-r--r-- | include/linux/module_symbol.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/linux/module_symbol.h b/include/linux/module_symbol.h index 5b799942b243..1269543d0634 100644 --- a/include/linux/module_symbol.h +++ b/include/linux/module_symbol.h @@ -3,25 +3,13 @@ #define _LINUX_MODULE_SYMBOL_H /* This ignores the intensely annoying "mapping symbols" found in ELF files. */ -static inline int is_mapping_symbol(const char *str, int is_riscv) +static inline int is_mapping_symbol(const char *str) { if (str[0] == '.' && str[1] == 'L') return true; if (str[0] == 'L' && str[1] == '0') return true; - /* - * RISC-V defines various special symbols that start with "$". The - * mapping symbols, which exist to differentiate between incompatible - * instruction encodings when disassembling, show up all over the place - * and are generally not meant to be treated like other symbols. So - * just ignore any of the special symbols. - */ - if (is_riscv) - return str[0] == '$'; - - return str[0] == '$' && - (str[1] == 'a' || str[1] == 'd' || str[1] == 't' || str[1] == 'x') - && (str[2] == '\0' || str[2] == '.'); + return str[0] == '$'; } #endif /* _LINUX_MODULE_SYMBOL_H */ |