diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-07-13 17:56:27 -0700 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-07-27 12:40:55 +0200 |
commit | f12a15be63d1de9a35971f35f06b73088fa25c3a (patch) | |
tree | 444084a06e776f005d52d3214fb35b91b3a8345d /arch/x86/kernel/tsc.c | |
parent | 0fb86b06298b6cd3205cac2e68a499f269282dac (diff) | |
download | kernel_samsung_crespo-f12a15be63d1de9a35971f35f06b73088fa25c3a.zip kernel_samsung_crespo-f12a15be63d1de9a35971f35f06b73088fa25c3a.tar.gz kernel_samsung_crespo-f12a15be63d1de9a35971f35f06b73088fa25c3a.tar.bz2 |
x86: Convert common clocksources to use clocksource_register_hz/khz
This converts the most common of the x86 clocksources over to use
clocksource_register_hz/khz.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
LKML-Reference: <1279068988-21864-11-git-send-email-johnstul@us.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
-rw-r--r-- | arch/x86/kernel/tsc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 9faf91a..ce8e502 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -751,7 +751,6 @@ static struct clocksource clocksource_tsc = { .read = read_tsc, .resume = resume_tsc, .mask = CLOCKSOURCE_MASK(64), - .shift = 22, .flags = CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_MUST_VERIFY, #ifdef CONFIG_X86_64 @@ -845,8 +844,6 @@ __cpuinit int unsynchronized_tsc(void) static void __init init_tsc_clocksource(void) { - clocksource_tsc.mult = clocksource_khz2mult(tsc_khz, - clocksource_tsc.shift); if (tsc_clocksource_reliable) clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; /* lower the rating if we already know its unstable: */ @@ -854,7 +851,7 @@ static void __init init_tsc_clocksource(void) clocksource_tsc.rating = 0; clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; } - clocksource_register(&clocksource_tsc); + clocksource_register_khz(&clocksource_tsc, tsc_khz); } #ifdef CONFIG_X86_64 |