Merge branch 'perf/x86' into perf/core

Merge reason: The new P4 driver is stable and ready now for more testing. Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · Mar 12, 2010 · 0308635 · 0308635
2 parents 3997d37 + 0b86122
commit 0308635
Show file tree

Hide file tree

Showing 7 changed files with 1,361 additions and 23 deletions.
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
@@ -5,7 +5,7 @@
  * Performance event hw details:
  */
 
-#define X86_PMC_MAX_GENERIC					8
+#define X86_PMC_MAX_GENERIC				       32
 #define X86_PMC_MAX_FIXED					3
 
 #define X86_PMC_IDX_GENERIC				        0