summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFengguang Wu <fengguang.wu@intel.com>2016-07-12 07:45:57 -0700
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2016-08-26 11:46:00 -0700
commit184bfc1a45f35e122aeb8dc85565b36847efb3e1 (patch)
tree16c412aab5fefae912a9d3c2705757d60a108d15 /lib
parent20022cd3a5c41d1d1755534be6f41abc65b80b4f (diff)
downloadlinux-next-184bfc1a45f35e122aeb8dc85565b36847efb3e1.tar.gz
rcu: Disable RCU_PERF_TEST and RCU_TORTURE_TEST for usermode Linux
Usermode Linux currently does not implement arch_irqs_disabled_flags(), which results in a build failure in TASKS_RCU. Commit 570dd3c74241 ("rcu: Disable TASKS_RCU for usermode Linux") attempted to fix this by making TASKS_RCU depend on !UML, which does work in production builds. However, test builds that enable either RCU_PERF_TEST or RCU_TORTURE_TEST will select TASKS_RCU, defeating the dependency on !UML. This commit therefore makes both RCU_PERF_TEST and RCU_TORTURE_TEST also depend on !UML. The usermode Linux maintainers expect to merge arch_irqs_disabled_flags() into 4.8, at which point this commit may be reverted. Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index f17463f4a8f4..ffc2826a092c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1307,6 +1307,7 @@ config TORTURE_TEST
config RCU_PERF_TEST
tristate "performance tests for RCU"
depends on DEBUG_KERNEL
+ depends on !UML
select TORTURE_TEST
select SRCU
select TASKS_RCU
@@ -1324,6 +1325,7 @@ config RCU_PERF_TEST
config RCU_TORTURE_TEST
tristate "torture tests for RCU"
depends on DEBUG_KERNEL
+ depends on !UML
select TORTURE_TEST
select SRCU
select TASKS_RCU