git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
m68k
/
kernel
/
time.c
diff --git
a/arch/m68k/kernel/time.c
b/arch/m68k/kernel/time.c
index
11d1229
..
e47e195
100644
(file)
--- a/
arch/m68k/kernel/time.c
+++ b/
arch/m68k/kernel/time.c
@@
-45,6
+45,9
@@
static inline int set_rtc_mmss(unsigned long nowtime)
static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
{
do_timer(regs);
+#ifndef CONFIG_SMP
+ update_process_times(user_mode(regs));
+#endif
profile_tick(CPU_PROFILING, regs);
#ifdef CONFIG_HEARTBEAT