From 969d891190f3d95b2f7108c0e2c8c4082f4c9e1c Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 28 May 2004 20:56:25 -0700 Subject: [PATCH] [PATCH] ppc64: xmon fixes From: Anton Blanchard A few xmon fixes: - Check we have the set-indicator property before calling rtas. - We were printing a cpu number in one place with %s, fix. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc64/xmon/xmon.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c index a35b39d915ead..7a195cdd76eff 100644 --- a/arch/ppc64/xmon/xmon.c +++ b/arch/ppc64/xmon/xmon.c @@ -267,6 +267,8 @@ static inline void disable_surveillance(void) * real possibility of deadlock. */ args.token = rtas_token("set-indicator"); + if (args.token == RTAS_UNKNOWN_SERVICE) + return; args.nargs = 3; args.nret = 1; args.rets = &args.args[3]; @@ -343,7 +345,7 @@ int xmon_core(struct pt_regs *regs, int fromipi) if (cpu_isset(cpu, cpus_in_xmon)) { get_output_lock(); excprint(regs); - printf("cpu 0x%s: Exception %lx %s in xmon, " + printf("cpu 0x%x: Exception %lx %s in xmon, " "returning to main loop\n", cpu, regs->trap, getvecname(TRAP(regs))); longjmp(xmon_fault_jmp[cpu], 1); -- 2.53.0