vserver 1.9.5.x5

[linux-2.6.git] / arch / v850 / kernel / time.c

diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index fee3e95..f722a26 100644 (file)
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -40,24 +40,6 @@ unsigned long long sched_clock(void)
        return (unsigned long long)jiffies * (1000000000 / HZ);
 }
 
-static inline void do_profile (unsigned long pc)
-{
-       if (prof_buffer && current->pid) {
-               extern int _stext;
-               pc -= (unsigned long) &_stext;
-               pc >>= prof_shift;
-               if (pc < prof_len)
-                       ++prof_buffer[pc];
-               else
-               /*
-                * Don't ignore out-of-bounds PC values silently,
-                * put them into the last histogram slot, so if
-                * present, they will show up as a sharp peak.
-                */
-                       ++prof_buffer[prof_len-1];
-       }
-}
-
 /*
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
@@ -74,10 +56,10 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs)
          mach_tick ();
 
        do_timer (regs);
-
-       if (! user_mode (regs))
-               do_profile (regs->pc);
-
+#ifndef CONFIG_SMP
+       update_process_times(user_mode(regs));
+#endif
+       profile_tick(CPU_PROFILING, regs);
 #if 0
        /*
         * If we have an externally synchronized Linux clock, then update
@@ -203,7 +185,7 @@ static int timer_dev_id;
 static struct irqaction timer_irqaction = {
        timer_interrupt,
        SA_INTERRUPT,
-       0,
+       CPU_MASK_NONE,
        "timer",
        &timer_dev_id,
        NULL