summaryrefslogtreecommitdiffstats
path: root/arch/ppc/xmon
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-11-07 16:43:44 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-08 11:19:48 +1100
commit7b007de8a90604000329154e87d269db3427d099 (patch)
tree637842a469abd622af00f1032d295dc62400dba6 /arch/ppc/xmon
parent21fe3301f11a93c4f18e8480ed08522559bf0a50 (diff)
downloadop-kernel-dev-7b007de8a90604000329154e87d269db3427d099.zip
op-kernel-dev-7b007de8a90604000329154e87d269db3427d099.tar.gz
[PATCH] ppc: Fix ARCH=ppc build with xmon
xmon() prototype is inconsistent between ARCH=ppc and ARCH=powerpc, thus causing ARCH=ppc build breakage. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc/xmon')
-rw-r--r--arch/ppc/xmon/xmon.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c
index 66bfaa3..2b483b4 100644
--- a/arch/ppc/xmon/xmon.c
+++ b/arch/ppc/xmon/xmon.c
@@ -220,8 +220,7 @@ static void get_tb(unsigned *p)
p[1] = lo;
}
-void
-xmon(struct pt_regs *excp)
+int xmon(struct pt_regs *excp)
{
struct pt_regs regs;
int msr, cmd;
@@ -290,6 +289,8 @@ xmon(struct pt_regs *excp)
#endif /* CONFIG_SMP */
set_msr(msr); /* restore interrupt enable */
get_tb(start_tb[smp_processor_id()]);
+
+ return cmd != 'X';
}
irqreturn_t
OpenPOWER on IntegriCloud