Commit 599d66b8 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'arm64/for-next/linkage' 



Enjoy the cleanups and avoid conflicts vs linkage

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
parents 227a0655 4013e266

Documentation/asm-annotations.rst

+5 −6
Original line number Diff line number Diff line
@@ -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

arch/arm64/include/asm/linkage.h

+0 −24
Original line number Diff line number Diff line
@@ -39,28 +39,4 @@ 
	SYM_START(name, SYM_L_WEAK, SYM_A_NONE)		\

	bti c ;



/*

 * Annotate a function as position independent, i.e., safe to be called before

 * the kernel virtual mapping is activated.

 */

#define SYM_FUNC_START_PI(x)			\

		SYM_FUNC_START_ALIAS(__pi_##x);	\

		SYM_FUNC_START(x)



#define SYM_FUNC_START_WEAK_PI(x)		\

		SYM_FUNC_START_ALIAS(__pi_##x);	\

		SYM_FUNC_START_WEAK(x)



#define SYM_FUNC_START_WEAK_ALIAS_PI(x)		\

		SYM_FUNC_START_ALIAS(__pi_##x);	\

		SYM_START(x, SYM_L_WEAK, SYM_A_ALIGN)



#define SYM_FUNC_END_PI(x)			\

		SYM_FUNC_END(x);		\

		SYM_FUNC_END_ALIAS(__pi_##x)



#define SYM_FUNC_END_ALIAS_PI(x)		\

		SYM_FUNC_END_ALIAS(x);		\

		SYM_FUNC_END_ALIAS(__pi_##x)



#endif

arch/arm64/include/asm/module.lds.h

+3 −3
Original line number Diff line number Diff line 
SECTIONS {

#ifdef CONFIG_ARM64_MODULE_PLTS

	.plt 0 (NOLOAD) : { BYTE(0) }

	.init.plt 0 (NOLOAD) : { BYTE(0) }

	.text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) }

	.plt 0 : { BYTE(0) }

	.init.plt 0 : { BYTE(0) }

	.text.ftrace_trampoline 0 : { BYTE(0) }

#endif



#ifdef CONFIG_KASAN_SW_TAGS

arch/arm64/kvm/hyp/nvhe/cache.S

+3 −2
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
#include <asm/assembler.h>

#include <asm/alternative.h>



SYM_FUNC_START_PI(dcache_clean_inval_poc)

SYM_FUNC_START(__pi_dcache_clean_inval_poc)

	dcache_by_line_op civac, sy, x0, x1, x2, x3

	ret

SYM_FUNC_END_PI(dcache_clean_inval_poc)
 
SYM_FUNC_END(__pi_dcache_clean_inval_poc)

SYM_FUNC_ALIAS(dcache_clean_inval_poc, __pi_dcache_clean_inval_poc)

arch/arm64/lib/clear_page.S

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * Parameters:

 *	x0 - dest

 */

SYM_FUNC_START_PI(clear_page)

SYM_FUNC_START(__pi_clear_page)

	mrs	x1, dczid_el0

	tbnz	x1, #4, 2f	/* Branch if DC ZVA is prohibited */

	and	w1, w1, #0xf
@@ -35,5 +35,6 @@ SYM_FUNC_START_PI(clear_page) 
	tst	x0, #(PAGE_SIZE - 1)

	b.ne	2b

	ret

SYM_FUNC_END_PI(clear_page)

SYM_FUNC_END(__pi_clear_page)

SYM_FUNC_ALIAS(clear_page, __pi_clear_page)

EXPORT_SYMBOL(clear_page)