Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

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

diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index f4d1a4d3cdc231696e55802039541e5b024b3c76..d810c93fe66567b3c5166860fd2b815fc6dc5359 100644 (file)
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -10,7 +10,6 @@
  *             "A Kernel Model for Precision Timekeeping" by Dave Mills
  */
 
-#include <linux/config.h> /* CONFIG_HEARTBEAT */
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -28,14 +27,6 @@
 
 #define TICK_SIZE      (tick_nsec / 1000)
 
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
-       return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
 /*
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
@@ -99,89 +90,13 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-/*
- * This version of gettimeofday has near microsecond resolution.
- */
-void do_gettimeofday (struct timeval *tv)
-{
-#if 0 /* DAVIDM later if possible */
-       extern volatile unsigned long lost_ticks;
-       unsigned long lost;
-#endif
-       unsigned long flags;
-       unsigned long usec, sec;
-       unsigned long seq;
-
-       do {
-               seq = read_seqbegin_irqsave(&xtime_lock, flags);
-
-#if 0
-               usec = mach_gettimeoffset ? mach_gettimeoffset () : 0;
-#else
-               usec = 0;
-#endif
-#if 0 /* DAVIDM later if possible */
-               lost = lost_ticks;
-               if (lost)
-                       usec += lost * (1000000/HZ);
-#endif
-               sec = xtime.tv_sec;
-               usec += xtime.tv_nsec / 1000;
-       } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-       while (usec >= 1000000) {
-               usec -= 1000000;
-               sec++;
-       }
-
-       tv->tv_sec = sec;
-       tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
-int do_settimeofday(struct timespec *tv)
-{
-       if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-               return -EINVAL;
-
-       write_seqlock_irq (&xtime_lock);
-
-       /* This is revolting. We need to set the xtime.tv_nsec
-        * correctly. However, the value in this location is
-        * is value at the last tick.
-        * Discover what correction gettimeofday
-        * would have done, and then undo it!
-        */
-#if 0
-       tv->tv_nsec -= mach_gettimeoffset() * 1000;
-#endif
-
-       while (tv->tv_nsec < 0) {
-               tv->tv_nsec += NSEC_PER_SEC;
-               tv->tv_sec--;
-       }
-
-       xtime.tv_sec = tv->tv_sec;
-       xtime.tv_nsec = tv->tv_nsec;
-
-       ntp_clear();
-
-       write_sequnlock_irq (&xtime_lock);
-       clock_was_set();
-       return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
 static int timer_dev_id;
 static struct irqaction timer_irqaction = {
-       timer_interrupt,
-       IRQF_DISABLED,
-       CPU_MASK_NONE,
-       "timer",
-       &timer_dev_id,
-       NULL
+       .handler = timer_interrupt,
+       .flags = IRQF_DISABLED,
+       .mask = CPU_MASK_NONE,
+       .name = "timer",
+       .dev_id = &timer_dev_id,
 };
 
 void time_init (void)