| Message ID | 20190829154834.26547-7-will@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: avoid out-of-line ll/sc atomics | expand |
On Thu, Aug 29, 2019 at 04:48:30PM +0100, Will Deacon wrote: > The 'alt_lse' assembly macro has been unused since 7c8fc35dfc32 > ("locking/atomics/arm64: Replace our atomic/lock bitop implementations > with asm-generic"). > > Remove it. > > Signed-off-by: Will Deacon <will@kernel.org> > --- Reviewed-by: Andrew Murray <andrew.murray@arm.com> > arch/arm64/include/asm/lse.h | 22 ---------------------- > 1 file changed, 22 deletions(-) > > diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h > index 52b80846d1b7..08e818e53ed7 100644 > --- a/arch/arm64/include/asm/lse.h > +++ b/arch/arm64/include/asm/lse.h > @@ -10,37 +10,15 @@ > #include <asm/alternative.h> > #include <asm/cpucaps.h> > > -#ifdef __ASSEMBLER__ > - > -.arch_extension lse > - > -.macro alt_lse, llsc, lse > - alternative_insn "\llsc", "\lse", ARM64_HAS_LSE_ATOMICS > -.endm > - > -#else /* __ASSEMBLER__ */ > - > __asm__(".arch_extension lse"); > > - > /* In-line patching at runtime */ > #define ARM64_LSE_ATOMIC_INSN(llsc, lse) \ > ALTERNATIVE(llsc, lse, ARM64_HAS_LSE_ATOMICS) > > -#endif /* __ASSEMBLER__ */ > #else /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */ > > -#ifdef __ASSEMBLER__ > - > -.macro alt_lse, llsc, lse > - \llsc > -.endm > - > -#else /* __ASSEMBLER__ */ > - > - > #define ARM64_LSE_ATOMIC_INSN(llsc, lse) llsc > > -#endif /* __ASSEMBLER__ */ > #endif /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */ > #endif /* __ASM_LSE_H */ > -- > 2.11.0 >
diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h index 52b80846d1b7..08e818e53ed7 100644 --- a/arch/arm64/include/asm/lse.h +++ b/arch/arm64/include/asm/lse.h @@ -10,37 +10,15 @@ #include <asm/alternative.h> #include <asm/cpucaps.h> -#ifdef __ASSEMBLER__ - -.arch_extension lse - -.macro alt_lse, llsc, lse - alternative_insn "\llsc", "\lse", ARM64_HAS_LSE_ATOMICS -.endm - -#else /* __ASSEMBLER__ */ - __asm__(".arch_extension lse"); - /* In-line patching at runtime */ #define ARM64_LSE_ATOMIC_INSN(llsc, lse) \ ALTERNATIVE(llsc, lse, ARM64_HAS_LSE_ATOMICS) -#endif /* __ASSEMBLER__ */ #else /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */ -#ifdef __ASSEMBLER__ - -.macro alt_lse, llsc, lse - \llsc -.endm - -#else /* __ASSEMBLER__ */ - - #define ARM64_LSE_ATOMIC_INSN(llsc, lse) llsc -#endif /* __ASSEMBLER__ */ #endif /* CONFIG_AS_LSE && CONFIG_ARM64_LSE_ATOMICS */ #endif /* __ASM_LSE_H */
The 'alt_lse' assembly macro has been unused since 7c8fc35dfc32 ("locking/atomics/arm64: Replace our atomic/lock bitop implementations with asm-generic"). Remove it. Signed-off-by: Will Deacon <will@kernel.org> --- arch/arm64/include/asm/lse.h | 22 ---------------------- 1 file changed, 22 deletions(-)