diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /kernel/timer.c | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 6b8538715..00ab398b4 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -180,17 +180,15 @@ void add_timer(struct timer_list *timer) unsigned long flags; spin_lock_irqsave(&timerlist_lock, flags); - if (timer->list.next) + if (timer_pending(timer)) goto bug; internal_add_timer(timer); -out: spin_unlock_irqrestore(&timerlist_lock, flags); return; - bug: + spin_unlock_irqrestore(&timerlist_lock, flags); printk("bug: kernel timer added twice at %p.\n", __builtin_return_address(0)); - goto out; } static inline int detach_timer (struct timer_list *timer) |