xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes' into next

Browse Source 
Merge our fixes branch from the 4.18 cycle to resolve some minor
conflicts.
This commit is contained in:
Michael Ellerman
2018-08-13 15:59:06 +10:00
parent f7a6947cd4 cca19f0b68
commit b3124ec2f9
8 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/xmon/xmon.c
View File

@@ -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");