aboutsummaryrefslogtreecommitdiff
path: root/arch/s390/kernel/dis.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2012-01-13 23:59:13 -0600
committerSteve French <sfrench@us.ibm.com>2012-01-13 23:59:13 -0600
commitdcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch)
tree5e79741f1865a3aef840e68d7db9e7ed4d685b5a /arch/s390/kernel/dis.c
parentaaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff)
parent7250170c9ed00f3b74b11b98afefab45020672dd (diff)
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'arch/s390/kernel/dis.c')
-rw-r--r--arch/s390/kernel/dis.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 45df6d456aa1..e2f847599c8e 100644
--- a/arch/s390/kernel/dis.c
+++ b/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++)