diff mbox series

[lunar:linux-kvm] Revert "UBUNTU: SAUCE: smpboot: reuse timer calibration"

Message ID 20230208111412.563844-1-dimitri.ledkov@canonical.com
State New
Headers show
Series [lunar:linux-kvm] Revert "UBUNTU: SAUCE: smpboot: reuse timer calibration" | expand

Commit Message

Dimitri John Ledkov Feb. 8, 2023, 11:14 a.m. UTC 
This reverts commit a62181adbd983660dd7ef65e813f055fee219c94.

This code change is unused. On v5.4+ kernels with recent qemu the
timer calibration is skipped as kvmclock provides a preset value
instead.

  kernel: Calibrating delay loop (skipped) preset value.. 3379.20 BogoMIPS (lpj=6758400)

Please dorp this patch in a rebase.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 arch/x86/kernel/tsc.c | 3 ---
 1 file changed, 3 deletions(-)
diff mbox series

Patch

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 66430d05cc..169dc4d715 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -1571,9 +1571,6 @@  unsigned long calibrate_delay_is_known(void)
 	if (!constant_tsc || !mask)
 		return 0;
 
-	if (cpu != 0)
-		return cpu_data(0).loops_per_jiffy;
-
 	sibling = cpumask_any_but(mask, cpu);
 	if (sibling < nr_cpu_ids)
 		return cpu_data(sibling).loops_per_jiffy;