aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/xmon
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-08-13 15:59:06 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-08-13 15:59:06 +1000
commitb3124ec2f9970c7374d34b00843d9791fca66afc (patch)
treeae23bfb84d1bf196f7270bc438472d5329aeee92 /arch/powerpc/xmon
parentpowerpc/uaccess: Enable get_user(u64, *p) on 32-bit (diff)
parentpowerpc/64s/radix: Fix missing global invalidations when removing copro (diff)
downloadlinux-dev-b3124ec2f9970c7374d34b00843d9791fca66afc.tar.xz
linux-dev-b3124ec2f9970c7374d34b00843d9791fca66afc.zip
Merge branch 'fixes' into next
Merge our fixes branch from the 4.18 cycle to resolve some minor conflicts.
Diffstat (limited to 'arch/powerpc/xmon')
-rw-r--r--arch/powerpc/xmon/xmon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 7c4aa5b00302..4264aedc7775 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2735,7 +2735,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
{
int nr, dotted;
unsigned long first_adr;
- unsigned long inst, last_inst = 0;
+ unsigned int inst, last_inst = 0;
unsigned char val[4];
dotted = 0;
@@ -2759,7 +2759,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
dotted = 0;
last_inst = inst;
if (praddr)
- printf(REG" %.8lx", adr, inst);
+ printf(REG" %.8x", adr, inst);
printf("\t");
dump_func(inst, adr);
printf("\n");