diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:42:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:42:17 -0400 |
| commit | 862cff63781e3a9de85d8947c82d55f4cc95572b (patch) | |
| tree | ab47b1597e3ef193590da98147e494b2d702bac2 /kernel/timer.c | |
| parent | 7819d64e31a685e35e4819515c84168d0879816e (diff) | |
| parent | c16226a1c75042bfdc50bd2921d5919f6267ba51 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 6b812c04737b..c3a874f1393c 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -1479,8 +1479,7 @@ register_time_interpolator(struct time_interpolator *ti) | |||
| 1479 | unsigned long flags; | 1479 | unsigned long flags; |
| 1480 | 1480 | ||
| 1481 | /* Sanity check */ | 1481 | /* Sanity check */ |
| 1482 | if (ti->frequency == 0 || ti->mask == 0) | 1482 | BUG_ON(ti->frequency == 0 || ti->mask == 0); |
| 1483 | BUG(); | ||
| 1484 | 1483 | ||
| 1485 | ti->nsec_per_cyc = ((u64)NSEC_PER_SEC << ti->shift) / ti->frequency; | 1484 | ti->nsec_per_cyc = ((u64)NSEC_PER_SEC << ti->shift) / ti->frequency; |
| 1486 | spin_lock(&time_interpolator_lock); | 1485 | spin_lock(&time_interpolator_lock); |