summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/lse.h
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2016-11-03 21:34:34 +0300
committerWill Deacon <will.deacon@arm.com>2016-11-05 23:59:06 +0300
commit272d01bd790fdf3f1b16372fe28136e27756756f (patch)
treef55d134f721d4b4f97b563cfbeb0fcc208dad2e4 /arch/arm64/include/asm/lse.h
parenta909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff)
downloadlinux-272d01bd790fdf3f1b16372fe28136e27756756f.tar.xz
arm64: Fix circular include of asm/lse.h through linux/jump_label.h
Commit efd9e03facd0 ("arm64: Use static keys for CPU features") introduced support for static keys in asm/cpufeature.h, including linux/jump_label.h. When CC_HAVE_ASM_GOTO is not defined, this causes a circular dependency via linux/atomic.h, asm/lse.h and asm/cpufeature.h. This patch moves the capability macros out out of asm/cpufeature.h into a separate asm/cpucaps.h and modifies some of the #includes accordingly. Fixes: efd9e03facd0 ("arm64: Use static keys for CPU features") Reported-by: Artem Savkov <asavkov@redhat.com> Tested-by: Artem Savkov <asavkov@redhat.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/lse.h')
-rw-r--r--arch/arm64/include/asm/lse.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h
index 23acc00be32d..fc756e22c84c 100644
--- a/arch/arm64/include/asm/lse.h
+++ b/arch/arm64/include/asm/lse.h
@@ -5,7 +5,6 @@
#include <linux/stringify.h>
#include <asm/alternative.h>
-#include <asm/cpufeature.h>
#ifdef __ASSEMBLER__