diff options
Diffstat (limited to 'arch/x86/kernel/tsc_sync.c')
-rw-r--r-- | arch/x86/kernel/tsc_sync.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index 4334033658..1123ef3ccf 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c @@ -193,9 +193,11 @@ bool tsc_store_and_check_tsc_adjust(bool bootcpu) cur->warned = false; /* - * The default adjust value cannot be assumed to be zero on any socket. + * If a non-zero TSC value for socket 0 may be valid then the default + * adjusted value cannot assumed to be zero either. */ - cur->adjusted = bootval; + if (tsc_async_resets) + cur->adjusted = bootval; /* * Check whether this CPU is the first in a package to come up. In |