Merge branch 'v3.2-rc1-52e4c2a05-rt1-fixes-lkml' into v3.2-rc1-52e4c2a05-rt1-fixes-jk-try
* v3.2-rc1-52e4c2a05-rt1-fixes-lkml:
3.2-rc1-rt1 - Compile errors also for rc1 vanilla
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 703cfa3..b01c79b 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 6379dc7..dbc82d0 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -410,7 +410,7 @@
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 636af6d..6689097 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -243,6 +243,7 @@
}
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 @@
__call_rcu(head, func, &rcu_bh_ctrlblk);
}
EXPORT_SYMBOL_GPL(call_rcu_bh);
+#endif
