From patchwork Wed Jun 23 10:02:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Munsie X-Patchwork-Id: 56632 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 62A3EB82AB for ; Wed, 23 Jun 2010 20:05:34 +1000 (EST) Received: by ozlabs.org (Postfix) id 2D4F7B73F8; Wed, 23 Jun 2010 20:04:12 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e23smtp07.au.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 25101B73F4 for ; Wed, 23 Jun 2010 20:04:12 +1000 (EST) Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id o5NA4Gkh006285 for ; Wed, 23 Jun 2010 20:04:16 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5NA4BBn1314942 for ; Wed, 23 Jun 2010 20:04:11 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5NA491U027486 for ; Wed, 23 Jun 2010 20:04:11 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5NA49Xb027477; Wed, 23 Jun 2010 20:04:09 +1000 Received: from delenn.ozlabs.ibm.com (haven.au.ibm.com [9.190.164.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.au.ibm.com (Postfix) with ESMTP id 380EF7375E; Wed, 23 Jun 2010 20:04:09 +1000 (EST) From: "Ian Munsie" To: linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH 06/40] x86: add arch_compat_syscall_addr() Date: Wed, 23 Jun 2010 20:02:47 +1000 Message-Id: <1277287401-28571-7-git-send-email-imunsie@au1.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> References: <1277287401-28571-1-git-send-email-imunsie@au1.ibm.com> Cc: x86@kernel.org, Paul Mundt , Frederic Weisbecker , Jason Baron , "H. Peter Anvin" , Heiko Carstens , Steven Rostedt , Ingo Molnar , Paul Mackerras , Ian Munsie , Thomas Gleixner , "David S. Miller" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org From: Jason Baron 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 Signed-off-by: Ian Munsie --- 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 #include +#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 #include #include +#include #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