summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/mach-default/do_timer.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-29 19:58:22 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-29 19:58:22 -0500
commit79072f38909e3d9883317238887460c39ddcc4cb (patch)
tree28369f5a844535ff836565eefd62695b0e890fa3 /include/asm-i386/mach-default/do_timer.h
parent200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff)
parent55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff)
downloadblackbird-op-linux-79072f38909e3d9883317238887460c39ddcc4cb.tar.gz
blackbird-op-linux-79072f38909e3d9883317238887460c39ddcc4cb.zip
Merge branch 'upstream'
Diffstat (limited to 'include/asm-i386/mach-default/do_timer.h')
-rw-r--r--include/asm-i386/mach-default/do_timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h
index 56211414fc95..6312c3e79814 100644
--- a/include/asm-i386/mach-default/do_timer.h
+++ b/include/asm-i386/mach-default/do_timer.h
@@ -18,7 +18,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
OpenPOWER on IntegriCloud