]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
x86: merge tsc calibration
authorAlok Kataria <akataria@vmware.com>
Tue, 1 Jul 2008 18:43:24 +0000 (11:43 -0700)
committerIngo Molnar <mingo@elte.hu>
Wed, 9 Jul 2008 05:43:25 +0000 (07:43 +0200)
commitbfc0f5947afa5e3a13e55867f4478c8a92c11dca
treebb642adee69c7804eaafbb7fad66af61b4f9f56f
parent0ef95533326a7b37d16025af9edc0c18e644b346
x86: merge tsc calibration

Merge the tsc calibration code for the 32bit and 64bit kernel.
The paravirtualized calculate_cpu_khz for 64bit now points to the correct
tsc_calibrate code as in 32bit.
Original native_calculate_cpu_khz for 64 bit is now called as calibrate_cpu.

Also moved the recalibrate_cpu_khz function in the common file.
Note that this function is called only from powernow K7 cpu freq driver.

Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Dan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/time_64.c
arch/x86/kernel/tsc.c
arch/x86/kernel/tsc_32.c
arch/x86/kernel/tsc_64.c
include/asm-x86/hpet.h
include/asm-x86/tsc.h