diff options
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 9faf91ae1841..ce8e50239332 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
| @@ -751,7 +751,6 @@ static struct clocksource clocksource_tsc = { | |||
| 751 | .read = read_tsc, | 751 | .read = read_tsc, |
| 752 | .resume = resume_tsc, | 752 | .resume = resume_tsc, |
| 753 | .mask = CLOCKSOURCE_MASK(64), | 753 | .mask = CLOCKSOURCE_MASK(64), |
| 754 | .shift = 22, | ||
| 755 | .flags = CLOCK_SOURCE_IS_CONTINUOUS | | 754 | .flags = CLOCK_SOURCE_IS_CONTINUOUS | |
| 756 | CLOCK_SOURCE_MUST_VERIFY, | 755 | CLOCK_SOURCE_MUST_VERIFY, |
| 757 | #ifdef CONFIG_X86_64 | 756 | #ifdef CONFIG_X86_64 |
| @@ -845,8 +844,6 @@ __cpuinit int unsynchronized_tsc(void) | |||
| 845 | 844 | ||
| 846 | static void __init init_tsc_clocksource(void) | 845 | static void __init init_tsc_clocksource(void) |
| 847 | { | 846 | { |
| 848 | clocksource_tsc.mult = clocksource_khz2mult(tsc_khz, | ||
| 849 | clocksource_tsc.shift); | ||
| 850 | if (tsc_clocksource_reliable) | 847 | if (tsc_clocksource_reliable) |
| 851 | clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; | 848 | clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY; |
| 852 | /* lower the rating if we already know its unstable: */ | 849 | /* lower the rating if we already know its unstable: */ |
| @@ -854,7 +851,7 @@ static void __init init_tsc_clocksource(void) | |||
| 854 | clocksource_tsc.rating = 0; | 851 | clocksource_tsc.rating = 0; |
| 855 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; | 852 | clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS; |
| 856 | } | 853 | } |
| 857 | clocksource_register(&clocksource_tsc); | 854 | clocksource_register_khz(&clocksource_tsc, tsc_khz); |
| 858 | } | 855 | } |
| 859 | 856 | ||
| 860 | #ifdef CONFIG_X86_64 | 857 | #ifdef CONFIG_X86_64 |
