uml: eliminate hz()

[karo-tx-linux.git] / arch / um / kernel / time.c

diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index b1f8b0752419d8514763d6ca297674e6e7ceb03e..633b673d57781ee82a1afa7c4b26898c37f76c7d 100644 (file)
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -1,32 +1,16 @@
 /*
- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/kernel.h"
-#include "linux/module.h"
-#include "linux/unistd.h"
-#include "linux/stddef.h"
-#include "linux/spinlock.h"
-#include "linux/time.h"
-#include "linux/sched.h"
 #include "linux/interrupt.h"
-#include "linux/init.h"
-#include "linux/delay.h"
-#include "linux/hrtimer.h"
+#include "linux/jiffies.h"
+#include "linux/threads.h"
 #include "asm/irq.h"
 #include "asm/param.h"
-#include "asm/current.h"
 #include "kern_util.h"
-#include "user_util.h"
-#include "mode.h"
 #include "os.h"
 
-int hz(void)
-{
-       return(HZ);
-}
-
 /*
  * Scheduler clock - returns current time in nanosec units.
  */
@@ -35,17 +19,17 @@ unsigned long long sched_clock(void)
        return (unsigned long long)jiffies_64 * (1000000000 / HZ);
 }
 
-static unsigned long long prev_nsecs[NR_CPUS];
 #ifdef CONFIG_UML_REAL_TIME_CLOCK
+static unsigned long long prev_nsecs[NR_CPUS];
 static long long delta[NR_CPUS];               /* Deviation per interval */
 #endif
 
-void timer_irq(union uml_pt_regs *regs)
+void timer_irq(struct uml_pt_regs *regs)
 {
        unsigned long long ticks = 0;
 #ifdef CONFIG_UML_REAL_TIME_CLOCK
        int c = cpu();
-       if(prev_nsecs[c]){
+       if (prev_nsecs[c]) {
                /* We've had 1 tick */
                unsigned long long nsecs = os_nsecs();
 
@@ -53,7 +37,7 @@ void timer_irq(union uml_pt_regs *regs)
                prev_nsecs[c] = nsecs;
 
                /* Protect against the host clock being set backwards */
-               if(delta[c] < 0)
+               if (delta[c] < 0)
                        delta[c] = 0;
 
                ticks += (delta[c] * HZ) / BILLION;
@@ -63,7 +47,7 @@ void timer_irq(union uml_pt_regs *regs)
 #else
        ticks = 1;
 #endif
-       while(ticks > 0){
+       while (ticks > 0) {
                do_IRQ(TIMER_IRQ, regs);
                ticks--;
        }
@@ -95,7 +79,12 @@ irqreturn_t um_timer(int irq, void *dev)
 
        do_timer(1);
 
+#ifdef CONFIG_UML_REAL_TIME_CLOCK
        nsecs = get_time();
+#else
+       nsecs = (unsigned long long) xtime.tv_sec * BILLION + xtime.tv_nsec +
+               BILLION / HZ;
+#endif
        xtime.tv_sec = nsecs / NSEC_PER_SEC;
        xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;
 
@@ -109,12 +98,12 @@ static void register_timer(void)
        int err;
 
        err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL);
-       if(err != 0)
+       if (err != 0)
                printk(KERN_ERR "register_timer : request_irq failed - "
                       "errno = %d\n", -err);
 
        err = set_interval(1);
-       if(err != 0)
+       if (err != 0)
                printk(KERN_ERR "register_timer : set_interval failed - "
                       "errno = %d\n", -err);
 }
@@ -128,15 +117,21 @@ void time_init(void)
        nsecs = os_nsecs();
        set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION,
                                -nsecs % BILLION);
+       set_normalized_timespec(&xtime, nsecs / BILLION, nsecs % BILLION);
        late_time_init = register_timer;
 }
 
 void do_gettimeofday(struct timeval *tv)
 {
+#ifdef CONFIG_UML_REAL_TIME_CLOCK
        unsigned long long nsecs = get_time();
-
+#else
+       unsigned long long nsecs = (unsigned long long) xtime.tv_sec * BILLION +
+               xtime.tv_nsec;
+#endif
        tv->tv_sec = nsecs / NSEC_PER_SEC;
-       /* Careful about calculations here - this was originally done as
+       /*
+        * Careful about calculations here - this was originally done as
         * (nsecs - tv->tv_sec * NSEC_PER_SEC) / NSEC_PER_USEC
         * which gave bogus (> 1000000) values.  Dunno why, suspect gcc
         * (4.0.0) miscompiled it, or there's a subtle 64/32-bit conversion
@@ -166,15 +161,13 @@ int do_settimeofday(struct timespec *tv)
        return 0;
 }
 
-void timer_handler(int sig, union uml_pt_regs *regs)
+void timer_handler(int sig, struct uml_pt_regs *regs)
 {
+       if (current_thread->cpu == 0)
+               timer_irq(regs);
        local_irq_disable();
        irq_enter();
-       update_process_times(CHOOSE_MODE(
-                            (UPT_SC(regs) && user_context(UPT_SP(regs))),
-                            (regs)->skas.is_user));
+       update_process_times(regs->is_user);
        irq_exit();
        local_irq_enable();
-       if(current_thread->cpu == 0)
-               timer_irq(regs);
 }