lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: unify timex.h variants

Browse Source 
Combine the timex.h variants and move the TSC related code into tsc.h.
Move the set_cyc2ns_scale() call into the tsc calibraction code, where
it belongs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
This commit is contained in:
Thomas Gleixner
2007-10-12 23:04:23 +02:00
committed by Thomas Gleixner
parent 5d5a2989b7
commit 2f0798a3b1
6 changed files with 24 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/time_64.c
View File

@ -328,7 +328,6 @@ void __init time_init(void)
else
vgetcpu_mode = VGETCPU_LSL;
set_cyc2ns_scale(tsc_khz);
printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n",
cpu_khz / 1000, cpu_khz % 1000);
init_tsc_clocksource();

3
arch/x86/kernel/tsc_64.c
View File

@ -20,7 +20,7 @@ EXPORT_SYMBOL(tsc_khz);
static unsigned int cyc2ns_scale __read_mostly;
void set_cyc2ns_scale(unsigned long khz)
static inline void set_cyc2ns_scale(unsigned long khz)
{
cyc2ns_scale = (NSEC_PER_MSEC << NS_SCALE) / khz;
}
@ -206,6 +206,7 @@ void __init tsc_calibrate(void)
}
tsc_khz = tsc2 / tsc1;
set_cyc2ns_scale(tsc_khz);
}
/*