This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index 0d4dd7c..a72de97 100644 (file)
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -40,7 +40,6 @@
 #include <linux/spinlock.h>
 #include <linux/hardirq.h>
 
-#include <asm/compiler.h>
 #include <asm/mipsregs.h>
 #include <asm/ptrace.h>
 #include <asm/time.h>
@@ -100,9 +99,6 @@ void mips_timer_interrupt(struct pt_regs *regs)
 
                kstat_this_cpu.irqs[irq]++;
                do_timer(regs);
-#ifndef CONFIG_SMP
-               update_process_times(user_mode(regs));
-#endif
                r4k_cur += r4k_offset;
                ack_r4ktimer(r4k_cur);
 
@@ -141,9 +137,6 @@ void counter0_irq(int irq, void *dev_id, struct pt_regs *regs)
 
        while (time_elapsed > 0) {
                do_timer(regs);
-#ifndef CONFIG_SMP
-               update_process_times(user_mode(regs));
-#endif
                time_elapsed -= MATCH20_INC;
                last_match20 += MATCH20_INC;
                jiffie_drift++;
@@ -160,9 +153,6 @@ void counter0_irq(int irq, void *dev_id, struct pt_regs *regs)
        if (jiffie_drift >= 999) {
                jiffie_drift -= 999;
                do_timer(regs); /* increment jiffies by one */
-#ifndef CONFIG_SMP
-               update_process_times(user_mode(regs));
-#endif
        }
 }
 
@@ -352,9 +342,9 @@ static unsigned long do_fast_cp0_gettimeoffset(void)
 
        __asm__("multu\t%1,%2\n\t"
                "mfhi\t%0"
-               : "=r" (res)
-               : "r" (count), "r" (quotient)
-               : "hi", "lo", GCC_REG_ACCUM);
+               :"=r" (res)
+               :"r" (count),
+                "r" (quotient));
 
        /*
         * Due to possible jiffies inconsistencies, we need to check