---

yaml --- r: 147402 b: refs/heads/master c: ef7b3e0 h: refs/heads/master v: v3
git-mirror · Apr 29, 2009 · 7cc96d1 · 7cc96d1
1 parent 4c94956
commit 7cc96d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c619b8ffb1cec6a431687a35695dc6fd292a79e6
+refs/heads/master: ef7b3e09ffdcd5200aea9523f6b56d331d1c4fc0
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -542,7 +542,7 @@ fixed_mode_idx(struct perf_counter *counter, struct hw_perf_counter *hwc)
 {
 	unsigned int event;
 
-	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+	if (!x86_pmu.num_counters_fixed)
 		return -1;
 
 	if (unlikely(hwc->nmi))