Commit db16e072 authored by Juergen Gross's avatar Juergen Gross Committed by Borislav Petkov
Browse files

x86/alternative: Drop unused feature parameter from ALTINSTR_REPLACEMENT() 



The macro ALTINSTR_REPLACEMENT() doesn't make use of the feature
parameter, so drop it.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210309134813.23912-4-jgross@suse.com
parent a38fd874

arch/x86/include/asm/alternative.h

+7 −7
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	" .byte " alt_rlen(num) "\n"			/* replacement len */ \

	" .byte " alt_pad_len "\n"			/* pad len */



#define ALTINSTR_REPLACEMENT(newinstr, feature, num)	/* replacement */	\

#define ALTINSTR_REPLACEMENT(newinstr, num)		/* replacement */	\

	"# ALT: replacement " #num "\n"						\

	b_replacement(num)":\n\t" newinstr "\n" e_replacement(num) ":\n"
@@ -161,7 +161,7 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	ALTINSTR_ENTRY(feature, 1)					\

	".popsection\n"							\

	".pushsection .altinstr_replacement, \"ax\"\n"			\

	ALTINSTR_REPLACEMENT(newinstr, feature, 1)			\

	ALTINSTR_REPLACEMENT(newinstr, 1)				\

	".popsection\n"



#define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\
@@ -171,8 +171,8 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	ALTINSTR_ENTRY(feature2, 2)					\

	".popsection\n"							\

	".pushsection .altinstr_replacement, \"ax\"\n"			\

	ALTINSTR_REPLACEMENT(newinstr1, feature1, 1)			\

	ALTINSTR_REPLACEMENT(newinstr2, feature2, 2)			\

	ALTINSTR_REPLACEMENT(newinstr1, 1)				\

	ALTINSTR_REPLACEMENT(newinstr2, 2)				\

	".popsection\n"



#define ALTERNATIVE_3(oldinsn, newinsn1, feat1, newinsn2, feat2, newinsn3, feat3) \
@@ -183,9 +183,9 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	ALTINSTR_ENTRY(feat3, 3)						\

	".popsection\n"								\

	".pushsection .altinstr_replacement, \"ax\"\n"				\

	ALTINSTR_REPLACEMENT(newinsn1, feat1, 1)				\

	ALTINSTR_REPLACEMENT(newinsn2, feat2, 2)				\

	ALTINSTR_REPLACEMENT(newinsn3, feat3, 3)				\

	ALTINSTR_REPLACEMENT(newinsn1, 1)					\

	ALTINSTR_REPLACEMENT(newinsn2, 2)					\

	ALTINSTR_REPLACEMENT(newinsn3, 3)					\

	".popsection\n"



/*