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>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Subject: [PATCH v5 18/27] x86: assembly, remove GLOBAL macro
Date: Thu, 30 Nov 2017 15:46:44 +0100 [thread overview]
Message-ID: <20171130144653.23688-19-jslaby@suse.cz> (raw)
In-Reply-To: <20171130144653.23688-1-jslaby@suse.cz>
Convert the remaining 32bit users and remove GLOBAL macro finally. In
particular, this means to use SYM_ENTRY for the singlestepping hack
region.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
---
arch/x86/entry/entry_32.S | 4 ++--
arch/x86/include/asm/linkage.h | 8 --------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index b99e552f932a..4cef47b8027f 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -346,7 +346,7 @@ ENTRY(resume_kernel)
END(resume_kernel)
#endif
-GLOBAL(__begin_SYSENTER_singlestep_region)
+SYM_ENTRY(__begin_SYSENTER_singlestep_region, SYM_L_GLOBAL, SYM_A_NONE)
/*
* All code from here through __end_SYSENTER_singlestep_region is subject
* to being single-stepped if a user program sets TF and executes SYSENTER.
@@ -485,7 +485,7 @@ ENTRY(entry_SYSENTER_32)
pushl $X86_EFLAGS_FIXED
popfl
jmp .Lsysenter_flags_fixed
-GLOBAL(__end_SYSENTER_singlestep_region)
+SYM_ENTRY(__end_SYSENTER_singlestep_region, SYM_L_GLOBAL, SYM_A_NONE)
ENDPROC(entry_SYSENTER_32)
/*
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index 3c22e5a41ba4..365111789cc6 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -13,14 +13,6 @@
#ifdef __ASSEMBLY__
-/*
- * GLOBAL is DEPRECATED
- *
- * use SYM_DATA_START, SYM_FUNC_START, SYM_FUNC_INNER_LABEL, SYM_CODE_START, or
- * similar
- */
-#define GLOBAL(name) SYM_ENTRY(name, SYM_L_GLOBAL, SYM_A_NONE)
-
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_ALIGNMENT_16)
#define __ALIGN .p2align 4, 0x90
#define __ALIGN_STR __stringify(__ALIGN)
--
2.15.0
next prev parent reply other threads:[~2017-11-30 14:47 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 ` [PATCH v5 02/27] x86: assembly, use SYM_DATA for data Jiri Slaby
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 ` Jiri Slaby [this message]
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-19-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--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®