---

yaml --- r: 191084 b: refs/heads/master c: a072738 h: refs/heads/master v: v3
git-mirror · Mar 11, 2010 · cb08a37 · cb08a37
1 parent 954bf9d
commit cb08a37
Show file tree

Hide file tree

Showing 51 changed files with 1,618 additions and 860 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3997d3776a6e89586e76a0ef355bfbbd8a76966c
+refs/heads/master: a072738e04f0eb26370e39ec679e9a0d65e49aea
diff --git a/trunk/arch/powerpc/kernel/perf_event.c b/trunk/arch/powerpc/kernel/perf_event.c
@@ -1298,7 +1298,7 @@ static void power_pmu_setup(int cpu)
 }
 
 static int __cpuinit
-power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
+power_pmu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (long)hcpu;
 

diff --git a/trunk/arch/x86/include/asm/perf_event.h b/trunk/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