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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
galileo-boards
/
ev96100
/
time.c
diff --git
a/arch/mips/galileo-boards/ev96100/time.c
b/arch/mips/galileo-boards/ev96100/time.c
index
10189b9
..
8cbe842
100644
(file)
--- a/
arch/mips/galileo-boards/ev96100/time.c
+++ b/
arch/mips/galileo-boards/ev96100/time.c
@@
-73,6
+73,9
@@
void mips_timer_interrupt(struct pt_regs *regs)
do {
kstat_this_cpu.irqs[irq]++;
do_timer(regs);
+#ifndef CONFIG_SMP
+ update_process_times(user_mode(regs));
+#endif
r4k_cur += r4k_offset;
ack_r4ktimer(r4k_cur);