diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:46:50 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 10:46:50 +0200 |
commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b (patch) | |
tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 /kernel/rcupreempt.c | |
parent | 0729fbf3bc70870370b4f43d652f05a468dc68b8 (diff) | |
parent | 70ff05554f91a1edda1f11684da1dbde09e2feea (diff) | |
download | kernel_goldelico_gta04-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.zip kernel_goldelico_gta04-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.tar.gz kernel_goldelico_gta04-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.tar.bz2 |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 396b121..536ce83 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c @@ -1056,7 +1056,15 @@ void rcu_offline_cpu(int cpu) spin_unlock_irqrestore(&rdp->lock, flags); } -void __devinit rcu_online_cpu(int cpu) +#else /* #ifdef CONFIG_HOTPLUG_CPU */ + +void rcu_offline_cpu(int cpu) +{ +} + +#endif /* #else #ifdef CONFIG_HOTPLUG_CPU */ + +void __cpuinit rcu_online_cpu(int cpu) { unsigned long flags; struct rcu_data *rdp; @@ -1080,18 +1088,6 @@ void __devinit rcu_online_cpu(int cpu) spin_unlock_irqrestore(&rdp->lock, 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 */ - static void rcu_process_callbacks(struct softirq_action *unused) { unsigned long flags; |