---

yaml --- r: 120810 b: refs/heads/master c: 8652cb4 h: refs/heads/master v: v3
git-mirror · Nov 12, 2008 · 635b06b · 635b06b
1 parent 1e1f269
commit 635b06b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cf87efbc7a3676e0ad7c9622ec6aec244a593bc
+refs/heads/master: 8652cb4b0d87accbe78725fd2a13be2787059649
diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/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);