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
/
alpha
/
kernel
/
time.c
diff --git
a/arch/alpha/kernel/time.c
b/arch/alpha/kernel/time.c
index
5ff439b
..
8226c5c
100644
(file)
--- a/
arch/alpha/kernel/time.c
+++ b/
arch/alpha/kernel/time.c
@@
-63,7
+63,7
@@
extern unsigned long wall_jiffies; /* kernel/timer.c */
static int set_rtc_mmss(unsigned long);
static int set_rtc_mmss(unsigned long);
-
spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(rtc_lock)
;
#define TICK_SIZE (tick_nsec / 1000)
#define TICK_SIZE (tick_nsec / 1000)
@@
-138,6
+138,9
@@
irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs)
while (nticks > 0) {
do_timer(regs);
while (nticks > 0) {
do_timer(regs);
+#ifndef CONFIG_SMP
+ update_process_times(user_mode(regs));
+#endif
nticks--;
}
nticks--;
}