From: Mark Rutland <mark.rutland@arm.com>
To: linux-kernel@vger.kernel.org
Cc: acme@redhat.com, ardb@kernel.org, bp@alien8.de,
broonie@kernel.org, catalin.marinas@arm.com,
dave.hansen@linux.intel.com, jpoimboe@redhat.com, jslaby@suse.cz,
linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk,
mark.rutland@arm.com, mingo@redhat.com, peterz@infradead.org,
tglx@linutronix.de, will@kernel.org
Subject: [PATCH v2 2/7] linkage: add SYM_{ENTRY,START,END}_AT()
Date: Tue, 25 Jan 2022 11:31:55 +0000 [thread overview]
Message-ID: <20220125113200.3829108-3-mark.rutland@arm.com> (raw)
In-Reply-To: <20220125113200.3829108-1-mark.rutland@arm.com>
Currently, the SYM_{ENTRY,START,END}() helpers define symbols in terms
of the current position within the section. In subsequent patches we'll
need to define symbols after moving this position.
This patch splits the core out of SYM_{ENTRY,START,END}() into
SYM_{ENTRY,START,END}_AT() macros which take a location argument,
with SYM_{ENTRY,START,END}() passing the current position.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Mark Brown <broonie@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
---
include/linux/linkage.h | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index dbf8506decca0..d87c2acda2540 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -147,25 +147,43 @@
/* === generic annotations === */
+#ifndef SYM_ENTRY_AT
+#define SYM_ENTRY_AT(name, location, linkage) \
+ linkage(name) ASM_NL \
+ .set name, location ASM_NL
+#endif
+
/* SYM_ENTRY -- use only if you have to for non-paired symbols */
#ifndef SYM_ENTRY
#define SYM_ENTRY(name, linkage, align...) \
- linkage(name) ASM_NL \
align ASM_NL \
- name:
+ SYM_ENTRY_AT(name, ., linkage)
+#endif
+
+/* SYM_START_AT -- use only if you have to */
+#ifndef SYM_START_AT
+#define SYM_START_AT(name, location, linkage) \
+ SYM_ENTRY_AT(name, location, linkage)
#endif
/* SYM_START -- use only if you have to */
#ifndef SYM_START
#define SYM_START(name, linkage, align...) \
- SYM_ENTRY(name, linkage, align)
+ align ASM_NL \
+ SYM_START_AT(name, ., linkage)
+#endif
+
+/* SYM_END_AT -- use only if you have to */
+#ifndef SYM_END_AT
+#define SYM_END_AT(name, location, sym_type) \
+ .type name sym_type ASM_NL \
+ .size name, location-name ASM_NL
#endif
/* SYM_END -- use only if you have to */
#ifndef SYM_END
#define SYM_END(name, sym_type) \
- .type name sym_type ASM_NL \
- .size name, .-name
+ SYM_END_AT(name, ., sym_type)
#endif
/* === code annotations === */
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-01-25 11:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 11:31 [PATCH v2 0/7] linkage: better symbol aliasing Mark Rutland
2022-01-25 11:31 ` [PATCH v2 1/7] arm: lib: remove leading whitespace in bitop macro Mark Rutland
2022-01-25 11:31 ` Mark Rutland [this message]
2022-02-10 14:52 ` [PATCH v2 2/7] linkage: add SYM_{ENTRY,START,END}_AT() Mark Rutland
2022-02-11 1:20 ` Nick Desaulniers
2022-02-11 11:32 ` Mark Rutland
2022-02-11 13:24 ` Mark Rutland
2022-01-25 11:31 ` [PATCH v2 3/7] linkage: add SYM_FUNC_ALIAS{,_LOCAL,_WEAK}() Mark Rutland
2022-01-25 11:31 ` [PATCH v2 4/7] arm64: clean up symbol aliasing Mark Rutland
2022-01-25 11:31 ` [PATCH v2 5/7] x86: " Mark Rutland
2022-01-25 11:31 ` [PATCH v2 6/7] linkage: remove SYM_FUNC_{START,END}_ALIAS() Mark Rutland
2022-01-25 11:32 ` [PATCH v2 7/7] tools: update x86 string routines Mark Rutland
2022-01-25 15:28 ` [PATCH v2 0/7] linkage: better symbol aliasing Ard Biesheuvel
2022-01-25 15:45 ` Mark Rutland
2022-01-25 15:49 ` Ard Biesheuvel
2022-01-25 15:58 ` Mark Rutland
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=20220125113200.3829108-3-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=acme@redhat.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=jpoimboe@redhat.com \
--cc=jslaby@suse.cz \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=will@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;
as well as URLs for NNTP newsgroup(s).