aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-04 17:20:01 +0000
committerMark Brown <broonie@kernel.org>2014-12-04 17:20:01 +0000
commit43eb1ffc9ed0062d35df6a8e906c9d59b6e24f1a (patch)
treef21f6b296a620855366b7b06473c1fb89c6bc061
parent50881c752b92d9750ea0e3c49a504d9fe732e999 (diff)
parent00cbaa5c5a23b4089d6fa42c1606074c1c24ddb8 (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
-rw-r--r--linaro/configs/linaro-base.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index bbd0f160398f..15f6ea784f63 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -116,3 +116,5 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_DEBUG_INFO=y
CONFIG_FANOTIFY=y
+CONFIG_RCU_TORTURE_TEST=m
+CONFIG_RCU_TORTURE_TEST_RUNNABLE=n