Rename the ppc32_pmu_type enum to powerpc_pmu_type, since we'll be using that
with all of the powerpc models. Also rename the enum values to better match
the naming scheme used in i386 and x86-64.
Signed-off-by: Kevin Corry <[EMAIL PROTECTED]>
Signed-off-by: Carl Love <[EMAIL PROTECTED]>
Index: linux-2.6.20-arnd3-perfmon/arch/powerpc/perfmon/perfmon_ppc32.c
===================================================================
--- linux-2.6.20-arnd3-perfmon.orig/arch/powerpc/perfmon/perfmon_ppc32.c
+++ linux-2.6.20-arnd3-perfmon/arch/powerpc/perfmon/perfmon_ppc32.c
@@ -34,7 +34,7 @@ MODULE_DESCRIPTION("PPC32 PMU descriptio
MODULE_LICENSE("GPL");
struct pfm_arch_pmu_info pfm_ppc32_pmu_info = {
- .pmu_style = PM_NONE,
+ .pmu_style = PFM_POWERPC_PMU_NONE,
};
static struct pfm_pmu_config pfm_ppc32_pmu_conf;
@@ -97,27 +97,27 @@ static int pfm_ppc32_probe_pmu(void)
switch (PVR_VER(pvr)) {
case 0x0004: /* 604 */
str = "PPC604";
- pm_type = PM_604;
+ pm_type = PFM_POWERPC_PMU_604;
nmmcr = 1;
npmds = 2;
break;
case 0x0009: /* 604e; */
case 0x000A: /* 604ev */
str = "PPC604e";
- pm_type = PM_604e;
+ pm_type = PFM_POWERPC_PMU_604e;
nmmcr = 2;
npmds = 4;
break;
case 0x0008: /* 750/740 */
str = "PPC750";
- pm_type = PM_750;
+ pm_type = PFM_POWERPC_PMU_750;
nmmcr = 2;
npmds = 4;
break;
case 0x7000: /* 750FX */
case 0x7001:
str = "PPC750";
- pm_type = PM_750;
+ pm_type = PFM_POWERPC_PMU_750;
nmmcr = 2;
npmds = 4;
if ((pvr & 0xFF0F) >= 0x0203)
@@ -125,19 +125,19 @@ static int pfm_ppc32_probe_pmu(void)
break;
case 0x7002: /* 750GX */
str = "PPC750";
- pm_type = PM_750;
+ pm_type = PFM_POWERPC_PMU_750;
nmmcr = 2;
npmds = 4;
intsok = 1;
case 0x000C: /* 7400 */
str = "PPC7400";
- pm_type = PM_7400;
+ pm_type = PFM_POWERPC_PMU_7400;
nmmcr = 3;
npmds = 4;
break;
case 0x800C: /* 7410 */
str = "PPC7410";
- pm_type = PM_7400;
+ pm_type = PFM_POWERPC_PMU_7400;
nmmcr = 3;
npmds = 4;
if ((pvr & 0xFFFF) >= 0x01103)
@@ -149,7 +149,7 @@ static int pfm_ppc32_probe_pmu(void)
case 0x8003: /* 7447A */
case 0x8004: /* 7448 */
str = "PPC7450";
- pm_type = PM_7450;
+ pm_type = PFM_POWERPC_PMU_7450;
nmmcr = 3; npmds = 6;
intsok = 1;
break;
Index: linux-2.6.20-arnd3-perfmon/include/asm-powerpc/perfmon.h
===================================================================
--- linux-2.6.20-arnd3-perfmon.orig/include/asm-powerpc/perfmon.h
+++ linux-2.6.20-arnd3-perfmon/include/asm-powerpc/perfmon.h
@@ -31,17 +31,18 @@
#include <asm/pmc.h>
-enum ppc32_pmu_type {
- PM_NONE,
- PM_604,
- PM_604e,
- PM_750, /* XXX: Minor event set diffs between IBM and Moto. */
- PM_7400,
- PM_7450,
+enum powerpc_pmu_type {
+ PFM_POWERPC_PMU_NONE,
+ PFM_POWERPC_PMU_604,
+ PFM_POWERPC_PMU_604e,
+ PFM_POWERPC_PMU_750, /* XXX: Minor event set diffs between IBM and
Moto. */
+ PFM_POWERPC_PMU_7400,
+ PFM_POWERPC_PMU_7450,
+ PFM_POWERPC_PMU_POWER5,
};
struct pfm_arch_pmu_info {
- enum ppc32_pmu_type pmu_style;
+ enum powerpc_pmu_type pmu_style;
};
#ifdef CONFIG_PPC32
_______________________________________________
perfmon mailing list
[email protected]
http://www.hpl.hp.com/hosted/linux/mail-archives/perfmon/
