git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
tsc_64.c
diff --git
a/arch/x86/kernel/tsc_64.c
b/arch/x86/kernel/tsc_64.c
index 947554ddabb6c7779f9e9adedfc07d7891dba283..d3bebaaad842da20ce9165083825b482333ad088 100644
(file)
--- a/
arch/x86/kernel/tsc_64.c
+++ b/
arch/x86/kernel/tsc_64.c
@@
-148,9
+148,7
@@
static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
mark_tsc_unstable("cpufreq changes");
}
- preempt_disable();
- set_cyc2ns_scale(tsc_khz_ref, smp_processor_id());
- preempt_enable();
+ set_cyc2ns_scale(tsc_khz_ref, freq->cpu);
return 0;
}