From patchwork Fri Feb 17 10:47:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 9579617 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 2479C600F6 for ; Fri, 17 Feb 2017 10:50:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17511286AB for ; Fri, 17 Feb 2017 10:50:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B438286AD; Fri, 17 Feb 2017 10:50:23 +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 8FE24286AB for ; Fri, 17 Feb 2017 10:50:22 +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 1ceg55-0002sE-H1; Fri, 17 Feb 2017 10:48:03 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ceg54-0002rD-BU for xen-devel@lists.xenproject.org; Fri, 17 Feb 2017 10:48:02 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id 14/19-31242-1E4D6A85; Fri, 17 Feb 2017 10:48:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGLMWRWlGSWpSXmKPExsVyuP0Ov+7DK8s iDHZmW3zfMpnJgdHj8IcrLAGMUayZeUn5FQmsGX+3pxRMkaiYunILewPjd5EuRk4OCQEjibcT /zF1MXJxCAksZJT4MHUyI0iCTUBRouXsNSYQW0RAROLgw+1sIEXMAo3MEo0PXwIlODiEBZwlr rUYgdSwCKhKfL39iQ3E5hUwlljddJ8FpERCQF5i1z3TCYycCxgZVjGqF6cWlaUW6VrqJRVlpm eU5CZm5ugaGpjp5aYWFyemp+YkJhXrJefnbmIE+okBCHYw3t0UcIhRkoNJSZR30bRlEUJ8Sfk plRmJxRnxRaU5qcWHGGU4OJQkeFsvA+UEi1LTUyvSMnOAAQOTluDgURLhnXAJKM1bXJCYW5yZ DpE6xajLcerG6ZdMQix5+XmpUuK8j0BmCIAUZZTmwY2ABe8lRlkpYV5GoKOEeApSi3IzS1DlX zGKczAqCfPuB5nCk5lXArfpFdARTEBHdEYsBTmiJBEhJdXAmKDyVOBxMe+TTIlFN9JcTW48Oz qZqe7HraupinqNM70+33netzB9j5P4ra9Rr/8u3vL17ctrc62dtl79VOhsf9pf48qB7puHorj c9smw81/cts9qlnHl3ktCcudLLZa/YS8xvhcY+C/x8S8dxn9yrn+sNwQ0uVpc+a9hpKTbLTVv RdaeHI0sZiWW4oxEQy3mouJEAAKK4pJZAgAA X-Env-Sender: jslaby@suse.cz X-Msg-Ref: server-5.tower-21.messagelabs.com!1487328480!50255693!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 34438 invoked from network); 17 Feb 2017 10:48:00 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-5.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 17 Feb 2017 10:48:00 -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 D982EAAB2; Fri, 17 Feb 2017 10:47:59 +0000 (UTC) From: Jiri Slaby To: mingo@redhat.com Date: Fri, 17 Feb 2017 11:47:48 +0100 Message-Id: <20170217104757.28588-1-jslaby@suse.cz> X-Mailer: git-send-email 2.11.1 Cc: Juergen Gross , Len Brown , hpa@zytor.com, linux-pm@vger.kernel.org, x86@kernel.org, "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, Pavel Machek , jpoimboe@redhat.com, xen-devel@lists.xenproject.org, tglx@linutronix.de, Jiri Slaby , Boris Ostrovsky Subject: [Xen-devel] [PATCH 01/10] x86: assembly, ENTRY for fn, GLOBAL for data 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 This is a start of series to unify use of ENTRY, ENDPROC, GLOBAL, END, and other macros across x86. When we have all this sorted out, this will help to inject DWARF unwinding info by objtool later. So, let us use the macros this way: * ENTRY -- start of a global function * ENDPROC -- end of a local/global function * GLOBAL -- start of a globally visible data symbol * END -- end of local/global data symbol The goal is forcing ENTRY to emit .cfi_startproc and ENDPROC to emit .cfi_endproc. This particular patch makes proper use of GLOBAL on data and ENTRY on a function which was not the case on 4 locations. Signed-off-by: Jiri Slaby Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Cc: Boris Ostrovsky Cc: Juergen Gross Cc: Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: Pavel Machek Cc: Reviewed-by: Juergen Gross --- arch/x86/kernel/acpi/wakeup_64.S | 14 +++++++------- arch/x86/kernel/head_64.S | 2 +- arch/x86/kernel/mcount_64.S | 2 +- arch/x86/xen/xen-head.S | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S index 50b8ed0317a3..bfd0ddefa5e8 100644 --- a/arch/x86/kernel/acpi/wakeup_64.S +++ b/arch/x86/kernel/acpi/wakeup_64.S @@ -125,12 +125,12 @@ ENTRY(do_suspend_lowlevel) ENDPROC(do_suspend_lowlevel) .data -ENTRY(saved_rbp) .quad 0 -ENTRY(saved_rsi) .quad 0 -ENTRY(saved_rdi) .quad 0 -ENTRY(saved_rbx) .quad 0 +GLOBAL(saved_rbp) .quad 0 +GLOBAL(saved_rsi) .quad 0 +GLOBAL(saved_rdi) .quad 0 +GLOBAL(saved_rbx) .quad 0 -ENTRY(saved_rip) .quad 0 -ENTRY(saved_rsp) .quad 0 +GLOBAL(saved_rip) .quad 0 +GLOBAL(saved_rsp) .quad 0 -ENTRY(saved_magic) .quad 0 +GLOBAL(saved_magic) .quad 0 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b467b14b03eb..7c14ab3a0f3b 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -489,7 +489,7 @@ early_gdt_descr: early_gdt_descr_base: .quad INIT_PER_CPU_VAR(gdt_page) -ENTRY(phys_base) +GLOBAL(phys_base) /* This must match the first entry in level2_kernel_pgt */ .quad 0x0000000000000000 EXPORT_SYMBOL(phys_base) diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S index b50b283f90e4..3e35675e201e 100644 --- a/arch/x86/kernel/mcount_64.S +++ b/arch/x86/kernel/mcount_64.S @@ -314,7 +314,7 @@ ENTRY(ftrace_graph_caller) retq END(ftrace_graph_caller) -GLOBAL(return_to_handler) +ENTRY(return_to_handler) subq $24, %rsp /* Save the return values */ diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 37794e42b67d..39ea5484763a 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -37,7 +37,7 @@ ENTRY(startup_xen) .pushsection .text .balign PAGE_SIZE -ENTRY(hypercall_page) +GLOBAL(hypercall_page) .skip PAGE_SIZE #define HYPERCALL(n) \