Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...

[pandora-kernel.git] / include / linux / rcutiny.h

diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
index 4cc5eba..30ebd7c 100644 (file)
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
@@ -27,34 +27,12 @@
 
 #include <linux/cache.h>
 
-void rcu_sched_qs(int cpu);
-void rcu_bh_qs(int cpu);
-
-#ifdef CONFIG_TINY_RCU
-#define __rcu_read_lock()      preempt_disable()
-#define __rcu_read_unlock()    preempt_enable()
-#else /* #ifdef CONFIG_TINY_RCU */
-void __rcu_read_lock(void);
-void __rcu_read_unlock(void);
-#endif /* #else #ifdef CONFIG_TINY_RCU */
-#define __rcu_read_lock_bh()   local_bh_disable()
-#define __rcu_read_unlock_bh() local_bh_enable()
-extern void call_rcu_sched(struct rcu_head *head,
-                          void (*func)(struct rcu_head *rcu));
-
-#define rcu_init_sched()       do { } while (0)
-
-extern void synchronize_sched(void);
-
-#ifdef CONFIG_TINY_RCU
-
-#define call_rcu               call_rcu_sched
-
-static inline void synchronize_rcu(void)
+static inline void rcu_init(void)
 {
-       synchronize_sched();
 }
 
+#ifdef CONFIG_TINY_RCU
+
 static inline void synchronize_rcu_expedited(void)
 {
        synchronize_sched();    /* Only one CPU, so pretty fast anyway!!! */
@@ -67,7 +45,6 @@ static inline void rcu_barrier(void)
 
 #else /* #ifdef CONFIG_TINY_RCU */
 
-void synchronize_rcu(void);
 void rcu_barrier(void);
 void synchronize_rcu_expedited(void);
 
@@ -83,25 +60,11 @@ static inline void synchronize_rcu_bh_expedited(void)
        synchronize_sched();
 }
 
-struct notifier_block;
-
-#ifdef CONFIG_NO_HZ
-
-extern void rcu_enter_nohz(void);
-extern void rcu_exit_nohz(void);
-
-#else /* #ifdef CONFIG_NO_HZ */
-
-static inline void rcu_enter_nohz(void)
-{
-}
-
-static inline void rcu_exit_nohz(void)
+static inline void synchronize_sched_expedited(void)
 {
+       synchronize_sched();
 }
 
-#endif /* #else #ifdef CONFIG_NO_HZ */
-
 #ifdef CONFIG_TINY_RCU
 
 static inline void rcu_preempt_note_context_switch(void)
@@ -117,11 +80,6 @@ static inline int rcu_needs_cpu(int cpu)
        return 0;
 }
 
-static inline int rcu_preempt_depth(void)
-{
-       return 0;
-}
-
 #else /* #ifdef CONFIG_TINY_RCU */
 
 void rcu_preempt_note_context_switch(void);
@@ -133,13 +91,6 @@ static inline int rcu_needs_cpu(int cpu)
        return rcu_preempt_needs_cpu();
 }
 
-/*
- * Defined as macro as it is a very low level header
- * included from areas that don't even know about current
- * FIXME: combine with include/linux/rcutree.h into rcupdate.h.
- */
-#define rcu_preempt_depth() (current->rcu_read_lock_nesting)
-
 #endif /* #else #ifdef CONFIG_TINY_RCU */
 
 static inline void rcu_note_context_switch(int cpu)
@@ -148,8 +99,6 @@ static inline void rcu_note_context_switch(int cpu)
        rcu_preempt_note_context_switch();
 }
 
-extern void rcu_check_callbacks(int cpu, int user);
-
 /*
  * Return the number of grace periods.
  */
@@ -178,17 +127,17 @@ static inline void rcu_sched_force_quiescent_state(void)
 {
 }
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
+static inline void rcu_cpu_stall_reset(void)
+{
+}
 
+#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 */