summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/mach-default/do_timer.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2006-03-23 17:05:47 +0000
committerAnton Altaparmakov <aia21@hera.kernel.org>2006-03-23 17:05:47 +0000
commita05ba4561fa3ad8b64a27577d0d38c190f60f762 (patch)
tree5eb7561113e006b7bad0bef50dec6821962b1b36 /include/asm-i386/mach-default/do_timer.h
parent74293759002aa7db0179158c20676a034614577b (diff)
parentb0e6e962992b76580f4900b166a337bad7c1e81b (diff)
downloadop-kernel-dev-a05ba4561fa3ad8b64a27577d0d38c190f60f762.zip
op-kernel-dev-a05ba4561fa3ad8b64a27577d0d38c190f60f762.tar.gz
Merge branch 'master' of /home/aia21/ntfs-2.6/
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 5621141..6312c3e 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