summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-09-27 21:45:35 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-28 07:46:41 -0700
commitf4208b9a9538baabad197276076bc1d4f52d42b9 (patch)
treea13d24a36d77d948c47b8f948cd426aa84da42ff /arch/ppc
parentf36462f078403c1859a7e58177b28e01b3a179e4 (diff)
downloadblackbird-op-linux-f4208b9a9538baabad197276076bc1d4f52d42b9.tar.gz
blackbird-op-linux-f4208b9a9538baabad197276076bc1d4f52d42b9.zip
[PATCH] ppc: fix stupid thinko in oprofile fix
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>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/kernel/perfmon.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/kernel/perfmon.c b/arch/ppc/kernel/perfmon.c
index 04c18788e85f..22df9a596a0f 100644
--- a/arch/ppc/kernel/perfmon.c
+++ b/arch/ppc/kernel/perfmon.c
@@ -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);
OpenPOWER on IntegriCloud