tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210309134813.23912-4-jgross@suse.com

authored by

Juergen Gross and committed by
Borislav Petkov db16e072 a38fd874

+7 -7
+7 -7
arch/x86/include/asm/alternative.h
··· 150 150 " .byte " alt_rlen(num) "\n" /* replacement len */ \ 151 151 " .byte " alt_pad_len "\n" /* pad len */ 152 152 153 - #define ALTINSTR_REPLACEMENT(newinstr, feature, num) /* replacement */ \ 153 + #define ALTINSTR_REPLACEMENT(newinstr, num) /* replacement */ \ 154 154 "# ALT: replacement " #num "\n" \ 155 155 b_replacement(num)":\n\t" newinstr "\n" e_replacement(num) ":\n" 156 156 ··· 161 161 ALTINSTR_ENTRY(feature, 1) \ 162 162 ".popsection\n" \ 163 163 ".pushsection .altinstr_replacement, \"ax\"\n" \ 164 - ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ 164 + ALTINSTR_REPLACEMENT(newinstr, 1) \ 165 165 ".popsection\n" 166 166 167 167 #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\ ··· 171 171 ALTINSTR_ENTRY(feature2, 2) \ 172 172 ".popsection\n" \ 173 173 ".pushsection .altinstr_replacement, \"ax\"\n" \ 174 - ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ 175 - ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ 174 + ALTINSTR_REPLACEMENT(newinstr1, 1) \ 175 + ALTINSTR_REPLACEMENT(newinstr2, 2) \ 176 176 ".popsection\n" 177 177 178 178 #define ALTERNATIVE_3(oldinsn, newinsn1, feat1, newinsn2, feat2, newinsn3, feat3) \ ··· 183 183 ALTINSTR_ENTRY(feat3, 3) \ 184 184 ".popsection\n" \ 185 185 ".pushsection .altinstr_replacement, \"ax\"\n" \ 186 - ALTINSTR_REPLACEMENT(newinsn1, feat1, 1) \ 187 - ALTINSTR_REPLACEMENT(newinsn2, feat2, 2) \ 188 - ALTINSTR_REPLACEMENT(newinsn3, feat3, 3) \ 186 + ALTINSTR_REPLACEMENT(newinsn1, 1) \ 187 + ALTINSTR_REPLACEMENT(newinsn2, 2) \ 188 + ALTINSTR_REPLACEMENT(newinsn3, 3) \ 189 189 ".popsection\n" 190 190 191 191 /*