Quoting Will Deacon (2020-10-26 06:25:33) > On Fri, Oct 23, 2020 at 08:47:50AM -0700, Stephen Boyd wrote: > > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h > > index 15c706fb0a37..0e50ba3e88d7 100644 > > --- a/include/linux/arm-smccc.h > > +++ b/include/linux/arm-smccc.h > > @@ -86,6 +86,8 @@ > > ARM_SMCCC_SMC_32, \ > > 0, 0x7fff) > > > > +#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1 > > I thought we'd stick this in asm/spectre.h, but here is also good: > > Acked-by: Will Deacon <will@xxxxxxxxxx> > Ah sorry I glossed over that one. I suppose it can be moved during patch application if desired.