diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:29 -0400 |
| commit | adf6d34e460387ee3e8f1e1875d52bff51212c7d (patch) | |
| tree | 88ef100143e6184103a608f82dfd232bf6376eaf /arch/x86/kernel/tsc_32.c | |
| parent | d1964dab60ce7c104dd21590e987a8787db18051 (diff) | |
| parent | 3760d31f11bfbd0ead9eaeb8573e0602437a9d7c (diff) | |
Merge branch 'omap2-upstream' into devel
Diffstat (limited to 'arch/x86/kernel/tsc_32.c')
| -rw-r--r-- | arch/x86/kernel/tsc_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index f14cfd9d1f9..c2241e04ea5 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
| @@ -256,9 +256,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data) | |||
| 256 | ref_freq, freq->new); | 256 | ref_freq, freq->new); |
| 257 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { | 257 | if (!(freq->flags & CPUFREQ_CONST_LOOPS)) { |
| 258 | tsc_khz = cpu_khz; | 258 | tsc_khz = cpu_khz; |
| 259 | preempt_disable(); | 259 | set_cyc2ns_scale(cpu_khz, freq->cpu); |
| 260 | set_cyc2ns_scale(cpu_khz, smp_processor_id()); | ||
| 261 | preempt_enable(); | ||
| 262 | /* | 260 | /* |
| 263 | * TSC based sched_clock turns | 261 | * TSC based sched_clock turns |
| 264 | * to junk w/ cpufreq | 262 | * to junk w/ cpufreq |