[ARM PATCH] 2216/1: Update iop3xx timers to new update process times scheme

Patch from Dave Jiang

Updates the timer irqs to call the new update process time scheme

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

arch/arm/mach-iop3xx/iop321-setup.c

@@ -46,7 +46,7 @@ MACHINE_START(IQ80321, "Intel IQ80321")
 	FIXUP(fixup_iop321)
 	MAPIO(iq80321_map_io)
 	INITIRQ(iop321_init_irq)
-	.timer		= &iop331_timer,
+	.timer		= &iop321_timer,
     BOOT_PARAMS(0xa0000100)
 MACHINE_END
 #elif defined(CONFIG_ARCH_IQ31244)
@@ -55,7 +55,7 @@ MACHINE_END
     BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)
     MAPIO(iq31244_map_io)
     INITIRQ(iop321_init_irq)
-	.timer		= &iop331_timer,
+	.timer		= &iop321_timer,
     BOOT_PARAMS(0xa0000100)
 MACHINE_END
 #else

arch/arm/mach-iop3xx/iop321-time.c

@@ -99,6 +99,9 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	asm volatile("mcr p6, 0, %0, c3, c1, 0" : : "r" (0xffffffff));
 #else
 	do_timer(regs);
+#ifndef CONFIG_SMP
+	update_process_times(user_mode(regs));
+#endif
 #endif
 
 	return IRQ_HANDLED;

arch/arm/mach-iop3xx/iop331-time.c

@@ -99,6 +99,9 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	asm volatile("mcr p6, 0, %0, c3, c1, 0" : : "r" (0xffffffff));
 #else
 	do_timer(regs);
+#ifndef CONFIG_SMP
+	update_process_times(user_mode(regs));
+#endif
 #endif
 
 	return IRQ_HANDLED;