From 53bd29c265f4cb339cc9e8190feb9776f6918ac8 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 27 Dec 2011 11:27:32 +0100 Subject: [PATCH] --- yaml --- r: 280640 b: refs/heads/master c: 2fa1d4fce599809e6bd7d95756709a5faef30710 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/dis.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d31bb06e74c2..f6d33b546ddc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02834eece0786b6e9c77029f0bfb597052a2e86f +refs/heads/master: 2fa1d4fce599809e6bd7d95756709a5faef30710 diff --git a/trunk/arch/s390/kernel/dis.c b/trunk/arch/s390/kernel/dis.c index 45df6d456aa1..e2f847599c8e 100644 --- a/trunk/arch/s390/kernel/dis.c +++ b/trunk/arch/s390/kernel/dis.c @@ -1578,10 +1578,15 @@ void show_code(struct pt_regs *regs) ptr += sprintf(ptr, "%s Code:", mode); hops = 0; while (start < end && hops < 8) { - *ptr++ = (start == 32) ? '>' : ' '; + opsize = insn_length(code[start]); + if (start + opsize == 32) + *ptr++ = '#'; + else if (start == 32) + *ptr++ = '>'; + else + *ptr++ = ' '; addr = regs->psw.addr + start - 32; ptr += sprintf(ptr, ONELONG, addr); - opsize = insn_length(code[start]); if (start + opsize >= end) break; for (i = 0; i < opsize; i++)