| Message ID | 1455098850-3551-1-git-send-email-will.deacon@arm.com |
|---|---|
| State | Accepted |
| Commit | afb83cc3f0e4f86ea0e1cc3db7a90f58f1abd4d5 |
| Headers | show |
On Wed, Feb 10, 2016 at 10:07:30AM +0000, Will Deacon wrote: > As of 52e662326e1e ("arm64: prefetch: don't provide spin_lock_prefetch > with LSE"), spin_lock_prefetch is patched at runtime when the LSE atomics > are in use. This relies on the ARM64_LSE_ATOMIC_INSN macro to drive > the alternatives framework, but that macro is only available via > asm/lse.h, which isn't explicitly included in processor.h. Consequently, > drivers can run into build failures such as: > > In file included from include/linux/prefetch.h:14:0, > from drivers/net/ethernet/intel/i40e/i40e_txrx.c:27: > arch/arm64/include/asm/processor.h: In function 'spin_lock_prefetch': > arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' > asm volatile(ARM64_LSE_ATOMIC_INSN( > > This patch add the missing include and gets things building again. > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Will Deacon <will.deacon@arm.com> Applied. Thanks. -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 31b76fce4477..5bb1d763d17a 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -32,6 +32,7 @@ #include <asm/alternative.h> #include <asm/fpsimd.h> #include <asm/hw_breakpoint.h> +#include <asm/lse.h> #include <asm/pgtable-hwdef.h> #include <asm/ptrace.h> #include <asm/types.h>
As of 52e662326e1e ("arm64: prefetch: don't provide spin_lock_prefetch with LSE"), spin_lock_prefetch is patched at runtime when the LSE atomics are in use. This relies on the ARM64_LSE_ATOMIC_INSN macro to drive the alternatives framework, but that macro is only available via asm/lse.h, which isn't explicitly included in processor.h. Consequently, drivers can run into build failures such as: In file included from include/linux/prefetch.h:14:0, from drivers/net/ethernet/intel/i40e/i40e_txrx.c:27: arch/arm64/include/asm/processor.h: In function 'spin_lock_prefetch': arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN' asm volatile(ARM64_LSE_ATOMIC_INSN( This patch add the missing include and gets things building again. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/arm64/include/asm/processor.h | 1 + 1 file changed, 1 insertion(+) -- 2.1.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel