From 9bdde7753df233fabf4ae26147a2ad503ba9c2b7 Mon Sep 17 00:00:00 2001
From: Torben Hohn <torbenh@gmx.de>
Date: Thu, 27 Jan 2011 16:00:12 +0100
Subject: [PATCH] --- yaml --- r: 234619 b: refs/heads/master c:
 22b7fcdae562b6792b3f5517e89fd7e0337180ae h: refs/heads/master i:   234617:
 1da76d264743cc1ab052450202bf3808fb79a86c   234615:
 292e2ce7bcd600391710b24965a820f65aa35f89 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mn10300/kernel/time.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3501ef9f4b17..c16e8c1b096d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0606f422b453f76c31ab2b1bd52943ff06a2dcf2
+refs/heads/master: 22b7fcdae562b6792b3f5517e89fd7e0337180ae
diff --git a/trunk/arch/mn10300/kernel/time.c b/trunk/arch/mn10300/kernel/time.c
index 75da468090b9..5b955000626d 100644
--- a/trunk/arch/mn10300/kernel/time.c
+++ b/trunk/arch/mn10300/kernel/time.c
@@ -104,8 +104,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 	unsigned tsc, elapse;
 	irqreturn_t ret;
 
-	write_seqlock(&xtime_lock);
-
 	while (tsc = get_cycles(),
 	       elapse = tsc - mn10300_last_tsc, /* time elapsed since last
 						 * tick */
@@ -114,11 +112,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 		mn10300_last_tsc += MN10300_TSC_PER_HZ;
 
 		/* advance the kernel's time tracking system */
-		do_timer(1);
+		xtime_update(1);
 	}
 
-	write_sequnlock(&xtime_lock);
-
 	ret = local_timer_interrupt();
 #ifdef CONFIG_SMP
 	send_IPI_allbutself(LOCAL_TIMER_IPI);