diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 18:28:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 18:28:42 -0400 |
| commit | 666484f0250db2e016948d63b3ef33e202e3b8d0 (patch) | |
| tree | 734f48c10aa364965e4f4642ee3de51669e62be2 /kernel/rcuclassic.c | |
| parent | d18bb9a548e550f3ced57618e75085fb3f173133 (diff) | |
| parent | ace7f1b79670aa0c1d9f4b0442be82e565827333 (diff) | |
Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softirq: remove irqs_disabled warning from local_bh_enable
softirq: remove initialization of static per-cpu variable
Remove argument from open_softirq which is always NULL
Diffstat (limited to 'kernel/rcuclassic.c')
| -rw-r--r-- | kernel/rcuclassic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c index a38895a5b8e2..65c0906080ef 100644 --- a/kernel/rcuclassic.c +++ b/kernel/rcuclassic.c | |||
| @@ -543,7 +543,7 @@ static void __cpuinit rcu_online_cpu(int cpu) | |||
| 543 | 543 | ||
| 544 | rcu_init_percpu_data(cpu, &rcu_ctrlblk, rdp); | 544 | rcu_init_percpu_data(cpu, &rcu_ctrlblk, rdp); |
| 545 | rcu_init_percpu_data(cpu, &rcu_bh_ctrlblk, bh_rdp); | 545 | rcu_init_percpu_data(cpu, &rcu_bh_ctrlblk, bh_rdp); |
| 546 | open_softirq(RCU_SOFTIRQ, rcu_process_callbacks, NULL); | 546 | open_softirq(RCU_SOFTIRQ, rcu_process_callbacks); |
| 547 | } | 547 | } |
| 548 | 548 | ||
| 549 | static int __cpuinit rcu_cpu_notify(struct notifier_block *self, | 549 | static int __cpuinit rcu_cpu_notify(struct notifier_block *self, |