Skip to content

Commit

Permalink
[POWERPC] Fix typo: MMCR0_PMA0 != MMCR0_PMAO
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Blanchard authored and Paul Mackerras committed May 22, 2007
1 parent 2fae498 commit 177e9ea
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/powerpc/kernel/pmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 177e9ea

Please sign in to comment.