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
/
ppc
/
kernel
/
time.c
diff --git
a/arch/ppc/kernel/time.c
b/arch/ppc/kernel/time.c
index
60e7ef5
..
5072413
100644
(file)
--- a/
arch/ppc/kernel/time.c
+++ b/
arch/ppc/kernel/time.c
@@
-91,7
+91,7
@@
extern unsigned long wall_jiffies;
static long time_offset;
static long time_offset;
-
spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED
;
+
DEFINE_SPINLOCK(rtc_lock)
;
EXPORT_SYMBOL(rtc_lock);
EXPORT_SYMBOL(rtc_lock);
@@
-142,6
+142,7
@@
void timer_interrupt(struct pt_regs * regs)
jiffy_stamp += tb_ticks_per_jiffy;
profile_tick(CPU_PROFILING, regs);
jiffy_stamp += tb_ticks_per_jiffy;
profile_tick(CPU_PROFILING, regs);
+ update_process_times(user_mode(regs));
if (smp_processor_id())
continue;
if (smp_processor_id())
continue;
@@
-183,10
+184,6
@@
void timer_interrupt(struct pt_regs * regs)
set_dec(next_dec);
last_jiffy_stamp(cpu) = jiffy_stamp;
set_dec(next_dec);
last_jiffy_stamp(cpu) = jiffy_stamp;
-#ifdef CONFIG_SMP
- smp_local_timer_interrupt(regs);
-#endif /* CONFIG_SMP */
-
if (ppc_md.heartbeat && !ppc_md.heartbeat_count--)
ppc_md.heartbeat();
if (ppc_md.heartbeat && !ppc_md.heartbeat_count--)
ppc_md.heartbeat();