From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758052AbcIPHNo (ORCPT ); Fri, 16 Sep 2016 03:13:44 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:5373 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755380AbcIPHMX (ORCPT ); Fri, 16 Sep 2016 03:12:23 -0400 From: Marcin Nowakowski To: CC: Marcin Nowakowski , Ingo Molnar , Chris Metcalf Subject: [PATCH v2 09/11] tile/tracing: fix compat syscall handling Date: Fri, 16 Sep 2016 09:11:25 +0200 Message-ID: <1474009887-7225-10-git-send-email-marcin.nowakowski@imgtec.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474009887-7225-1-git-send-email-marcin.nowakowski@imgtec.com> References: <1474009887-7225-1-git-send-email-marcin.nowakowski@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.2.5] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add missing arch code - arch_trace_is_compat_syscall and arch_syscall_addr Signed-off-by: Marcin Nowakowski Cc:Cc: Steven Rostedt Cc: Ingo Molnar Cc: Chris Metcalf --- arch/tile/include/asm/ftrace.h | 10 ++++++++++ arch/tile/kernel/Makefile | 1 + arch/tile/kernel/ftrace.c | 13 +++++++++++++ 3 files changed, 24 insertions(+) diff --git a/arch/tile/include/asm/ftrace.h b/arch/tile/include/asm/ftrace.h index 738d239..e99b598 100644 --- a/arch/tile/include/asm/ftrace.h +++ b/arch/tile/include/asm/ftrace.h @@ -35,6 +35,16 @@ struct dyn_arch_ftrace { }; #endif /* CONFIG_DYNAMIC_FTRACE */ +#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_COMPAT) +#include + +#define ARCH_COMPAT_SYSCALL_NUMBERS_OVERLAP 1 +static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) +{ + return in_compat_syscall(); +} +#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_COMPAT */ + #endif /* __ASSEMBLY__ */ #endif /* CONFIG_FUNCTION_TRACER */ diff --git a/arch/tile/kernel/Makefile b/arch/tile/kernel/Makefile index 09936d0..4de0989 100644 --- a/arch/tile/kernel/Makefile +++ b/arch/tile/kernel/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_USE_PMC) += pmc.o obj-$(CONFIG_TILE_USB) += usb.o obj-$(CONFIG_TILE_HVGLUE_TRACE) += hvglue_trace.o obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o mcount_64.o +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o diff --git a/arch/tile/kernel/ftrace.c b/arch/tile/kernel/ftrace.c index 4a57208..0e71b6b 100644 --- a/arch/tile/kernel/ftrace.c +++ b/arch/tile/kernel/ftrace.c @@ -21,6 +21,7 @@ #include #include #include +#include #include @@ -237,3 +238,15 @@ int ftrace_disable_ftrace_graph_caller(void) } #endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ + +#if (defined CONFIG_FTRACE_SYSCALLS) && (defined CONFIG_COMPAT) + +unsigned long __init arch_syscall_addr(int nr, bool compat) +{ + if (compat) + return (unsigned long)compat_sys_call_table[nr]; + + return (unsigned long)sys_call_table[nr]; +} + +#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_COMPAT */ -- 2.7.4