diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-01 14:21:36 +0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-01 14:21:36 +0200 | 
| commit | 048b718029033af117870d3da47da12995be14a3 (patch) | |
| tree | b3d4bf5219cd6543c35cb79d1aa08ae98cf2a8af /init | |
| parent | 47ea91b4052d9e94b9dca5d7a3d947fbebd07ba9 (diff) | |
| parent | afe24b122eb6edb5f1cb942570ac8d766105c7fc (diff) | |
| download | linux-048b718029033af117870d3da47da12995be14a3.tar.bz2 | |
Merge branch 'rcu/next' of git://github.com/paulmckrcu/linux into core/rcu
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/init/Kconfig b/init/Kconfig index d62778390e55..dc7e27bf89a8 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -391,7 +391,7 @@ config TREE_RCU  config TREE_PREEMPT_RCU  	bool "Preemptible tree-based hierarchical RCU" -	depends on PREEMPT +	depends on PREEMPT && SMP  	help  	  This option selects the RCU implementation that is  	  designed for very large SMP systems with hundreds or @@ -401,7 +401,7 @@ config TREE_PREEMPT_RCU  config TINY_RCU  	bool "UP-only small-memory-footprint RCU" -	depends on !SMP +	depends on !PREEMPT && !SMP  	help  	  This option selects the RCU implementation that is  	  designed for UP systems from which real-time response @@ -410,7 +410,7 @@ config TINY_RCU  config TINY_PREEMPT_RCU  	bool "Preemptible UP-only small-memory-footprint RCU" -	depends on !SMP && PREEMPT +	depends on PREEMPT && !SMP  	help  	  This option selects the RCU implementation that is designed  	  for real-time UP systems.  This option greatly reduces the |