Commit be9aea74 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

linkage: remove SYM_FUNC_{START,END}_ALIAS() 



Now that all aliases are defined using SYM_FUNC_ALIAS(), remove the old
SYM_FUNC_{START,END}_ALIAS() macros.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220216162229.1076788-5-mark.rutland@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 7be2e319

Documentation/asm-annotations.rst

+0 −13
Original line number Original line Diff line number Diff line
@@ -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

  result, except the debug information for the instructions is generated to

  the object file only once -- for the non-``ALIAS`` case.

  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

* ``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

  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

  for interrupt handlers and similar where the calling convention is not the C

include/linux/linkage.h

+0 −30
Original line number Original line Diff line number Diff line
@@ -211,30 +211,8 @@ 
	SYM_ENTRY(name, linkage, SYM_A_NONE)

	SYM_ENTRY(name, linkage, SYM_A_NONE)

#endif

#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 */

/* SYM_FUNC_START -- use for global functions */

#ifndef SYM_FUNC_START

#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)				\

#define SYM_FUNC_START(name)				\

	SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)

	SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)

#endif

#endif
@@ -247,7 +225,6 @@ 




/* SYM_FUNC_START_LOCAL -- use for local functions */

/* SYM_FUNC_START_LOCAL -- use for local functions */

#ifndef SYM_FUNC_START_LOCAL

#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)			\

#define SYM_FUNC_START_LOCAL(name)			\

	SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN)

	SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN)

#endif

#endif
@@ -270,18 +247,11 @@ 
	SYM_START(name, SYM_L_WEAK, SYM_A_NONE)

	SYM_START(name, SYM_L_WEAK, SYM_A_NONE)

#endif

#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_END -- the end of SYM_FUNC_START_LOCAL, SYM_FUNC_START,

 * SYM_FUNC_START_WEAK, ...

 * SYM_FUNC_START_WEAK, ...

 */

 */

#ifndef SYM_FUNC_END

#ifndef SYM_FUNC_END

/* the same as SYM_FUNC_END_ALIAS, see comment near SYM_FUNC_START */

#define SYM_FUNC_END(name)				\

#define SYM_FUNC_END(name)				\

	SYM_END(name, SYM_T_FUNC)

	SYM_END(name, SYM_T_FUNC)

#endif

#endif

tools/perf/util/include/linux/linkage.h

+0 −21
Original line number Original line Diff line number Diff line
@@ -64,38 +64,18 @@ 
	.size alias, .L__sym_size_##alias

	.size alias, .L__sym_size_##alias

#endif

#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 */

/* SYM_FUNC_START -- use for global functions */

#ifndef SYM_FUNC_START

#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)				\

#define SYM_FUNC_START(name)				\

	SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)

	SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)

#endif

#endif





/* SYM_FUNC_START_LOCAL -- use for local functions */

/* SYM_FUNC_START_LOCAL -- use for local functions */

#ifndef SYM_FUNC_START_LOCAL

#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)			\

#define SYM_FUNC_START_LOCAL(name)			\

	SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN)

	SYM_START(name, SYM_L_LOCAL, SYM_A_ALIGN)

#endif

#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_START_WEAK -- use for weak functions */

/* SYM_FUNC_START_WEAK -- use for weak functions */

#ifndef SYM_FUNC_START_WEAK

#ifndef SYM_FUNC_START_WEAK

#define SYM_FUNC_START_WEAK(name)			\

#define SYM_FUNC_START_WEAK(name)			\
@@ -107,7 +87,6 @@ 
 * SYM_FUNC_START_WEAK, ...

 * SYM_FUNC_START_WEAK, ...

 */

 */

#ifndef SYM_FUNC_END

#ifndef SYM_FUNC_END

/* the same as SYM_FUNC_END_ALIAS, see comment near SYM_FUNC_START */

#define SYM_FUNC_END(name)				\

#define SYM_FUNC_END(name)				\

	SYM_END(name, SYM_T_FUNC)

	SYM_END(name, SYM_T_FUNC)

#endif

#endif