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/rcupreempt.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/rcupreempt.c')
| -rw-r--r-- | kernel/rcupreempt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c index 41d275a81df5..9bf445664457 100644 --- a/kernel/rcupreempt.c +++ b/kernel/rcupreempt.c | |||
| @@ -1119,7 +1119,7 @@ void __init __rcu_init(void) | |||
| 1119 | for_each_online_cpu(cpu) | 1119 | for_each_online_cpu(cpu) |
| 1120 | rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE, (void *)(long) cpu); | 1120 | rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE, (void *)(long) cpu); |
| 1121 | 1121 | ||
| 1122 | open_softirq(RCU_SOFTIRQ, rcu_process_callbacks, NULL); | 1122 | open_softirq(RCU_SOFTIRQ, rcu_process_callbacks); |
| 1123 | } | 1123 | } |
| 1124 | 1124 | ||
| 1125 | /* | 1125 | /* |