From: Jiri Slaby <jslaby@suse.cz>
To: mingo@redhat.com
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Slaby <jslaby@suse.cz>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v5 02/27] x86: assembly, use SYM_DATA for data
Date: Thu, 30 Nov 2017 15:46:28 +0100 [thread overview]
Message-ID: <20171130144653.23688-3-jslaby@suse.cz> (raw)
In-Reply-To: <20171130144653.23688-1-jslaby@suse.cz>
We make proper use of SYM_DATA on global data instead of marking them as
ENTRY. ENTRY is intended for functions and shall be paired with ENDPROC.
ENTRY also aligns symbols which creates unnecessary holes here between
data.
ENTRY from saved_eip in wakeup_32 and many saved_* in wakeup_64 is
simply dropped, as these symbols are local only.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-pm@vger.kernel.org
---
arch/x86/kernel/acpi/wakeup_32.S | 4 ++--
arch/x86/kernel/acpi/wakeup_64.S | 14 +++++++-------
arch/x86/kernel/head_32.S | 6 ++----
arch/x86/kernel/head_64.S | 5 ++---
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index 0c26b1b44e51..feac1e5ecba0 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
@@ -89,8 +89,8 @@ ret_point:
.data
ALIGN
-ENTRY(saved_magic) .long 0
-ENTRY(saved_eip) .long 0
+SYM_DATA(saved_magic, .long 0)
+saved_eip: .long 0
# saved registers
saved_idt: .long 0,0
diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index 50b8ed0317a3..551758f48eb7 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
+saved_rbp: .quad 0
+saved_rsi: .quad 0
+saved_rdi: .quad 0
+saved_rbx: .quad 0
-ENTRY(saved_rip) .quad 0
-ENTRY(saved_rsp) .quad 0
+saved_rip: .quad 0
+saved_rsp: .quad 0
-ENTRY(saved_magic) .quad 0
+SYM_DATA(saved_magic, .quad 0)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index c29020907886..3bfe12f4a015 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -507,10 +507,8 @@ GLOBAL(early_recursion_flag)
__REFDATA
.align 4
-ENTRY(initial_code)
- .long i386_start_kernel
-ENTRY(setup_once_ref)
- .long setup_once
+SYM_DATA(initial_code, .long i386_start_kernel)
+SYM_DATA(setup_once_ref, .long setup_once)
/*
* BSS section
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 58087ab1782e..3891cc6d62dc 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -454,9 +454,8 @@ early_gdt_descr:
early_gdt_descr_base:
.quad INIT_PER_CPU_VAR(gdt_page)
-ENTRY(phys_base)
- /* This must match the first entry in level2_kernel_pgt */
- .quad 0x0000000000000000
+/* This must match the first entry in level2_kernel_pgt */
+SYM_DATA(phys_base, .quad 0x0000000000000000)
EXPORT_SYMBOL(phys_base)
#include "../../x86/xen/xen-head.S"
--
2.15.0
next prev parent reply other threads:[~2017-11-30 14:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 14:46 [PATCH v5 00/27] New macros for assembler symbols Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 01/27] linkage: new " Jiri Slaby
2017-11-30 14:46 ` Jiri Slaby [this message]
2017-11-30 14:46 ` [PATCH v5 03/27] x86: assembly, annotate relocate_kernel Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 04/27] x86: entry, annotate THUNKs Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 05/27] x86: assembly, annotate local pseudo-functions Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 06/27] x86: crypto, annotate local functions Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 07/27] x86: boot, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 08/27] x86: assembly, annotate aliases Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 09/27] x86: entry, annotate interrupt symbols properly Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 10/27] x86: head, annotate data appropriatelly Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 11/27] x86: boot, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 12/27] x86: um, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 13/27] x86: xen-pvh, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 14/27] x86: purgatory, start using annotations Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 15/27] x86: assembly, do not annotate functions by GLOBAL Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 16/27] x86: assembly, use SYM_CODE_INNER_LABEL instead of GLOBAL Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 17/27] x86: realmode, use SYM_DATA_* " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 18/27] x86: assembly, remove GLOBAL macro Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 19/27] x86: assembly, make some functions local Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 20/27] x86: ftrace, mark function_hook as function Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 21/27] x86_64: assembly, add ENDs to some functions and relabel with SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 22/27] x86_64: assembly, change all ENTRY+END to SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 23/27] x86_64: assembly, change all ENTRY+ENDPROC to SYM_FUNC_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 24/27] x86_32: assembly, add ENDs to some functions and relabel with SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 25/27] x86_32: assembly, change all ENTRY+END to SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 26/27] x86_32: assembly, change all ENTRY+ENDPROC to SYM_FUNC_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 27/27] x86: assembly, replace WEAK uses Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171130144653.23688-3-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®