---

yaml --- r: 372942 b: refs/heads/master c: 73c3082 h: refs/heads/master v: v3
git-mirror · May 4, 2013 · c006c71 · c006c71
1 parent 019dc7d
commit c006c71
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c032862fba51a3ca504752d3a25186b324c5ce83
+refs/heads/master: 73c30828771acafb0a5e3a1c4cf75e6c5dc5f98a
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
@@ -687,15 +687,15 @@ choice
 
 config RCU_NOCB_CPU_NONE
 	bool "No build_forced no-CBs CPUs"
-	depends on RCU_NOCB_CPU
+	depends on RCU_NOCB_CPU && !NO_HZ_FULL
 	help
 	  This option does not force any of the CPUs to be no-CBs CPUs.
 	  Only CPUs designated by the rcu_nocbs= boot parameter will be
 	  no-CBs CPUs.
 
 config RCU_NOCB_CPU_ZERO
 	bool "CPU 0 is a build_forced no-CBs CPU"
-	depends on RCU_NOCB_CPU
+	depends on RCU_NOCB_CPU && !NO_HZ_FULL
 	help
 	  This option forces CPU 0 to be a no-CBs CPU.  Additional CPUs
 	  may be designated as no-CBs CPUs using the rcu_nocbs= boot

diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
@@ -109,7 +109,6 @@ config NO_HZ_FULL
 	select NO_HZ_COMMON
 	select RCU_USER_QS
 	select RCU_NOCB_CPU
-	select RCU_NOCB_CPU_ALL
 	select VIRT_CPU_ACCOUNTING_GEN
 	select CONTEXT_TRACKING_FORCE
 	select IRQ_WORK