diff options
Diffstat (limited to 'kernel/rcupreempt.c')
-rw-r--r-- | kernel/rcupreempt.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c index 396b121edfe5..536ce83c55fe 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c | |||
@@ -1056,7 +1056,15 @@ void rcu_offline_cpu(int cpu) | |||
1056 | spin_unlock_irqrestore(&rdp->lock, flags); | 1056 | spin_unlock_irqrestore(&rdp->lock, flags); |
1057 | } | 1057 | } |
1058 | 1058 | ||
1059 | void __devinit rcu_online_cpu(int cpu) | 1059 | #else /* #ifdef CONFIG_HOTPLUG_CPU */ |
1060 | |||
1061 | void rcu_offline_cpu(int cpu) | ||
1062 | { | ||
1063 | } | ||
1064 | |||
1065 | #endif /* #else #ifdef CONFIG_HOTPLUG_CPU */ | ||
1066 | |||
1067 | void __cpuinit rcu_online_cpu(int cpu) | ||
1060 | { | 1068 | { |
1061 | unsigned long flags; | 1069 | unsigned long flags; |
1062 | struct rcu_data *rdp; | 1070 | struct rcu_data *rdp; |
@@ -1080,18 +1088,6 @@ void __devinit rcu_online_cpu(int cpu) | |||
1080 | spin_unlock_irqrestore(&rdp->lock, flags); | 1088 | spin_unlock_irqrestore(&rdp->lock, flags); |
1081 | } | 1089 | } |
1082 | 1090 | ||
1083 | #else /* #ifdef CONFIG_HOTPLUG_CPU */ | ||
1084 | |||
1085 | void rcu_offline_cpu(int cpu) | ||
1086 | { | ||
1087 | } | ||
1088 | |||
1089 | void __devinit rcu_online_cpu(int cpu) | ||
1090 | { | ||
1091 | } | ||
1092 | |||
1093 | #endif /* #else #ifdef CONFIG_HOTPLUG_CPU */ | ||
1094 | |||
1095 | static void rcu_process_callbacks(struct softirq_action *unused) | 1091 | static void rcu_process_callbacks(struct softirq_action *unused) |
1096 | { | 1092 | { |
1097 | unsigned long flags; | 1093 | unsigned long flags; |