diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
| commit | 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed (patch) | |
| tree | 6f977546112ccbd617ef40ae38a1ca558d71bce9 /kernel/timer.c | |
| parent | 332b5a52f2f96bc2d13bbe594a430318c0ee4425 (diff) | |
| parent | 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f (diff) | |
Merge branch 'upstream'
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 4f1cb0ab5251..b9dad3994676 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -495,7 +495,7 @@ unsigned long next_timer_interrupt(void) | |||
| 495 | base = &__get_cpu_var(tvec_bases); | 495 | base = &__get_cpu_var(tvec_bases); |
| 496 | spin_lock(&base->t_base.lock); | 496 | spin_lock(&base->t_base.lock); |
| 497 | expires = base->timer_jiffies + (LONG_MAX >> 1); | 497 | expires = base->timer_jiffies + (LONG_MAX >> 1); |
| 498 | list = 0; | 498 | list = NULL; |
| 499 | 499 | ||
| 500 | /* Look for timer events in tv1. */ | 500 | /* Look for timer events in tv1. */ |
| 501 | j = base->timer_jiffies & TVR_MASK; | 501 | j = base->timer_jiffies & TVR_MASK; |