diff options
author | Adam Williamson <awilliam@redhat.com> | 2014-09-22 08:59:04 -0700 |
---|---|---|
committer | Adam Williamson <awilliam@redhat.com> | 2014-09-22 08:59:04 -0700 |
commit | 5ddbd85a50d24a625be6b693961633d6fbccd875 (patch) | |
tree | 4b8a130fbb1783b1d2b10cb17562c1e5426b639f /config-generic | |
parent | d1f086f672c30a58085872b828668f851cc70de7 (diff) | |
parent | daec5ad199c2becf783a47c65bb032621d3c5766 (diff) | |
download | kernel-5ddbd85a50d24a625be6b693961633d6fbccd875.tar.gz kernel-5ddbd85a50d24a625be6b693961633d6fbccd875.tar.xz kernel-5ddbd85a50d24a625be6b693961633d6fbccd875.zip |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config-generic b/config-generic index ad431165f..d91fa659d 100644 --- a/config-generic +++ b/config-generic @@ -5203,8 +5203,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_STRIP_ASM_SYMS=y # CONFIG_RCU_FANOUT_EXACT is not set -# FIXME: Revisit FAST_NO_HZ after it's fixed -# CONFIG_RCU_FAST_NO_HZ is not set +CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_NOCB_CPU_ALL=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 |