Messages in this thread Patch in this message | | | Subject | [PATCH] x86: Don't use tsc_khz to calculate lpj if notsc is passed. | From | Alok Kataria <> | Date | Mon, 03 Nov 2008 11:18:47 -0800 |
| |
x86: Don't use tsc_khz to calculate lpj if notsc is passed.
From: Alok N Kataria <akataria@vmware.com>
With notsc passed on commandline, tsc may not be used for udelays, make sure that we do not use tsc_khz to calculate the lpj value in such cases.
Signed-off-by: Alok N Kataria <akataria@vmware.com> Cc: stable@kernel.org
---
arch/x86/kernel/tsc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index ee01cd9..8904571 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -829,10 +829,6 @@ void __init tsc_init(void) cpu_khz = calibrate_cpu(); #endif - lpj = ((u64)tsc_khz * 1000); - do_div(lpj, HZ); - lpj_fine = lpj; - printk("Detected %lu.%03lu MHz processor.\n", (unsigned long)cpu_khz / 1000, (unsigned long)cpu_khz % 1000); @@ -852,6 +848,10 @@ void __init tsc_init(void) /* now allow native_sched_clock() to use rdtsc */ tsc_disabled = 0; + lpj = ((u64)tsc_khz * 1000); + do_div(lpj, HZ); + lpj_fine = lpj; + use_tsc_delay(); /* Check and install the TSC clocksource */ dmi_check_system(bad_tsc_dmi_table);
| |