Unverified Commit bb2efcde authored by Andrew Jones's avatar Andrew Jones Committed by Palmer Dabbelt
Browse files

riscv: alternatives: Drop the underscores from the assembly macro names 



The underscores aren't needed because there isn't anything already
named without them and the _CFG extension. This is a bit of a cleanup
by itself, but the real motivation is for a coming patch which would
otherwise need to add two more underscores to these macro names,
i.e. ____ALTERNATIVE_CFG, and that'd be gross.

Signed-off-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Tested-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Acked-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20221129150053.50464-4-ajones@ventanamicro.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 7d52eace

arch/riscv/include/asm/alternative-macros.h

+10 −10
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
	.endif

.endm



.macro __ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, enable

.macro ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, enable

886 :

	.option push

	.option norvc
@@ -45,11 +45,11 @@ 
.endm



#define _ALTERNATIVE_CFG(old_c, new_c, vendor_id, errata_id, CONFIG_k) \

	__ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)

	ALTERNATIVE_CFG old_c, new_c, vendor_id, errata_id, IS_ENABLED(CONFIG_k)



.macro __ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \

.macro ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1,	\

				new_c_2, vendor_id_2, errata_id_2, enable_2

	__ALTERNATIVE_CFG \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1

	ALTERNATIVE_CFG \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1

	ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2

.endm
@@ -57,7 +57,7 @@ 
					CONFIG_k_1,			\

				  new_c_2, vendor_id_2, errata_id_2,	\

					CONFIG_k_2)			\

	__ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1,	\

	ALTERNATIVE_CFG_2 old_c, new_c_1, vendor_id_1, errata_id_1,	\

					IS_ENABLED(CONFIG_k_1),		\

				 new_c_2, vendor_id_2, errata_id_2,	\

					IS_ENABLED(CONFIG_k_2)
@@ -126,15 +126,15 @@ 
#else /* CONFIG_RISCV_ALTERNATIVE */

#ifdef __ASSEMBLY__



.macro __ALTERNATIVE_CFG old_c

.macro ALTERNATIVE_CFG old_c

	\old_c

.endm



#define _ALTERNATIVE_CFG(old_c, ...)	\

	__ALTERNATIVE_CFG old_c

	ALTERNATIVE_CFG old_c



#define _ALTERNATIVE_CFG_2(old_c, ...)	\

	__ALTERNATIVE_CFG old_c

	ALTERNATIVE_CFG old_c



#else /* !__ASSEMBLY__ */