Skip to content

Commit

Permalink
[PATCH] ppc: fix stupid thinko in oprofile fix
Browse files Browse the repository at this point in the history
I did something stupid in my oprofile fix, here's the obvious fix:

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Sep 28, 2005
1 parent f36462f commit f4208b9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/ppc/kernel/perfmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ static void dummy_perf(struct pt_regs *regs)
mtpmr(PMRN_PMGC0, pmgc0);
}

#elif CONFIG_6xx
#elif defined(CONFIG_6xx)
/* Ensure exceptions are disabled */

static void dummy_perf(struct pt_regs *regs)
{
unsigned int mmcr0 = mfspr(SPRN_MMCR0);
Expand Down

0 comments on commit f4208b9

Please sign in to comment.