summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/time.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/alpha/kernel/time.c
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/alpha/kernel/time.c')
-rw-r--r--arch/alpha/kernel/time.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 9d8b56dc3..0456eb171 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -82,6 +82,16 @@ void timer_interrupt(int irq, void *dev, struct pt_regs * regs)
__u32 now;
long nticks;
+#ifdef __SMP__
+ extern void smp_percpu_timer_interrupt(struct pt_regs *);
+ extern unsigned int boot_cpu_id;
+ /* when SMP, do this for *all* CPUs,
+ but only do the rest for the boot CPU */
+ smp_percpu_timer_interrupt(regs);
+ if (smp_processor_id() != boot_cpu_id)
+ return;
+#endif
+
/*
* Estimate how many ticks have passed since the last update.
* Round the result, .5 to even. When we loose ticks due to