Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / m68k / kernel / time.c

diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 4926b3856c15c2e3abdd0ecad848b1afb2025817..06438dac08ff64172ac577ee8336973c2c946b75 100644 (file)
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -42,9 +42,7 @@ static inline int set_rtc_mmss(unsigned long nowtime)
 static irqreturn_t timer_interrupt(int irq, void *dummy)
 {
        do_timer(1);
-#ifndef CONFIG_SMP
        update_process_times(user_mode(get_irq_regs()));
-#endif
        profile_tick(CPU_PROFILING);
 
 #ifdef CONFIG_HEARTBEAT