|
@@ -87,6 +87,7 @@ static int choose_best_symbol(struct symbol *syma, struct symbol *symb)
|
|
|
{
|
|
|
s64 a;
|
|
|
s64 b;
|
|
|
+ size_t na, nb;
|
|
|
|
|
|
/* Prefer a symbol with non zero length */
|
|
|
a = syma->end - syma->start;
|
|
@@ -120,11 +121,21 @@ static int choose_best_symbol(struct symbol *syma, struct symbol *symb)
|
|
|
else if (a > b)
|
|
|
return SYMBOL_B;
|
|
|
|
|
|
- /* If all else fails, choose the symbol with the longest name */
|
|
|
- if (strlen(syma->name) >= strlen(symb->name))
|
|
|
+ /* Choose the symbol with the longest name */
|
|
|
+ na = strlen(syma->name);
|
|
|
+ nb = strlen(symb->name);
|
|
|
+ if (na > nb)
|
|
|
return SYMBOL_A;
|
|
|
- else
|
|
|
+ else if (na < nb)
|
|
|
+ return SYMBOL_B;
|
|
|
+
|
|
|
+ /* Avoid "SyS" kernel syscall aliases */
|
|
|
+ if (na >= 3 && !strncmp(syma->name, "SyS", 3))
|
|
|
return SYMBOL_B;
|
|
|
+ if (na >= 10 && !strncmp(syma->name, "compat_SyS", 10))
|
|
|
+ return SYMBOL_B;
|
|
|
+
|
|
|
+ return SYMBOL_A;
|
|
|
}
|
|
|
|
|
|
void symbols__fixup_duplicate(struct rb_root *symbols)
|