summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2020-04-30 17:39:42 +0100
committerWill Deacon <will@kernel.org>2020-04-30 17:39:42 +0100
commitbf60333977d57b1edaac75ab942a8d0e5f923b33 (patch)
treeebbcc95cfba75d72034e23c33c4a62a23c9d1e2f /arch/x86/Kconfig
parent6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff)
parent2ce0d7f9766f0e49bb54f149c77bae89464932fb (diff)
downloadlinux-bf60333977d57b1edaac75ab942a8d0e5f923b33.tar.bz2
Merge branch 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-next/asm
As agreed with Boris, merge in the 'x86/asm' branch from -tip so that we can select the new 'ARCH_USE_SYM_ANNOTATIONS' Kconfig symbol, which is required by the BTI kernel patches. * 'x86/asm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/asm: Provide a Kconfig symbol for disabling old assembly annotations x86/32: Remove CONFIG_DOUBLEFAULT
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 1197b5596d5a..e90d16da9685 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -91,6 +91,7 @@ config X86
select ARCH_USE_BUILTIN_BSWAP
select ARCH_USE_QUEUED_RWLOCKS
select ARCH_USE_QUEUED_SPINLOCKS
+ select ARCH_USE_SYM_ANNOTATIONS
select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH
select ARCH_WANT_DEFAULT_BPF_JIT if X86_64
select ARCH_WANTS_DYNAMIC_TASK_STRUCT