From patchwork Fri Feb 17 10:47:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 9579621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB7A4600F6 for ; Fri, 17 Feb 2017 10:50:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE591286AB for ; Fri, 17 Feb 2017 10:50:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B33B2286AD; Fri, 17 Feb 2017 10:50:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3E716286AB for ; Fri, 17 Feb 2017 10:50:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ceg5B-0002wv-1J; Fri, 17 Feb 2017 10:48:09 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ceg59-0002vP-Rn for xen-devel@lists.xenproject.org; Fri, 17 Feb 2017 10:48:07 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id E2/3B-26824-7E4D6A85; Fri, 17 Feb 2017 10:48:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ov+6zK8s iDG7d0LD4vmUykwOjx+EPV1gCGKNYM/OS8isSWDN2bHjMUnBFtmLl4kssDYyvJbsYOTkkBIwk 3k78x9TFyMUhJLCQUeLZ3H+MIAk2AUWJlrPXmEBsEQERiYMPt7OBFDELfGCSWLtzK1hCWMBMY nvLRTYQm0VAVWLb3y8sIDavgLHE2bdfWbsYOYA2yEvsumcKEuYUMJHYcHIXWIkQUMnF109ZJz ByL2BkWMWoUZxaVJZapGtkrJdUlJmeUZKbmJmja2hgppebWlycmJ6ak5hUrJecn7uJEehfBiD YwfhnfuAhRkkOJiVR3kXTlkUI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuBtvQyUEyxKTU+tSMvM AQYaTFqCg0dJhHfCJaA0b3FBYm5xZjpE6hSjLsepG6dfMgmx5OXnpUqJ8xaBzBAAKcoozYMbA Qv6S4yyUsK8jEBHCfEUpBblZpagyr9iFOdgVBLmbQOZwpOZVwK36RXQEUxAR3RGLAU5oiQRIS XVwMh+vZwzNGrX+jymkrCF7JHR/h27Mmv+GVhK3NC+WrZhp2xN7oHTB9M9C49/LnltKvXb7fC NtjWRPFeqVlz0Onl65dSO3HUKR08//N98jENpi7FBgTlzp/Ashn96wfvOfDBNvbZ3+S2JcJm5 k5eaXI/4enynqopRrEUSq+um7DIT33dfOe6duqTEUpyRaKjFXFScCABpsudAdQIAAA== X-Env-Sender: jslaby@suse.cz X-Msg-Ref: server-13.tower-21.messagelabs.com!1487328486!52374843!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4647 invoked from network); 17 Feb 2017 10:48:06 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-13.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 17 Feb 2017 10:48:06 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3636FADCD; Fri, 17 Feb 2017 10:48:06 +0000 (UTC) From: Jiri Slaby To: mingo@redhat.com Date: Fri, 17 Feb 2017 11:47:55 +0100 Message-Id: <20170217104757.28588-8-jslaby@suse.cz> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170217104757.28588-1-jslaby@suse.cz> References: <20170217104757.28588-1-jslaby@suse.cz> Cc: Juergen Gross , hpa@zytor.com, Herbert Xu , Boris Ostrovsky , x86@kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, jpoimboe@redhat.com, xen-devel@lists.xenproject.org, tglx@linutronix.de, Jiri Slaby , "David S. Miller" Subject: [Xen-devel] [PATCH 08/10] x86: assembly, annotate aliases X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP _key_expansion_128 is an alias to _key_expansion_256a, __memcpy to memcpy, xen_syscall32_target to xen_sysenter_target, and so on. Annotate them all using the new ENTRY_ALIAS and ENTRY_LOCAL_ALIAS. This will make the tools generating the debuginfo happy. Signed-off-by: Jiri Slaby Cc: Herbert Xu Cc: "David S. Miller" Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Cc: Boris Ostrovsky Cc: Juergen Gross Cc: Cc: Reviewed-by: Juergen Gross --- arch/x86/crypto/aesni-intel_asm.S | 5 ++--- arch/x86/lib/memcpy_64.S | 4 ++-- arch/x86/lib/memmove_64.S | 4 ++-- arch/x86/lib/memset_64.S | 4 ++-- arch/x86/xen/xen-asm_64.S | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index 624e4303d0fb..6a0f25be1a56 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S @@ -1744,8 +1744,7 @@ ENDPROC(aesni_gcm_enc) #endif -.align 4 -_key_expansion_128: +ENTRY_LOCAL_ALIAS(_key_expansion_128) ENTRY_LOCAL(_key_expansion_256a) pshufd $0b11111111, %xmm1, %xmm1 shufps $0b00010000, %xmm0, %xmm4 @@ -1756,8 +1755,8 @@ ENTRY_LOCAL(_key_expansion_256a) movaps %xmm0, (TKEYP) add $0x10, TKEYP ret -ENDPROC(_key_expansion_128) ENDPROC(_key_expansion_256a) +END_ALIAS(_key_expansion_128) ENTRY_LOCAL(_key_expansion_192a) pshufd $0b01010101, %xmm1, %xmm1 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S index 779782f58324..c9ac54822e87 100644 --- a/arch/x86/lib/memcpy_64.S +++ b/arch/x86/lib/memcpy_64.S @@ -26,7 +26,7 @@ * Output: * rax original destination */ -ENTRY(__memcpy) +ENTRY_ALIAS(__memcpy) ENTRY(memcpy) ALTERNATIVE_2 "jmp memcpy_orig", "", X86_FEATURE_REP_GOOD, \ "jmp memcpy_erms", X86_FEATURE_ERMS @@ -40,7 +40,7 @@ ENTRY(memcpy) rep movsb ret ENDPROC(memcpy) -ENDPROC(__memcpy) +END_ALIAS(__memcpy) EXPORT_SYMBOL(memcpy) EXPORT_SYMBOL(__memcpy) diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S index 15de86cd15b0..76f54ba3dd26 100644 --- a/arch/x86/lib/memmove_64.S +++ b/arch/x86/lib/memmove_64.S @@ -25,7 +25,7 @@ */ .weak memmove -ENTRY(memmove) +ENTRY_ALIAS(memmove) ENTRY(__memmove) /* Handle more 32 bytes in loop */ @@ -207,6 +207,6 @@ ENTRY(__memmove) 13: retq ENDPROC(__memmove) -ENDPROC(memmove) +END_ALIAS(memmove) EXPORT_SYMBOL(__memmove) EXPORT_SYMBOL(memmove) diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index 55b95db30a61..be6c4705ec51 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S @@ -18,7 +18,7 @@ * * rax original destination */ -ENTRY(memset) +ENTRY_ALIAS(memset) ENTRY(__memset) /* * Some CPUs support enhanced REP MOVSB/STOSB feature. It is recommended @@ -42,8 +42,8 @@ ENTRY(__memset) rep stosb movq %r9,%rax ret -ENDPROC(memset) ENDPROC(__memset) +END_ALIAS(memset) EXPORT_SYMBOL(memset) EXPORT_SYMBOL(__memset) diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index d617bea76039..4b0fe749f10c 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -117,13 +117,13 @@ ENDPROC(xen_sysenter_target) #else /* !CONFIG_IA32_EMULATION */ -ENTRY(xen_syscall32_target) +ENTRY_ALIAS(xen_syscall32_target) ENTRY(xen_sysenter_target) lea 16(%rsp), %rsp /* strip %rcx, %r11 */ mov $-ENOSYS, %rax pushq $0 jmp hypercall_iret -ENDPROC(xen_syscall32_target) ENDPROC(xen_sysenter_target) +END_ALIAS(xen_syscall32_target) #endif /* CONFIG_IA32_EMULATION */