From: Mark Rutland <mark.rutland@arm.com>
To: linux-kernel@vger.kernel.org
Cc: 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, mark.rutland@arm.com,
maz@kernel.org, mingo@redhat.com, peterz@infradead.org,
tabba@google.com, tglx@linutronix.de, will@kernel.org
Subject: [RFC PATCH 6/6] linkage: remove START/END ALIAS macros
Date: Mon, 6 Dec 2021 12:47:15 +0000 [thread overview]
Message-ID: <20211206124715.4101571-7-mark.rutland@arm.com> (raw)
In-Reply-To: <20211206124715.4101571-1-mark.rutland@arm.com>
Now that all aliases are defined using SYM_FUNC_ALIAS(), remove the old
SYM_FUNC_{START,END}_ALIAS() macros.
TODO:
* Handle tools/ copy
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
---
Documentation/asm-annotations.rst | 13 -------------
include/linux/linkage.h | 30 ------------------------------
2 files changed, 43 deletions(-)
diff --git a/Documentation/asm-annotations.rst b/Documentation/asm-annotations.rst
index cdc53bf7f9bb..ff7ecc43ca35 100644
--- a/Documentation/asm-annotations.rst
+++ b/Documentation/asm-annotations.rst
@@ -142,19 +142,6 @@ denoting a range of code via ``SYM_*_START/END`` annotations.
result, except the debug information for the instructions is generated to
the object file only once -- for the non-``ALIAS`` case.
-* ``SYM_FUNC_START_ALIAS`` and ``SYM_FUNC_START_LOCAL_ALIAS`` are deprecated
- ways to define two or more names for one function. The typical use is::
-
- SYM_FUNC_START_ALIAS(__memset)
- SYM_FUNC_START(memset)
- ... asm insns ...
- SYM_FUNC_END(memset)
- SYM_FUNC_END_ALIAS(__memset)
-
- In this example, one can call ``__memset`` or ``memset`` with the same
- result, except the debug information for the instructions is generated to
- the object file only once -- for the non-``ALIAS`` case.
-
* ``SYM_CODE_START`` and ``SYM_CODE_START_LOCAL`` should be used only in
special cases -- if you know what you are doing. This is used exclusively
for interrupt handlers and similar where the calling convention is not the C
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index e91e5db92b2b..813e4f37586b 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -219,30 +219,8 @@
SYM_ENTRY(name, linkage, SYM_A_NONE)
#endif
-/*
- * SYM_FUNC_START_LOCAL_ALIAS -- use where there are two local names for one
- * function
- */
-#ifndef SYM_FUNC_START_LOCAL_ALIAS
-#define SYM_FUNC_START_LOCAL_ALIAS(name) \
- SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN)
-#endif
-
-/*
- * SYM_FUNC_START_ALIAS -- use where there are two global names for one
- * function
- */
-#ifndef SYM_FUNC_START_ALIAS
-#define SYM_FUNC_START_ALIAS(name) \
- SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)
-#endif
-
/* SYM_FUNC_START -- use for global functions */
#ifndef SYM_FUNC_START
-/*
- * The same as SYM_FUNC_START_ALIAS, but we will need to distinguish these two
- * later.
- */
#define SYM_FUNC_START(name) \
SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)
#endif
@@ -255,7 +233,6 @@
/* SYM_FUNC_START_LOCAL -- use for local functions */
#ifndef SYM_FUNC_START_LOCAL
-/* the same as SYM_FUNC_START_LOCAL_ALIAS, see comment near SYM_FUNC_START */
#define SYM_FUNC_START_LOCAL(name) \
SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN)
#endif
@@ -278,18 +255,11 @@
SYM_START(name, SYM_L_WEAK, SYM_A_NONE)
#endif
-/* SYM_FUNC_END_ALIAS -- the end of LOCAL_ALIASed or ALIASed function */
-#ifndef SYM_FUNC_END_ALIAS
-#define SYM_FUNC_END_ALIAS(name) \
- SYM_END(name, SYM_T_FUNC)
-#endif
-
/*
* SYM_FUNC_END -- the end of SYM_FUNC_START_LOCAL, SYM_FUNC_START,
* SYM_FUNC_START_WEAK, ...
*/
#ifndef SYM_FUNC_END
-/* the same as SYM_FUNC_END_ALIAS, see comment near SYM_FUNC_START */
#define SYM_FUNC_END(name) \
SYM_END(name, SYM_T_FUNC)
#endif
--
2.30.2
next prev parent reply other threads:[~2021-12-06 12:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 12:47 [RFC PATCH 0/6] linkage: better symbol aliasing Mark Rutland
2021-12-06 12:47 ` [RFC PATCH 1/6] linkage: add SYM_{ENTRY,START,END}_AT() Mark Rutland
2021-12-06 12:47 ` [RFC PATCH 2/6] linkage: add SYM_FUNC_{LOCAL_,}ALIAS() Mark Rutland
2021-12-06 12:47 ` [RFC PATCH 3/6] arm64: remove __dma_*_area() aliases Mark Rutland
2021-12-10 15:02 ` Catalin Marinas
2021-12-06 12:47 ` [RFC PATCH 4/6] arm64: clean up symbol aliasing Mark Rutland
2021-12-10 15:02 ` Catalin Marinas
2021-12-06 12:47 ` [RFC PATCH 5/6] x86: " Mark Rutland
2021-12-06 12:47 ` Mark Rutland [this message]
2021-12-06 14:06 ` [RFC PATCH 0/6] linkage: better " Ard Biesheuvel
2021-12-06 15:10 ` Mark Brown
2021-12-07 5:23 ` Josh Poimboeuf
2021-12-07 13:33 ` Mark Rutland
2021-12-10 15:04 ` Catalin Marinas
2021-12-15 9:24 ` Mark Rutland
2021-12-15 11:28 ` (subset) " Catalin Marinas
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=20211206124715.4101571-7-mark.rutland@arm.com \
--to=mark.rutland@arm.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=maz@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tabba@google.com \
--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).