aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 18:28:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-14 18:28:42 -0400
commit666484f0250db2e016948d63b3ef33e202e3b8d0 (patch)
tree734f48c10aa364965e4f4642ee3de51669e62be2 /kernel/hrtimer.c
parentd18bb9a548e550f3ced57618e75085fb3f173133 (diff)
parentace7f1b79670aa0c1d9f4b0442be82e565827333 (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/hrtimer.c')
-rw-r--r--kernel/hrtimer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index ab80515008f4..e0da4fc9f931 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1677,7 +1677,7 @@ void __init hrtimers_init(void)
1677 (void *)(long)smp_processor_id()); 1677 (void *)(long)smp_processor_id());
1678 register_cpu_notifier(&hrtimers_nb); 1678 register_cpu_notifier(&hrtimers_nb);
1679#ifdef CONFIG_HIGH_RES_TIMERS 1679#ifdef CONFIG_HIGH_RES_TIMERS
1680 open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq, NULL); 1680 open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq);
1681#endif 1681#endif
1682} 1682}
1683 1683