diff options
Diffstat (limited to 'kernel/rcupreempt.c')
| -rw-r--r-- | kernel/rcupreempt.c | 22 | 
1 files changed, 8 insertions, 14 deletions
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c index e1cdf196a51..41d275a81df 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c @@ -217,8 +217,6 @@ long rcu_batches_completed(void)  }  EXPORT_SYMBOL_GPL(rcu_batches_completed); -EXPORT_SYMBOL_GPL(rcu_batches_completed_bh); -  void __rcu_read_lock(void)  {  	int idx; @@ -927,26 +925,22 @@ void rcu_offline_cpu(int cpu)  	spin_unlock_irqrestore(&rdp->lock, flags);  } -void __devinit rcu_online_cpu(int cpu) -{ -	unsigned long flags; - -	spin_lock_irqsave(&rcu_ctrlblk.fliplock, flags); -	cpu_set(cpu, rcu_cpu_online_map); -	spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags); -} -  #else /* #ifdef CONFIG_HOTPLUG_CPU */  void rcu_offline_cpu(int cpu)  {  } -void __devinit rcu_online_cpu(int cpu) +#endif /* #else #ifdef CONFIG_HOTPLUG_CPU */ + +void __cpuinit rcu_online_cpu(int cpu)  { -} +	unsigned long flags; -#endif /* #else #ifdef CONFIG_HOTPLUG_CPU */ +	spin_lock_irqsave(&rcu_ctrlblk.fliplock, flags); +	cpu_set(cpu, rcu_cpu_online_map); +	spin_unlock_irqrestore(&rcu_ctrlblk.fliplock, flags); +}  static void rcu_process_callbacks(struct softirq_action *unused)  {  |