1 files changed, 39 insertions, 6 deletions

diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
index 96cc307ed9f4..e2e893144a84 100644
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
@@ -29,6 +29,10 @@
 
 void rcu_sched_qs(int cpu);
 void rcu_bh_qs(int cpu);
+static inline void rcu_note_context_switch(int cpu)
+{
+        rcu_sched_qs(cpu);
+}
 
 #define __rcu_read_lock()       preempt_disable()
 #define __rcu_read_unlock()     preempt_enable()
@@ -60,9 +64,29 @@ static inline long rcu_batches_completed_bh(void)
         return 0;
 }
 
-extern int rcu_expedited_torture_stats(char *page);
+static inline void rcu_force_quiescent_state(void)
+{
+}
+
+static inline void rcu_bh_force_quiescent_state(void)
+{
+}
+
+static inline void rcu_sched_force_quiescent_state(void)
+{
+}
+
+extern void synchronize_sched(void);
+
+static inline void synchronize_rcu(void)
+{
+        synchronize_sched();
+}
 
-#define synchronize_rcu synchronize_sched
+static inline void synchronize_rcu_bh(void)
+{
+        synchronize_sched();
+}
 
 static inline void synchronize_rcu_expedited(void)
 {
@@ -93,10 +117,6 @@ static inline void rcu_exit_nohz(void)
 
 #endif /* #else #ifdef CONFIG_NO_HZ */
 
-static inline void rcu_scheduler_starting(void)
-{
-}
-
 static inline void exit_rcu(void)
 {
 }
@@ -106,4 +126,17 @@ static inline int rcu_preempt_depth(void)
         return 0;
 }
 
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+
+extern int rcu_scheduler_active __read_mostly;
+extern void rcu_scheduler_starting(void);
+
+#else /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
+
+static inline void rcu_scheduler_starting(void)
+{
+}
+
+#endif /* #else #ifdef CONFIG_DEBUG_LOCK_ALLOC */
+
 #endif /* __LINUX_RCUTINY_H */