---

yaml --- r: 234586 b: refs/heads/master c: d12b0e2 h: refs/heads/master v: v3
git-mirror · Jan 31, 2011 · 3739867 · 3739867
1 parent c6f08d1
commit 3739867
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ea1b72551d052a3993ef72ce06ecf5bdd125859
+refs/heads/master: d12b0e24c56c6fb2398609f26858e5278d688840
diff --git a/trunk/arch/xtensa/kernel/time.c b/trunk/arch/xtensa/kernel/time.c
@@ -96,16 +96,12 @@ irqreturn_t timer_interrupt (int irq, void *dev_id)
 		update_process_times(user_mode(get_irq_regs()));
 #endif
 
-		write_seqlock(&xtime_lock);
-
-		do_timer(1); /* Linux handler in kernel/timer.c */
+		xtime_update(1); /* Linux handler in kernel/time/timekeeping */
 
 		/* Note that writing CCOMPARE clears the interrupt. */
 
 		next += CCOUNT_PER_JIFFY;
 		set_linux_timer(next);
-
-		write_sequnlock(&xtime_lock);
 	}
 
 	/* Allow platform to do something useful (Wdog). */