From: Benjamin Herrenschmidt Date: Wed, 28 Sep 2005 04:45:35 +0000 (-0700) Subject: [PATCH] ppc: fix stupid thinko in oprofile fix X-Git-Tag: v3.12-rc1~41375 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4208b9a9538baabad197276076bc1d4f52d42b9;p=kernel%2Fkernel-generic.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/ppc/kernel/perfmon.c b/arch/ppc/kernel/perfmon.c index 04c1878..22df9a5 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);