---

yaml --- r: 155717 b: refs/heads/master c: f1c6a58 h: refs/heads/master i: 155715: 0e82333 v: v3
git-mirror · Jul 13, 2009 · 80af502 · 80af502
1 parent 30b2c77
commit 80af502
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3d7e183dc276df2fcaf02af173a49ad119ba9f9
+refs/heads/master: f1c6a58121f9846ac665b0fbd3cbab90ce8bcbac
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -1583,10 +1583,8 @@ static int p6_pmu_init(void)
 		break;
 	case 9:
 	case 13:
-		/* for Pentium M, we need to check if PMU exist */
-		rdmsr(MSR_IA32_MISC_ENABLE, low, high);
-		if (low & MSR_IA32_MISC_ENABLE_EMON)
-			break;
+		/* Pentium M */
+		break;
 	default:
 		pr_cont("unsupported p6 CPU model %d ",
 			boot_cpu_data.x86_model);