Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6c34f1f5424395994c125f8c68bed395920ecc58

Authored by Kyle McMartin
Committed by Catalin Marinas
1 parent a52ce12191
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

aarch64: filter $x from kallsyms 

Similar to ARM, AArch64 is generating $x and $d syms... which isn't
terribly helpful when looking at %pF output and the like. Filter those
out in kallsyms, modpost and when looking at module symbols.

Seems simplest since none of these check EM_ARM anyway, to just add it
to the strchr used, rather than trying to make things overly
complicated.

initcall_debug improves:
dmesg_before.txt: initcall $x+0x0/0x154 [sg] returned 0 after 26331 usecs
dmesg_after.txt: initcall init_sg+0x0/0x154 [sg] returned 0 after 15461 usecs

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -3388,7 +3388,7 @@
3388 3388 {
3389 3389 if (str[0] == '.' && str[1] == 'L')
3390 3390 return true;
3391   - return str[0] == '$' && strchr("atd", str[1])
  3391 + return str[0] == '$' && strchr("axtd", str[1])
3392 3392 && (str[2] == '\0' || str[2] == '.');
3393 3393 }
3394 3394  
... ... @@ -84,7 +84,7 @@
84 84 */
85 85 static inline int is_arm_mapping_symbol(const char *str)
86 86 {
87   - return str[0] == '$' && strchr("atd", str[1])
  87 + return str[0] == '$' && strchr("axtd", str[1])
88 88 && (str[2] == '\0' || str[2] == '.');
89 89 }
90 90  
scripts/mod/modpost.c
Diff comments   View file @ 6c34f1f
... ... @@ -1146,7 +1146,7 @@
1146 1146  
1147 1147 static inline int is_arm_mapping_symbol(const char *str)
1148 1148 {
1149   - return str[0] == '$' && strchr("atd", str[1])
  1149 + return str[0] == '$' && strchr("axtd", str[1])
1150 1150 && (str[2] == '\0' || str[2] == '.');
1151 1151 }
1152 1152