diff options
| author |   Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /kernel/timer.c | |
| parent | arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent(). (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (diff) | |
Merge branch 'master' into for-linus
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 2454172a80d3..ee305c8d4e18 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1717,7 +1717,7 @@ void __init init_timers(void) init_timer_stats(); - BUG_ON(err == NOTIFY_BAD); + BUG_ON(err != NOTIFY_OK); register_cpu_notifier(&timers_nb); open_softirq(TIMER_SOFTIRQ, run_timer_softirq); } |