Merge branch 'master' into upstream

[linux-2.6] / include / asm-i386 / mach-visws / do_timer.h

diff --git a/include/asm-i386/mach-visws/do_timer.h b/include/asm-i386/mach-visws/do_timer.h
index 33acd50fd9a8a99745d3d582b9100eb23f22c86a..95568e6ca91cf3cff150c743ff9f0f87a070a4d9 100644 (file)
--- a/include/asm-i386/mach-visws/do_timer.h
+++ b/include/asm-i386/mach-visws/do_timer.h
@@ -1,6 +1,7 @@
 /* defines for inline arch setup functions */
 
 #include <asm/fixmap.h>
+#include <asm/i8259.h>
 #include "cobalt.h"
 
 static inline void do_timer_interrupt_hook(struct pt_regs *regs)
@@ -10,7 +11,7 @@ static inline void do_timer_interrupt_hook(struct pt_regs *regs)
 
        do_timer(regs);
 #ifndef CONFIG_SMP
-       update_process_times(user_mode(regs));
+       update_process_times(user_mode_vm(regs));
 #endif
 /*
  * In the SMP case we use the local APIC timer interrupt to do the