From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753205AbdH2NLh (ORCPT ); Tue, 29 Aug 2017 09:11:37 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48315 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753109AbdH2NLg (ORCPT ); Tue, 29 Aug 2017 09:11:36 -0400 Date: Tue, 29 Aug 2017 06:05:47 -0700 From: tip-bot for Jiri Slaby Message-ID: Cc: peterz@infradead.org, luto@kernel.org, jpoimboe@redhat.com, hpa@zytor.com, jslaby@suse.cz, torvalds@linux-foundation.org, tglx@linutronix.de, bp@alien8.de, mingo@kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org Reply-To: peterz@infradead.org, jpoimboe@redhat.com, luto@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, jslaby@suse.cz, bp@alien8.de, tglx@linutronix.de, mingo@kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <20170824080624.7768-2-jslaby@suse.cz> References: <20170824080624.7768-2-jslaby@suse.cz> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry/64: Use ENTRY() instead of ALIGN+GLOBAL for stub32_clone() Git-Commit-ID: 499934898fcd15e4337dc858be6c09cd9fd74e85 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: 499934898fcd15e4337dc858be6c09cd9fd74e85 Gitweb: http://git.kernel.org/tip/499934898fcd15e4337dc858be6c09cd9fd74e85 Author: Jiri Slaby AuthorDate: Thu, 24 Aug 2017 10:06:24 +0200 Committer: Ingo Molnar CommitDate: Tue, 29 Aug 2017 13:23:30 +0200 x86/entry/64: Use ENTRY() instead of ALIGN+GLOBAL for stub32_clone() ALIGN+GLOBAL is effectively what ENTRY() does, so use ENTRY() which is dedicated for exactly this purpose -- global functions. Note that stub32_clone() is a C-like leaf function -- it has a standard call frame -- it only switches one argument and continues by jumping into C. Since each ENTRY() should be balanced by some END*() marker, we add a corresponding ENDPROC() to stub32_clone() too. Besides that, x86's custom GLOBAL macro is going to die very soon. Signed-off-by: Jiri Slaby Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20170824080624.7768-2-jslaby@suse.cz Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64_compat.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index 5314d7b..4b86d8d 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -341,8 +341,7 @@ ENTRY(entry_INT80_compat) jmp restore_regs_and_iret END(entry_INT80_compat) - ALIGN -GLOBAL(stub32_clone) +ENTRY(stub32_clone) /* * The 32-bit clone ABI is: clone(..., int tls_val, int *child_tidptr). * The 64-bit clone ABI is: clone(..., int *child_tidptr, int tls_val). @@ -352,3 +351,4 @@ GLOBAL(stub32_clone) */ xchg %r8, %rcx jmp sys_clone +ENDPROC(stub32_clone)