diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /arch/i386/kernel/timers/timer_tsc.c | |
| parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
| parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) | |
Pull pnpacpi into acpica branch
Diffstat (limited to 'arch/i386/kernel/timers/timer_tsc.c')
| -rw-r--r-- | arch/i386/kernel/timers/timer_tsc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c index d395e3b42485..47675bbbb316 100644 --- a/arch/i386/kernel/timers/timer_tsc.c +++ b/arch/i386/kernel/timers/timer_tsc.c | |||
| @@ -330,7 +330,9 @@ int recalibrate_cpu_khz(void) | |||
| 330 | unsigned int cpu_khz_old = cpu_khz; | 330 | unsigned int cpu_khz_old = cpu_khz; |
| 331 | 331 | ||
| 332 | if (cpu_has_tsc) { | 332 | if (cpu_has_tsc) { |
| 333 | local_irq_disable(); | ||
| 333 | init_cpu_khz(); | 334 | init_cpu_khz(); |
| 335 | local_irq_enable(); | ||
| 334 | cpu_data[0].loops_per_jiffy = | 336 | cpu_data[0].loops_per_jiffy = |
| 335 | cpufreq_scale(cpu_data[0].loops_per_jiffy, | 337 | cpufreq_scale(cpu_data[0].loops_per_jiffy, |
| 336 | cpu_khz_old, | 338 | cpu_khz_old, |