From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758254AbbCDF2J (ORCPT ); Wed, 4 Mar 2015 00:28:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60636 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758238AbbCDF2F (ORCPT ); Wed, 4 Mar 2015 00:28:05 -0500 Date: Tue, 3 Mar 2015 21:27:31 -0800 From: tip-bot for Brian Gerst Message-ID: Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, hpa@zytor.com, brgerst@gmail.com Reply-To: hpa@zytor.com, mingo@kernel.org, torvalds@linux-foundation.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@alien8.de In-Reply-To: <1425439896-8322-2-git-send-email-brgerst@gmail.com> References: <1425439896-8322-2-git-send-email-brgerst@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/compat: Remove compat_ni_syscall() Git-Commit-ID: 29a5ff97fa0d8045d262a772c3853e3ef1ed98d8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 29a5ff97fa0d8045d262a772c3853e3ef1ed98d8 Gitweb: http://git.kernel.org/tip/29a5ff97fa0d8045d262a772c3853e3ef1ed98d8 Author: Brian Gerst AuthorDate: Tue, 3 Mar 2015 22:31:32 -0500 Committer: Ingo Molnar CommitDate: Wed, 4 Mar 2015 06:16:21 +0100 x86/compat: Remove compat_ni_syscall() compat_ni_syscall() does the same thing as sys_ni_syscall(). Signed-off-by: Brian Gerst Cc: Borislav Petkov Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1425439896-8322-2-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar --- arch/x86/ia32/Makefile | 2 +- arch/x86/ia32/nosyscall.c | 7 ------- arch/x86/ia32/syscall_ia32.c | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index e785b42..e66d850 100644 --- a/arch/x86/ia32/Makefile +++ b/arch/x86/ia32/Makefile @@ -3,7 +3,7 @@ # obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o -obj-$(CONFIG_IA32_EMULATION) += nosyscall.o syscall_ia32.o +obj-$(CONFIG_IA32_EMULATION) += syscall_ia32.o obj-$(CONFIG_IA32_AOUT) += ia32_aout.o diff --git a/arch/x86/ia32/nosyscall.c b/arch/x86/ia32/nosyscall.c deleted file mode 100644 index 51ecd5b..0000000 --- a/arch/x86/ia32/nosyscall.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include - -long compat_ni_syscall(void) -{ - return -ENOSYS; -} diff --git a/arch/x86/ia32/syscall_ia32.c b/arch/x86/ia32/syscall_ia32.c index 4754ba0..3429b14 100644 --- a/arch/x86/ia32/syscall_ia32.c +++ b/arch/x86/ia32/syscall_ia32.c @@ -13,13 +13,13 @@ typedef void (*sys_call_ptr_t)(void); -extern void compat_ni_syscall(void); +extern asmlinkage void sys_ni_syscall(void); const sys_call_ptr_t ia32_sys_call_table[__NR_ia32_syscall_max+1] = { /* * Smells like a compiler bug -- it doesn't work * when the & below is removed. */ - [0 ... __NR_ia32_syscall_max] = &compat_ni_syscall, + [0 ... __NR_ia32_syscall_max] = &sys_ni_syscall, #include };