diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-05-01 19:51:23 +0200 |
| commit | 3bbfa480a1150aa039a2bb8fc9a0ae8d1c6cce03 (patch) | |
| tree | 5bd040f9f5aac0f4c252ec1373a757e364d4f328 | |
| parent | 3c536666a8f8cd51c7a29f4a51e181b63dc3cd87 (diff) | |
| parent | 455f9075f14484f358b3c1d6845b4a438de198a7 (diff) | |
| download | tip-3bbfa480a1150aa039a2bb8fc9a0ae8d1c6cce03.tar.gz | |
Merge branch into tip/master: 'x86/timers'
Notice: this object is not reachable from any branch.
# New commits in x86/timers:
455f9075f144 ("x86/tsc: Trust initial offset in architectural TSC-adjust MSRs")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Notice: this object is not reachable from any branch.
| -rw-r--r-- | arch/x86/kernel/tsc_sync.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c index 1123ef3ccf901..4334033658edf 100644 --- a/arch/x86/kernel/tsc_sync.c +++ b/arch/x86/kernel/tsc_sync.c @@ -193,11 +193,9 @@ bool tsc_store_and_check_tsc_adjust(bool bootcpu) cur->warned = false; /* - * If a non-zero TSC value for socket 0 may be valid then the default - * adjusted value cannot assumed to be zero either. + * The default adjust value cannot be assumed to be zero on any socket. */ - if (tsc_async_resets) - cur->adjusted = bootval; + cur->adjusted = bootval; /* * Check whether this CPU is the first in a package to come up. In |