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/timer.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/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index ceacc6626572..b4da888497fa 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -1502,7 +1502,7 @@ void __init init_timers(void) | |||
| 1502 | 1502 | ||
| 1503 | BUG_ON(err == NOTIFY_BAD); | 1503 | BUG_ON(err == NOTIFY_BAD); |
| 1504 | register_cpu_notifier(&timers_nb); | 1504 | register_cpu_notifier(&timers_nb); |
| 1505 | open_softirq(TIMER_SOFTIRQ, run_timer_softirq, NULL); | 1505 | open_softirq(TIMER_SOFTIRQ, run_timer_softirq); |
| 1506 | } | 1506 | } |
| 1507 | 1507 | ||
| 1508 | /** | 1508 | /** |