aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/rcupdate.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/rcupdate.h')
-rw-r--r--include/linux/rcupdate.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index d8fb2abcf303..23be3a702516 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -64,8 +64,6 @@ extern int sched_expedited_torture_stats(char *page);
64 64
65/* Internal to kernel */ 65/* Internal to kernel */
66extern void rcu_init(void); 66extern void rcu_init(void);
67extern int rcu_scheduler_active;
68extern void rcu_scheduler_starting(void);
69 67
70#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) 68#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
71#include <linux/rcutree.h> 69#include <linux/rcutree.h>
@@ -178,7 +176,7 @@ static inline int rcu_read_lock_bh_held(void)
178#ifdef CONFIG_PREEMPT 176#ifdef CONFIG_PREEMPT
179static inline int rcu_read_lock_sched_held(void) 177static inline int rcu_read_lock_sched_held(void)
180{ 178{
181 return !rcu_scheduler_active || preempt_count() != 0 || irqs_disabled(); 179 return preempt_count() != 0 || irqs_disabled();
182} 180}
183#else /* #ifdef CONFIG_PREEMPT */ 181#else /* #ifdef CONFIG_PREEMPT */
184static inline int rcu_read_lock_sched_held(void) 182static inline int rcu_read_lock_sched_held(void)