[PATCH] ppc64: xmon fixes

From: Anton Blanchard <anton@samba.org>

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 <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c
index a35b39d915ead4299237d4f4492a5a2d3c0a78e8..7a195cdd76effd245400d432a7014df41deb1553 100644 (file)
--- 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);