From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753494AbbCPMFu (ORCPT ); Mon, 16 Mar 2015 08:05:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35857 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751638AbbCPMFq (ORCPT ); Mon, 16 Mar 2015 08:05:46 -0400 Date: Mon, 16 Mar 2015 05:05:15 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: rostedt@goodmis.org, tglx@linutronix.de, mingo@kernel.org, wad@chromium.org, keescook@chromium.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, dvlasenk@redhat.com, oleg@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, bp@alien8.de, ast@plumgrid.com Reply-To: ast@plumgrid.com, bp@alien8.de, torvalds@linux-foundation.org, hpa@zytor.com, oleg@redhat.com, dvlasenk@redhat.com, keescook@chromium.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, wad@chromium.org, mingo@kernel.org, rostedt@goodmis.org, tglx@linutronix.de In-Reply-To: <1425984307-2143-1-git-send-email-dvlasenk@redhat.com> References: <1425984307-2143-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Remove stub_iopl Git-Commit-ID: 616ab249f1e42f6135642183529f910fcedc2642 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: 616ab249f1e42f6135642183529f910fcedc2642 Gitweb: http://git.kernel.org/tip/616ab249f1e42f6135642183529f910fcedc2642 Author: Denys Vlasenko AuthorDate: Tue, 10 Mar 2015 11:45:06 +0100 Committer: Ingo Molnar CommitDate: Tue, 10 Mar 2015 13:56:10 +0100 x86/asm/entry/64: Remove stub_iopl stub_iopl is no longer needed: pt_regs->flags needs no fixing up after previous change. Remove it. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Will Drewry Link: http://lkml.kernel.org/r/1425984307-2143-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 13 ------------- arch/x86/syscalls/syscall_64.tbl | 2 +- arch/x86/um/sys_call_table_64.c | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 324200a..703ced0 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -421,22 +421,9 @@ ENTRY(stub_\func) END(stub_\func) .endm - .macro FIXED_FRAME label,func -ENTRY(\label) - CFI_STARTPROC - DEFAULT_FRAME 0, 8 /* offset 8: return address */ - FIXUP_TOP_OF_STACK %r11, 8 - call \func - RESTORE_TOP_OF_STACK %r11, 8 - ret - CFI_ENDPROC -END(\label) - .endm - FORK_LIKE clone FORK_LIKE fork FORK_LIKE vfork - FIXED_FRAME stub_iopl, sys_iopl ENTRY(stub_execve) CFI_STARTPROC diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl index 8d656fb..9ef32d5 100644 --- a/arch/x86/syscalls/syscall_64.tbl +++ b/arch/x86/syscalls/syscall_64.tbl @@ -178,7 +178,7 @@ 169 common reboot sys_reboot 170 common sethostname sys_sethostname 171 common setdomainname sys_setdomainname -172 common iopl stub_iopl +172 common iopl sys_iopl 173 common ioperm sys_ioperm 174 64 create_module 175 common init_module sys_init_module diff --git a/arch/x86/um/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c index 5cdfa9d..a75d8700 100644 --- a/arch/x86/um/sys_call_table_64.c +++ b/arch/x86/um/sys_call_table_64.c @@ -16,7 +16,7 @@ */ /* Not going to be implemented by UML, since we have no hardware. */ -#define stub_iopl sys_ni_syscall +#define sys_iopl sys_ni_syscall #define sys_ioperm sys_ni_syscall /*