From 6d403070f28cd44860fdb3a53be5da0275c65cf4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 19 Jun 2000 22:45:37 +0000
Subject: 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.

---
 kernel/timer.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'kernel/timer.c')

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;
-- 
cgit v1.2.3