1 files changed, 8 insertions, 0 deletions

diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index 7c056dcebf55..dd5d0cb6b347 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -48,6 +48,8 @@ EXPORT_SYMBOL(boot_cpu_data);
 
 struct cpuinfo_parisc cpu_data[NR_CPUS] __read_mostly;
 
+extern int update_cr16_clocksource(void);       /* from time.c */
+
 /*
 **      PARISC CPU driver - claim "device" and initialize CPU data structures.
 **
@@ -198,6 +200,12 @@ static int __init processor_probe(struct parisc_device *dev)
         }
 #endif
 
+        /* If we've registered more than one cpu,
+         * we'll use the jiffies clocksource since cr16
+         * is not synchronized between CPUs.
+         */
+        update_cr16_clocksource();
+
         return 0;
 }