diff options
| author | John Kacur <jkacur@redhat.com> | 2011-11-14 11:47:56 +0100 |
|---|---|---|
| committer | John Kacur <jkacur@redhat.com> | 2011-11-14 11:47:56 +0100 |
| commit | e10801aff6a7d734b556617f7d4a74b09c089732 (patch) | |
| tree | 25d17378a1a112cc27d7889b54642e2fad56c8fe | |
| parent | 6c1b38e3c4a622d57c19dc73c231fb26adbb8791 (diff) | |
| parent | d6bcc87707fde7895c2c598a57963673ef400277 (diff) | |
| download | linux-rt-v3.2-rc1-52e4c2a05-rt1-fixes.tar.gz | |
Merge branch 'v3.2-rc1-52e4c2a05-rt1-fixes-lkml' into v3.2-rc1-52e4c2a05-rt1-fixes-jk-tryv3.2-rc1-52e4c2a05-rt1-fixes
* v3.2-rc1-52e4c2a05-rt1-fixes-lkml:
3.2-rc1-rt1 - Compile errors also for rc1 vanilla
| -rw-r--r-- | include/linux/sysctl.h | 1 | ||||
| -rw-r--r-- | init/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/rcutiny.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 703cfa33a3ca6..b01c79bb2c6af 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -25,6 +25,7 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/compiler.h> +#include <linux/atomic.h> struct completion; diff --git a/init/Kconfig b/init/Kconfig index 6379dc7bea052..dbc82d01e66a0 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -410,7 +410,7 @@ config TINY_RCU config TINY_PREEMPT_RCU bool "Preemptible UP-only small-memory-footprint RCU" - depends on PREEMPT && !SMP && !PREEMPT_RT_FULL + depends on PREEMPT && !SMP help This option selects the RCU implementation that is designed for real-time UP systems. This option greatly reduces the diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c index 636af6d9c6e56..6689097c45ec2 100644 --- a/kernel/rcutiny.c +++ b/kernel/rcutiny.c @@ -243,6 +243,7 @@ void call_rcu_sched(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) } EXPORT_SYMBOL_GPL(call_rcu_sched); +#ifndef CONFIG_PREEMPT_RT_FULL /* * Post an RCU bottom-half callback to be invoked after any subsequent * quiescent state. @@ -252,3 +253,4 @@ void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) __call_rcu(head, func, &rcu_bh_ctrlblk); } EXPORT_SYMBOL_GPL(call_rcu_bh); +#endif |