1 files changed, 24 insertions, 9 deletions

diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index fc3a2203c566..3dfb80b86561 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -65,19 +65,34 @@ struct dyn_arch_ftrace {
 #endif /* CONFIG_FUNCTION_TRACER */
 
 #ifndef __ASSEMBLY__
-#if defined(CONFIG_FTRACE_SYSCALLS) && defined(PPC64_ELF_ABI_v1)
+#ifdef CONFIG_FTRACE_SYSCALLS
+/*
+ * Some syscall entry functions on powerpc start with "ppc_" (fork and clone,
+ * for instance) or ppc32_/ppc64_. We should also match the sys_ variant with
+ * those.
+ */
 #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
+#ifdef PPC64_ELF_ABI_v1
 static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
 {
-        /*
-         * Compare the symbol name with the system call name. Skip the .sys or .SyS
-         * prefix from the symbol name and the sys prefix from the system call name and
-         * just match the rest. This is only needed on ppc64 since symbol names on
-         * 32bit do not start with a period so the generic function will work.
-         */
-        return !strcmp(sym + 4, name + 3);
+        /* We need to skip past the initial dot, and the __se_sys alias */
+        return !strcmp(sym + 1, name) ||
+                (!strncmp(sym, ".__se_sys", 9) && !strcmp(sym + 6, name)) ||
+                (!strncmp(sym, ".ppc_", 5) && !strcmp(sym + 5, name + 4)) ||
+                (!strncmp(sym, ".ppc32_", 7) && !strcmp(sym + 7, name + 4)) ||
+                (!strncmp(sym, ".ppc64_", 7) && !strcmp(sym + 7, name + 4));
 }
-#endif /* CONFIG_FTRACE_SYSCALLS && PPC64_ELF_ABI_v1 */
+#else
+static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
+{
+        return !strcmp(sym, name) ||
+                (!strncmp(sym, "__se_sys", 8) && !strcmp(sym + 5, name)) ||
+                (!strncmp(sym, "ppc_", 4) && !strcmp(sym + 4, name + 4)) ||
+                (!strncmp(sym, "ppc32_", 6) && !strcmp(sym + 6, name + 4)) ||
+                (!strncmp(sym, "ppc64_", 6) && !strcmp(sym + 6, name + 4));
+}
+#endif /* PPC64_ELF_ABI_v1 */
+#endif /* CONFIG_FTRACE_SYSCALLS */
 
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>