Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / um / os-Linux / time.c

diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 280c4fb9b585a15813e4cf9669a0b3b258181623..2115b8beb54167ffe9c522a5fbe6727b1e547137 100644 (file)
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -16,26 +16,27 @@
 #include "process.h"
 #include "kern_constants.h"
 #include "os.h"
+#include "uml-config.h"
 
-/* XXX This really needs to be declared and initialized in a kernel file since
- * it's in <linux/time.h>
- */
-extern struct timespec wall_to_monotonic;
-
-static void set_interval(int timer_type)
+int set_interval(int is_virtual)
 {
        int usec = 1000000/hz();
+       int timer_type = is_virtual ? ITIMER_VIRTUAL : ITIMER_REAL;
        struct itimerval interval = ((struct itimerval) { { 0, usec },
                                                          { 0, usec } });
 
        if(setitimer(timer_type, &interval, NULL) == -1)
-               panic("setitimer failed - errno = %d\n", errno);
+               return -errno;
+
+       return 0;
 }
 
+#ifdef UML_CONFIG_MODE_TT
 void enable_timer(void)
 {
-       set_interval(ITIMER_VIRTUAL);
+       set_interval(1);
 }
+#endif
 
 void disable_timer(void)
 {
@@ -45,8 +46,8 @@ void disable_timer(void)
                printk("disnable_timer - setitimer failed, errno = %d\n",
                       errno);
        /* If there are signals already queued, after unblocking ignore them */
-       set_handler(SIGALRM, SIG_IGN, 0, -1);
-       set_handler(SIGVTALRM, SIG_IGN, 0, -1);
+       signal(SIGALRM, SIG_IGN);
+       signal(SIGVTALRM, SIG_IGN);
 }
 
 void switch_timers(int to_real)
@@ -71,6 +72,7 @@ void switch_timers(int to_real)
                       errno);
 }
 
+#ifdef UML_CONFIG_MODE_TT
 void uml_idle_timer(void)
 {
        if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)
@@ -78,16 +80,9 @@ void uml_idle_timer(void)
 
        set_handler(SIGALRM, (__sighandler_t) alarm_handler,
                    SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
-       set_interval(ITIMER_REAL);
-}
-
-void time_init(void)
-{
-       if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)
-               panic("Couldn't set SIGVTALRM handler");
-       set_interval(ITIMER_VIRTUAL);
-       time_init_kern();
+       set_interval(0);
 }
+#endif
 
 unsigned long long os_nsecs(void)
 {
@@ -105,16 +100,3 @@ void idle_sleep(int secs)
        ts.tv_nsec = 0;
        nanosleep(&ts, NULL);
 }
-
-/* XXX This partly duplicates init_irq_signals */
-
-void user_time_init(void)
-{
-       set_handler(SIGVTALRM, (__sighandler_t) alarm_handler,
-                   SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH,
-                   SIGALRM, SIGUSR2, -1);
-       set_handler(SIGALRM, (__sighandler_t) alarm_handler,
-                   SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH,
-                   SIGVTALRM, SIGUSR2, -1);
-       set_interval(ITIMER_VIRTUAL);
-}