Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933678AbbDVOMG (ORCPT ); Wed, 22 Apr 2015 10:12:06 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37058 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965361AbbDVOMB (ORCPT ); Wed, 22 Apr 2015 10:12:01 -0400 Date: Wed, 22 Apr 2015 07:11:28 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: keescook@chromium.org, fweisbec@gmail.com, ast@plumgrid.com, tglx@linutronix.de, dvlasenk@redhat.com, brgerst@gmail.com, linux-kernel@vger.kernel.org, wad@chromium.org, luto@amacapital.net, rostedt@goodmis.org, mingo@kernel.org, torvalds@linux-foundation.org, oleg@redhat.com, bp@alien8.de, hpa@zytor.com Reply-To: brgerst@gmail.com, linux-kernel@vger.kernel.org, keescook@chromium.org, fweisbec@gmail.com, ast@plumgrid.com, dvlasenk@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, oleg@redhat.com, mingo@kernel.org, hpa@zytor.com, bp@alien8.de, luto@amacapital.net, wad@chromium.org, rostedt@goodmis.org In-Reply-To: <1429632194-13445-1-git-send-email-dvlasenk@redhat.com> References: <1429632194-13445-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Merge 32-bit execve stubs with x32 ones, as they are identical Git-Commit-ID: ac7f5dfb0348a33b2ea92a0c477103c4db45ad4e 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 Content-Length: 2514 Lines: 85 Commit-ID: ac7f5dfb0348a33b2ea92a0c477103c4db45ad4e Gitweb: http://git.kernel.org/tip/ac7f5dfb0348a33b2ea92a0c477103c4db45ad4e Author: Denys Vlasenko AuthorDate: Tue, 21 Apr 2015 18:03:13 +0200 Committer: Ingo Molnar CommitDate: Wed, 22 Apr 2015 08:41:44 +0200 x86/asm/entry/64: Merge 32-bit execve stubs with x32 ones, as they are identical Run-tested. Suggested-by: Brian Gerst Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Will Drewry Link: http://lkml.kernel.org/r/1429632194-13445-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 3c78a15..e952f6b 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -525,40 +525,27 @@ GLOBAL(stub_execveat) CFI_ENDPROC END(stub_execveat) -#ifdef CONFIG_X86_X32_ABI +#if defined(CONFIG_X86_X32_ABI) || defined(CONFIG_IA32_EMULATION) .align 8 GLOBAL(stub_x32_execve) +GLOBAL(stub32_execve) CFI_STARTPROC DEFAULT_FRAME 0, 8 call compat_sys_execve jmp return_from_execve CFI_ENDPROC +END(stub32_execve) END(stub_x32_execve) .align 8 GLOBAL(stub_x32_execveat) - CFI_STARTPROC - DEFAULT_FRAME 0, 8 - call compat_sys_execveat - jmp return_from_execve - CFI_ENDPROC -END(stub_x32_execveat) -#endif - -#ifdef CONFIG_IA32_EMULATION - .align 8 -GLOBAL(stub32_execve) - CFI_STARTPROC - call compat_sys_execve - jmp return_from_execve - CFI_ENDPROC -END(stub32_execve) - .align 8 GLOBAL(stub32_execveat) CFI_STARTPROC + DEFAULT_FRAME 0, 8 call compat_sys_execveat jmp return_from_execve CFI_ENDPROC END(stub32_execveat) +END(stub_x32_execveat) #endif /* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/