diff options
| author | Will Deacon <will@kernel.org> | 2022-03-14 19:01:05 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-14 19:01:05 +0000 |
| commit | 563c463595307a3dd1ae80c462af69d94b1e80bf (patch) | |
| tree | 980be428322746c8e53cd6e01925ea08f0f6948a /Documentation | |
| parent | 839d0758927fb62958b79dffd385a7dc0ac522bc (diff) | |
| parent | 4013e26670c590944abdab56c4fa797527b74325 (diff) | |
Merge branch 'for-next/linkage' into for-next/core
* for-next/linkage:
arm64: module: remove (NOLOAD) from linker script
linkage: remove SYM_FUNC_{START,END}_ALIAS()
x86: clean up symbol aliasing
arm64: clean up symbol aliasing
linkage: add SYM_FUNC_ALIAS{,_LOCAL,_WEAK}()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/asm-annotations.rst | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/asm-annotations.rst b/Documentation/asm-annotations.rst index f4bf0f6395fb..a64f2ca469d4 100644 --- a/Documentation/asm-annotations.rst +++ b/Documentation/asm-annotations.rst @@ -130,14 +130,13 @@ denoting a range of code via ``SYM_*_START/END`` annotations. In fact, this kind of annotation corresponds to the now deprecated ``ENTRY`` and ``ENDPROC`` macros. -* ``SYM_FUNC_START_ALIAS`` and ``SYM_FUNC_START_LOCAL_ALIAS`` serve for those - who decided to have two or more names for one function. The typical use is:: +* ``SYM_FUNC_ALIAS``, ``SYM_FUNC_ALIAS_LOCAL``, and ``SYM_FUNC_ALIAS_WEAK`` can + be used to define multiple names for a function. The typical use is:: - SYM_FUNC_START_ALIAS(__memset) - SYM_FUNC_START(memset) + SYM_FUNC_START(__memset) ... asm insns ... - SYM_FUNC_END(memset) - SYM_FUNC_END_ALIAS(__memset) + SYN_FUNC_END(__memset) + SYM_FUNC_ALIAS(memset, __memset) In this example, one can call ``__memset`` or ``memset`` with the same result, except the debug information for the instructions is generated to |