Merge branch 'master' of ssh+git://oss.sgi.com/oss/git/xfs/xfs

[pandora-kernel.git] / arch / powerpc / kernel / power5+-pmu.c

diff --git a/arch/powerpc/kernel/power5+-pmu.c b/arch/powerpc/kernel/power5+-pmu.c
index aef144d..31918af 100644 (file)
--- a/arch/powerpc/kernel/power5+-pmu.c
+++ b/arch/powerpc/kernel/power5+-pmu.c
@@ -10,7 +10,9 @@
  */
 #include <linux/kernel.h>
 #include <linux/perf_counter.h>
+#include <linux/string.h>
 #include <asm/reg.h>
+#include <asm/cputable.h>
 
 /*
  * Bits in event code for POWER5+ (POWER5 GS) and POWER5++ (POWER5 GS DD3)
@@ -657,7 +659,8 @@ static int power5p_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
        },
 };
 
-struct power_pmu power5p_pmu = {
+static struct power_pmu power5p_pmu = {
+       .name                   = "POWER5+/++",
        .n_counter              = 6,
        .max_alternatives       = MAX_ALT,
        .add_fields             = 0x7000000000055ul,
@@ -672,3 +675,15 @@ struct power_pmu power5p_pmu = {
        .generic_events         = power5p_generic_events,
        .cache_events           = &power5p_cache_events,
 };
+
+static int init_power5p_pmu(void)
+{
+       if (!cur_cpu_spec->oprofile_cpu_type ||
+           (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")
+            && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5++")))
+               return -ENODEV;
+
+       return register_power_pmu(&power5p_pmu);
+}
+
+arch_initcall(init_power5p_pmu);