diff options
author | Will Deacon <will@kernel.org> | 2020-04-30 17:39:42 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2020-04-30 17:39:42 +0100 |
commit | bf60333977d57b1edaac75ab942a8d0e5f923b33 (patch) | |
tree | ebbcc95cfba75d72034e23c33c4a62a23c9d1e2f /lib | |
parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
parent | 2ce0d7f9766f0e49bb54f149c77bae89464932fb (diff) | |
download | linux-bf60333977d57b1edaac75ab942a8d0e5f923b33.tar.gz linux-bf60333977d57b1edaac75ab942a8d0e5f923b33.tar.bz2 linux-bf60333977d57b1edaac75ab942a8d0e5f923b33.zip |
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 'lib')
-rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 5d53f9609c25..e831e1f01767 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -80,6 +80,9 @@ config ARCH_USE_CMPXCHG_LOCKREF config ARCH_HAS_FAST_MULTIPLIER bool +config ARCH_USE_SYM_ANNOTATIONS + bool + config INDIRECT_PIO bool "Access I/O in non-MMIO mode" depends on ARM64 |