diff options
| author | Anton Blanchard <anton@samba.org> | 2007-05-20 03:13:43 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-22 20:20:56 +1000 |
| commit | 177e9ea49deea238f59bb0b1708cfc60b75828fb (patch) | |
| tree | d68fd2dc71f49712edb72616ec93aec0c7906377 | |
| parent | 2fae4985a135ca5d7d9bba17d45d674c099621b4 (diff) | |
[POWERPC] Fix typo: MMCR0_PMA0 != MMCR0_PMAO
pmc.c has:
#ifndef MMCR0_PMA0
#define MMCR0_PMA0 0
This one took a while to find. Unfortunately its the wrong define
(number 0 vs letter O). Its probably worth removing this override, since
if our includes get screwed up we will have the same (hard to debug)
failure.
Fix it simply for now, so that we can backport to stable.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/pmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/pmc.c b/arch/powerpc/kernel/pmc.c index 24d7b7c99bb..ea04e0ab3f2 100644 --- a/arch/powerpc/kernel/pmc.c +++ b/arch/powerpc/kernel/pmc.c @@ -20,8 +20,8 @@ #include <asm/cputable.h> #include <asm/pmc.h> -#ifndef MMCR0_PMA0 -#define MMCR0_PMA0 0 +#ifndef MMCR0_PMAO +#define MMCR0_PMAO 0 #endif static void dummy_perf(struct pt_regs *regs) @@ -30,7 +30,7 @@ static void dummy_perf(struct pt_regs *regs) mtpmr(PMRN_PMGC0, mfpmr(PMRN_PMGC0) & ~PMGC0_PMIE); #elif defined(CONFIG_PPC64) || defined(CONFIG_6xx) if (cur_cpu_spec->pmc_type == PPC_PMC_IBM) - mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~(MMCR0_PMXE|MMCR0_PMA0)); + mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~(MMCR0_PMXE|MMCR0_PMAO)); #else mtspr(SPRN_MMCR0, mfspr(SPRN_MMCR0) & ~MMCR0_PMXE); #endif |