diff options
Diffstat (limited to 'arch/x86/kernel/tsc_32.c')
-rw-r--r-- | arch/x86/kernel/tsc_32.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index e87a3939ed40..d78444c788a3 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
@@ -59,7 +59,7 @@ int check_tsc_unstable(void) | |||
59 | } | 59 | } |
60 | EXPORT_SYMBOL_GPL(check_tsc_unstable); | 60 | EXPORT_SYMBOL_GPL(check_tsc_unstable); |
61 | 61 | ||
62 | /* Accellerators for sched_clock() | 62 | /* Accelerators for sched_clock() |
63 | * convert from cycles(64bits) => nanoseconds (64bits) | 63 | * convert from cycles(64bits) => nanoseconds (64bits) |
64 | * basic equation: | 64 | * basic equation: |
65 | * ns = cycles / (freq / ns_per_sec) | 65 | * ns = cycles / (freq / ns_per_sec) |
@@ -74,7 +74,7 @@ EXPORT_SYMBOL_GPL(check_tsc_unstable); | |||
74 | * And since SC is a constant power of two, we can convert the div | 74 | * And since SC is a constant power of two, we can convert the div |
75 | * into a shift. | 75 | * into a shift. |
76 | * | 76 | * |
77 | * We can use khz divisor instead of mhz to keep a better percision, since | 77 | * We can use khz divisor instead of mhz to keep a better precision, since |
78 | * cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits. | 78 | * cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits. |
79 | * (mathieu.desnoyers@polymtl.ca) | 79 | * (mathieu.desnoyers@polymtl.ca) |
80 | * | 80 | * |
@@ -181,8 +181,8 @@ int recalibrate_cpu_khz(void) | |||
181 | if (cpu_has_tsc) { | 181 | if (cpu_has_tsc) { |
182 | cpu_khz = calculate_cpu_khz(); | 182 | cpu_khz = calculate_cpu_khz(); |
183 | tsc_khz = cpu_khz; | 183 | tsc_khz = cpu_khz; |
184 | cpu_data[0].loops_per_jiffy = | 184 | cpu_data(0).loops_per_jiffy = |
185 | cpufreq_scale(cpu_data[0].loops_per_jiffy, | 185 | cpufreq_scale(cpu_data(0).loops_per_jiffy, |
186 | cpu_khz_old, cpu_khz); | 186 | cpu_khz_old, cpu_khz); |
187 | return 0; | 187 | return 0; |
188 | } else | 188 | } else |
@@ -215,7 +215,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data) | |||
215 | return 0; | 215 | return 0; |
216 | } | 216 | } |
217 | ref_freq = freq->old; | 217 | ref_freq = freq->old; |
218 | loops_per_jiffy_ref = cpu_data[freq->cpu].loops_per_jiffy; | 218 | loops_per_jiffy_ref = cpu_data(freq->cpu).loops_per_jiffy; |
219 | cpu_khz_ref = cpu_khz; | 219 | cpu_khz_ref = cpu_khz; |
220 | } | 220 | } |
221 | 221 | ||
@@ -223,7 +223,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data) | |||
223 | (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || | 223 | (val == CPUFREQ_POSTCHANGE && freq->old > freq->new) || |
224 | (val == CPUFREQ_RESUMECHANGE)) { | 224 | (val == CPUFREQ_RESUMECHANGE)) { |
225 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) | 225 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) |
226 | cpu_data[freq->cpu].loops_per_jiffy = | 226 | cpu_data(freq->cpu).loops_per_jiffy = |
227 | cpufreq_scale(loops_per_jiffy_ref, | 227 | cpufreq_scale(loops_per_jiffy_ref, |
228 | ref_freq, freq->new); | 228 | ref_freq, freq->new); |
229 | 229 | ||