summaryrefslogtreecommitdiff
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-08-06 14:08:47 +0100
committerMark Brown <broonie@kernel.org>2021-08-06 14:08:47 +0100
commit143910c1a459685360710eba6697a62f78ceb514 (patch)
tree4f768bcdd768528a09a2bd91334c449dad1b4ed2 /arch/xtensa
parentf5d1444262c2ee84418a0163945e5f18b54f76d9 (diff)
parent758fa151eb378e18ce082b3c8168458bc6d6f30e (diff)
downloadlinux-next-143910c1a459685360710eba6697a62f78ceb514.tar.gz
Merge remote-tracking branch 'rcu/rcu/next'
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/configs/nommu_kc705_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/xtensa/configs/nommu_kc705_defconfig b/arch/xtensa/configs/nommu_kc705_defconfig
index 88b2e222d4bf..fcb620ef3799 100644
--- a/arch/xtensa/configs/nommu_kc705_defconfig
+++ b/arch/xtensa/configs/nommu_kc705_defconfig
@@ -119,7 +119,6 @@ CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_MUTEXES=y
CONFIG_DEBUG_ATOMIC_SLEEP=y
CONFIG_STACKTRACE=y
-# CONFIG_RCU_CPU_STALL_INFO is not set
CONFIG_RCU_TRACE=y
# CONFIG_FTRACE is not set
# CONFIG_LD_NO_RELAX is not set