1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index dd6b564f65e3..19c3c6bec325 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -26,6 +26,7 @@
 #include <asm/apic.h>
 #include <asm/intel-family.h>
 #include <asm/i8259.h>
+#include <asm/uv/uv.h>
 
 unsigned int __read_mostly cpu_khz;     /* TSC clocks / usec, not used here */
 EXPORT_SYMBOL(cpu_khz);
@@ -1433,6 +1434,9 @@ void __init tsc_early_init(void)
 {
         if (!boot_cpu_has(X86_FEATURE_TSC))
                 return;
+        /* Don't change UV TSC multi-chassis synchronization */
+        if (is_early_uv_system())
+                return;
         if (!determine_cpu_tsc_frequencies(true))
                 return;
         loops_per_jiffy = get_loops_per_jiffy();