diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /kernel/timer.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 9fa35a63b..5457c450b 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -238,7 +238,17 @@ int del_timer_sync(struct timer_list * timer) if (!running) return ret; - timer_synchronize(timer); + + { + int count = 50*1000*1000; + while (timer_is_running(timer) && --count) + ; + if (count == 0) { + printk( "del_timer_sync(%p): deadlock! Called from %p\n", + timer, __builtin_return_address(0)); + printk("See http://www.uow.edu.au/~andrewm/linux/deadlock.html\n"); + } + } } return ret; |