[PATCH 02/14] x86: add arch_compat_syscall_addr()
in [Kernel]
|
Prev: [PATCH 14/14] tracing: make a "compat_syscalls" tracing subsys
Next: [PATCH 1/2] scripts/kernel-doc: fix fatal error in function signature
From: Jason Baron on 16 Mar 2010 13:50 Add arch_compat_syscall_addr(int nr) for x86_64. This is in preparation for adding compat syscall support to the event tracer. Signed-off-by: Jason Baron <jbaron(a)redhat.com> --- arch/x86/include/asm/syscall.h | 5 +++++ arch/x86/kernel/ftrace.c | 8 ++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index c4a348f..4e462cc 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -16,7 +16,12 @@ #include <linux/sched.h> #include <linux/err.h> +#if defined(CONFIG_COMPAT) && defined(CONFIG_FTRACE_SYSCALLS) + #define __HAVE_ARCH_FTRACE_COMPAT_SYSCALLS +#endif + extern const unsigned long sys_call_table[]; +extern const unsigned long *ia32_sys_call_table; /* * Only the low 32 bits of orig_ax are meaningful, so we return int. diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index cd37469..4b36a0b 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -26,6 +26,7 @@ #include <asm/ftrace.h> #include <asm/nops.h> #include <asm/nmi.h> +#include <asm/syscall.h> #ifdef CONFIG_DYNAMIC_FTRACE @@ -510,3 +511,10 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, } } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ + +#ifdef __HAVE_ARCH_FTRACE_COMPAT_SYSCALLS +unsigned long __init arch_compat_syscall_addr(int nr) +{ + return (unsigned long)(&ia32_sys_call_table)[nr]; +} +#endif -- 1.6.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |