From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751260AbdHXIHn (ORCPT ); Thu, 24 Aug 2017 04:07:43 -0400 Received: from mx2.suse.de ([195.135.220.15]:47741 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751446AbdHXIG0 (ORCPT ); Thu, 24 Aug 2017 04:06:26 -0400 From: Jiri Slaby To: mingo@redhat.com Cc: linux-kernel@vger.kernel.org, Jiri Slaby , "H. Peter Anvin" , Thomas Gleixner , x86@kernel.org Subject: [PATCH 2/2] x86: entry, use ENTRY instead of ALIGN+GLOBAL for stub32_clone Date: Thu, 24 Aug 2017 10:06:24 +0200 Message-Id: <20170824080624.7768-2-jslaby@suse.cz> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170824080624.7768-1-jslaby@suse.cz> References: <20170824080624.7768-1-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. And since each ENTRY should be balanced by some END*, 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: "H. Peter Anvin" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: --- 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 d8468ba24be0..e26c25ca7756 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -340,8 +340,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). @@ -351,3 +350,4 @@ GLOBAL(stub32_clone) */ xchg %r8, %rcx jmp sys_clone +ENDPROC(stub32_clone) -- 2.14.1