vserver 1.9.5.x5

[linux-2.6.git] / arch / mips / gt64120 / common / time.c

diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c
index 86a2100..2287b59 100644 (file)
--- a/arch/mips/gt64120/common/time.c
+++ b/arch/mips/gt64120/common/time.c
@@ -36,6 +36,9 @@ static void gt64120_irq(int irq, void *dev_id, struct pt_regs *regs)
                handled = 1;
                irq_src &= ~0x00000800;
                do_timer(regs);
+#ifndef CONFIG_SMP
+               update_process_times(user_mode(regs));
+#endif
        }
 
        GT_WRITE(GT_INTRCAUSE_OFS, 0);
@@ -62,7 +65,6 @@ static void gt64120_irq(int irq, void *dev_id, struct pt_regs *regs)
  */
 void gt64120_time_init(void)
 {
-       extern irq_desc_t irq_desc[NR_IRQS];
        static struct irqaction timer;
 
        /* Disable timer first */
@@ -80,7 +82,7 @@ void gt64120_time_init(void)
        timer.name = "timer";
        timer.dev_id = NULL;
        timer.next = NULL;
-       timer.mask = 0;
+       timer.mask = CPU_MASK_NONE;
        irq_desc[GT_TIMER].action = &timer;
 
        enable_irq(GT_TIMER);