diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2024-06-07 14:16:58 +0300 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2024-06-11 19:25:00 +0300 |
| commit | a6c7a6a18b10a4ac0913e7abdbdce928a2601bdb (patch) | |
| tree | b26d4dc48db3d4592f328ffd705098f7ab1decdb | |
| parent | 93694129c6e84d3013f5b2787e2ff88dd706c4f0 (diff) | |
| download | linux-a6c7a6a18b10a4ac0913e7abdbdce928a2601bdb.tar.xz | |
x86/alternative: Convert the asm ALTERNATIVE() macro
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240607111701.8366-12-bp@kernel.org
| -rw-r--r-- | arch/x86/include/asm/alternative.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index fba12ad237e2..31b9a47b9df9 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -422,24 +422,6 @@ void nop_func(void); * @newinstr. ".skip" directive takes care of proper instruction padding * in case @newinstr is longer than @oldinstr. */ -.macro ALTERNATIVE oldinstr, newinstr, ft_flags -140: - \oldinstr -141: - .skip -(((144f-143f)-(141b-140b)) > 0) * ((144f-143f)-(141b-140b)),0x90 -142: - - .pushsection .altinstructions,"a" - altinstr_entry 140b,143f,\ft_flags,142b-140b,144f-143f - .popsection - - .pushsection .altinstr_replacement,"ax" -143: - \newinstr -144: - .popsection -.endm - #define __N_ALTERNATIVE(oldinst, newinst, flag) \ 740: \ oldinst ; \ @@ -455,12 +437,10 @@ void nop_func(void); 744: \ .popsection ; - -.macro N_ALTERNATIVE oldinstr, newinstr, ft_flags +.macro ALTERNATIVE oldinstr, newinstr, ft_flags __N_ALTERNATIVE(\oldinstr, \newinstr, \ft_flags) .endm - #define old_len 141b-140b #define new_len1 144f-143f #define new_len2 145f-144f |