The following commit has been merged into the x86/alternatives branch of tip:

Commit-ID:     43c2df7e2b08db6d65ce9707e4090f1f0c61f2f6
Gitweb:        https://git.kernel.org/tip/43c2df7e2b08db6d65ce9707e4090f1f0c61f2f6
Author:        Juergen Gross <jgross@suse.com>
AuthorDate:    Mon, 05 May 2025 15:16:46 +02:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Mon, 05 May 2025 09:30:40 -07:00

x86/alternative: Remove unused header #defines

Remove some unfortunately-named unused macros which could potentially
result in weird build failures. Fortunately, they are under an #ifdef
__ASSEMBLER__ which has kept them from causing problems so far.

[ dhansen: subject and changelog tweaks ]

Fixes: 1a6ade825079 ("x86/alternative: Convert the asm ALTERNATIVE_3() macro")
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20250505131646.29288-1-jgross%40suse.com
---
 arch/x86/include/asm/alternative.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index ef84739..e18cdaa 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -341,11 +341,6 @@ void nop_func(void);
 	__ALTERNATIVE(\oldinstr, \newinstr, \ft_flags)
 .endm
 
-#define old_len			141b-140b
-#define new_len1		144f-143f
-#define new_len2		145f-144f
-#define new_len3		146f-145f
-
 /*
  * Same as ALTERNATIVE macro above but for two alternatives. If CPU
  * has @feature1, it replaces @oldinstr with @newinstr1. If CPU has