[PATCH] uml: move LDT creation

[safe/jmp/linux-2.6] / arch / um / kernel / time_kern.c

diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 6516fc5..020ca79 100644 (file)
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -22,10 +22,6 @@
 #include "mode.h"
 #include "os.h"
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 int hz(void)
 {
        return(HZ);
@@ -137,7 +133,10 @@ long um_stime(int __user *tptr)
 void timer_handler(int sig, union uml_pt_regs *regs)
 {
        local_irq_disable();
-       update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)), (regs)->skas.is_user));
+       irq_enter();
+       update_process_times(CHOOSE_MODE(user_context(UPT_SP(regs)),
+                                        (regs)->skas.is_user));
+       irq_exit();
        local_irq_enable();
        if(current_thread->cpu == 0)
                timer_irq(regs);
@@ -162,7 +161,7 @@ int __init timer_init(void)
 {
        int err;
 
-       CHOOSE_MODE(user_time_init_tt(), user_time_init_skas());
+       user_time_init();
        err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL);
        if(err != 0)
                printk(KERN_ERR "timer_init : request_irq failed - "