projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature', 'x86/crashdump', 'x86...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
time_64.c
diff --git
a/arch/x86/kernel/time_64.c
b/arch/x86/kernel/time_64.c
index 083a4a5bb00f0bfa84885a39093761272b826a38..1b7711b31037ed034ccf55defc306ab35bfc74ba 100644
(file)
--- a/
arch/x86/kernel/time_64.c
+++ b/
arch/x86/kernel/time_64.c
@@
-80,6
+80,8
@@
unsigned long __init calibrate_cpu(void)
break;
no_ctr_free = (i == 4);
if (no_ctr_free) {
+ WARN(1, KERN_WARNING "Warning: AMD perfctrs busy ... "
+ "cpu_khz value may be incorrect.\n");
i = 3;
rdmsrl(MSR_K7_EVNTSEL3, evntsel3);
wrmsrl(MSR_K7_EVNTSEL3, 0);