Commit fb53a9aa authored by Andrew Jones's avatar Andrew Jones Committed by Alexandre Ghiti
Browse files

riscv: Provide all alternative macros all the time 



We need to provide all six forms of the alternative macros
(ALTERNATIVE, ALTERNATIVE_2, _ALTERNATIVE_CFG, _ALTERNATIVE_CFG_2,
__ALTERNATIVE_CFG, __ALTERNATIVE_CFG_2) for all four cases derived
from the two ifdefs (RISCV_ALTERNATIVE, __ASSEMBLY__) in order to
ensure all configs can compile. Define this missing ones and ensure
all are defined to consume all parameters passed.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202504130710.3IKz6Ibs-lkp@intel.com/


Signed-off-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Tested-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20250414120947.135173-2-ajones@ventanamicro.com


Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
parent 1ee1313f

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

+7 −12
Original line number Diff line number Diff line
@@ -115,24 +115,19 @@ 
	\old_c

.endm



#define _ALTERNATIVE_CFG(old_c, ...)	\

	ALTERNATIVE_CFG old_c



#define _ALTERNATIVE_CFG_2(old_c, ...)	\

	ALTERNATIVE_CFG old_c

#define __ALTERNATIVE_CFG(old_c, ...)		ALTERNATIVE_CFG old_c

#define __ALTERNATIVE_CFG_2(old_c, ...)		ALTERNATIVE_CFG old_c



#else /* !__ASSEMBLY__ */



#define __ALTERNATIVE_CFG(old_c)	\

	old_c "\n"

#define __ALTERNATIVE_CFG(old_c, ...)		old_c "\n"

#define __ALTERNATIVE_CFG_2(old_c, ...)		old_c "\n"



#define _ALTERNATIVE_CFG(old_c, ...)	\

	__ALTERNATIVE_CFG(old_c)

#endif /* __ASSEMBLY__ */



#define _ALTERNATIVE_CFG_2(old_c, ...)	\

	__ALTERNATIVE_CFG(old_c)

#define _ALTERNATIVE_CFG(old_c, ...)		__ALTERNATIVE_CFG(old_c)

#define _ALTERNATIVE_CFG_2(old_c, ...)		__ALTERNATIVE_CFG_2(old_c)



#endif /* __ASSEMBLY__ */

#endif /* CONFIG_RISCV_ALTERNATIVE */



/*