From 080b1e5e41963407386c92bcbc72524086682e35 Mon Sep 17 00:00:00 2001
From: Michael Cree <mcree@orcon.net.nz>
Date: Sun, 19 Sep 2010 02:05:40 -0400
Subject: [PATCH] --- yaml --- r: 210830 b: refs/heads/master c:
 bdc8b8914b17cf97b53e5f7af8168d68cfb089d6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 16d31af9dd54..e481f8d9c15b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 531f0474bf889d489b28ea4b15e87b7cbb77f580
+refs/heads/master: bdc8b8914b17cf97b53e5f7af8168d68cfb089d6
diff --git a/trunk/arch/alpha/kernel/time.c b/trunk/arch/alpha/kernel/time.c
index eacceb26d9c8..396af1799ea4 100644
--- a/trunk/arch/alpha/kernel/time.c
+++ b/trunk/arch/alpha/kernel/time.c
@@ -191,16 +191,16 @@ irqreturn_t timer_interrupt(int irq, void *dev)
 
 	write_sequnlock(&xtime_lock);
 
-#ifndef CONFIG_SMP
-	while (nticks--)
-		update_process_times(user_mode(get_irq_regs()));
-#endif
-
 	if (test_perf_event_pending()) {
 		clear_perf_event_pending();
 		perf_event_do_pending();
 	}
 
+#ifndef CONFIG_SMP
+	while (nticks--)
+		update_process_times(user_mode(get_irq_regs()));
+#endif
+
 	return IRQ_HANDLED;
 }