[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100317191136.GB5059@nowhere>
Date: Wed, 17 Mar 2010 20:11:39 +0100
From: Frederic Weisbecker <fweisbec@...il.com>
To: Jason Baron <jbaron@...hat.com>
Cc: mingo@...e.hu, rostedt@...dmis.org, linux-kernel@...r.kernel.org,
laijs@...fujitsu.com, lizf@...fujitsu.com, hpa@...or.com,
tglx@...utronix.de, mhiramat@...hat.com, heiko.carstens@...ibm.com,
benh@...nel.crashing.org, davem@...emloft.net, lethal@...ux-sh.org,
schwidefsky@...ibm.com, brueckner@...ux.vnet.ibm.com,
tony.luck@...el.com
Subject: Re: [PATCH 02/14] x86: add arch_compat_syscall_addr()
On Tue, Mar 16, 2010 at 01:46:17PM -0400, Jason Baron wrote:
> 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@...hat.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
> +
A config would be better:
arch/Kconfig:
config HAVE_COMPAT_FTRACE_SYSCALLS
bool
config COMPAT_FTRACE_SYSCALLS
def_bool y
depends on COMPAT && FTRACE_SYSCALLS && HAVE_COMPAT_FTRACE_SYSCALLS
arch/x86/Kconfig:
config X86
[...]
select HAVE_COMPAT_FTRACE_SYSCALLS
[...]
So that we centralize the definition of COMPAT_FTRACE_SYSCALLS and
we don't need every archs to redefine the dependency and to stay sync
with potential dependency changes.
Thanks.
> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists