All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: mingo@redhat.com
Cc: bp@alien8.de, 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 v7 28/28] x86/asm: replace WEAK uses by SYM_INNER_LABEL_ALIGN
Date: Wed, 30 Jan 2019 13:47:11 +0100	[thread overview]
Message-ID: <20190130124711.12463-29-jslaby@suse.cz> (raw)
In-Reply-To: <20190130124711.12463-1-jslaby@suse.cz>

Use the new SYM_INNER_LABEL_ALIGN for WEAK entries in the middle of x86
assembly functions.

And make sure WEAK is not defined for x86 anymore as these were the last
users.

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/kernel/ftrace_32.S | 2 +-
 arch/x86/kernel/ftrace_64.S | 2 +-
 arch/x86/kernel/head_32.S   | 2 +-
 include/linux/linkage.h     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S
index f519c22f6f9e..b3b42bb8bd74 100644
--- a/arch/x86/kernel/ftrace_32.S
+++ b/arch/x86/kernel/ftrace_32.S
@@ -98,7 +98,7 @@ ftrace_graph_call:
 #endif
 
 /* This is weak to keep gas from relaxing the jumps */
-WEAK(ftrace_stub)
+SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
 	ret
 SYM_CODE_END(ftrace_caller)
 
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index e3d4ef5d7aff..3d6635c09b9c 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -186,7 +186,7 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)
  * This is weak to keep gas from relaxing the jumps.
  * It is also used to copy the retq for trampolines.
  */
-WEAK(ftrace_stub)
+SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
 	retq
 SYM_FUNC_END(ftrace_caller)
 
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 0f4961075792..4b2d668afd70 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -156,7 +156,7 @@ SYM_CODE_START(startup_32)
 	jmp *%eax
 
 .Lbad_subarch:
-WEAK(xen_entry)
+SYM_INNER_LABEL_ALIGN(xen_entry, SYM_L_WEAK)
 	/* Unknown implementation; there's really
 	   nothing we can do at this point. */
 	ud2a
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 331a2306312c..9280209d1f62 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -121,13 +121,13 @@
 #endif /* CONFIG_X86 */
 #endif /* LINKER_SCRIPT */
 
+#ifndef CONFIG_X86
 #ifndef WEAK
 /* deprecated, use SYM_FUNC_START_WEAK* */
 #define WEAK(name)	   \
 	SYM_FUNC_START_WEAK(name)
 #endif
 
-#ifndef CONFIG_X86
 #ifndef END
 /* deprecated, use SYM_FUNC_END, SYM_DATA_END, or SYM_END */
 #define END(name) \
-- 
2.20.1


      parent reply	other threads:[~2019-01-30 12:48 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-30 12:46 [PATCH v7 00/28] New macros for assembler symbols Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 01/28] linkage: new " Jiri Slaby
2019-01-31 16:00   ` Borislav Petkov
2019-02-01 13:53     ` Jiri Slaby
2019-02-01 13:53     ` Jiri Slaby
2019-01-31 16:00   ` Borislav Petkov
2019-01-30 12:46 ` Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 02/28] x86/asm/suspend: drop ENTRY from local data Jiri Slaby
2019-01-30 15:12   ` [tip:x86/cleanups] x86/asm/suspend: Drop " tip-bot for Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 03/28] x86/asm/suspend: use SYM_DATA for data Jiri Slaby
2019-02-04 20:18   ` Borislav Petkov
2019-02-05  7:34     ` Jiri Slaby
2019-02-05  8:07       ` Borislav Petkov
2019-01-30 12:46 ` [PATCH v7 04/28] x86/asm: annotate relocate_kernel Jiri Slaby
2019-02-08 19:53   ` Borislav Petkov
2019-01-30 12:46 ` [PATCH v7 05/28] x86/asm/entry: annotate THUNKs Jiri Slaby
2019-02-09 11:25   ` Borislav Petkov
2019-02-12 10:27     ` Jiri Slaby
2019-02-12 11:05       ` Borislav Petkov
2019-02-12 11:38         ` Jiri Slaby
2019-02-12 11:46           ` Borislav Petkov
2019-02-12 11:51             ` Jiri Slaby
2019-02-12 12:13               ` Borislav Petkov
2019-02-14 10:03                 ` Jiri Slaby
2019-02-14 10:34                   ` Borislav Petkov
2019-01-30 12:46 ` [PATCH v7 06/28] x86/asm: annotate local pseudo-functions Jiri Slaby
2019-02-09 12:24   ` Borislav Petkov
2019-01-30 12:46 ` [PATCH v7 07/28] x86/asm/crypto: annotate local functions Jiri Slaby
2019-02-25 10:13   ` Borislav Petkov
2019-01-30 12:46 ` [PATCH v7 08/28] x86/boot/compressed: " Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 09/28] x86/asm: annotate aliases Jiri Slaby
2019-01-30 12:46   ` Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 10/28] x86/asm/entry: annotate interrupt symbols properly Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 11/28] x86/asm/head: annotate data appropriatelly Jiri Slaby
2019-02-25 14:53   ` Borislav Petkov
2019-01-30 12:46 ` [PATCH v7 12/28] x86/boot/compressed: " Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 13/28] um: " Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 14/28] xen/pvh: " Jiri Slaby
2019-01-30 12:46   ` Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 15/28] x86/asm/purgatory: start using annotations Jiri Slaby
2019-01-30 12:46 ` [PATCH v7 16/28] x86/asm: do not annotate functions by GLOBAL Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 17/28] x86/asm: use SYM_INNER_LABEL instead of GLOBAL Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 18/28] x86/asm/realmode: use SYM_DATA_* " Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 19/28] x86/asm: kill the last GLOBAL user and remove the macro Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 20/28] x86/asm: make some functions local Jiri Slaby
2019-01-30 12:47   ` Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 21/28] x86/asm/ftrace: mark function_hook as function Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 22/28] x86_64/asm: add ENDs to some functions and relabel with SYM_CODE_* Jiri Slaby
2019-01-30 12:47 ` Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 23/28] x86_64/asm: change all ENTRY+END to SYM_CODE_* Jiri Slaby
2019-01-30 12:47 ` Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 24/28] x86_64/asm: change all ENTRY+ENDPROC to SYM_FUNC_* Jiri Slaby
2019-01-30 12:47 ` Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 25/28] x86_32/asm: add ENDs to some functions and relabel with SYM_CODE_* Jiri Slaby
2019-01-30 12:47 ` Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 26/28] x86_32/asm: change all ENTRY+END to SYM_CODE_* Jiri Slaby
2019-01-30 12:47 ` [PATCH v7 27/28] x86_32/asm: change all ENTRY+ENDPROC to SYM_FUNC_* Jiri Slaby
2019-01-30 12:47 ` Jiri Slaby [this message]

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=20190130124711.12463-29-jslaby@suse.cz \
    --to=jslaby@suse.cz \
    --cc=bp@alien8.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.