kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powerpc: Fixup whitespace in xmon

Browse source 
There are a few whitespace goolies in xmon.c, some of them appear to
be my fault. Fix them all in one go.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Ellerman 2012-08-23 22:09:13 +00:00 committed by Benjamin Herrenschmidt
parent ca5dd3954a
commit e3bc8049e5
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
arch/powerpc/xmon/xmon.c
View file

@ -895,13 +895,13 @@ cmds(struct pt_regs *excp)
#endif
default:
printf("Unrecognized command: ");
do {
do {
if (' ' < cmd && cmd <= '~')
putchar(cmd);
else
printf("\\x%x", cmd);
cmd = inchar();
} while (cmd != '\n');
} while (cmd != '\n');
printf(" (type ? for help)\n");
break;
}
@ -1098,7 +1098,7 @@ static long check_bp_loc(unsigned long addr)
return 1;
}
static char *breakpoint_help_string =
static char *breakpoint_help_string =
"Breakpoint command usage:\n"
"b show breakpoints\n"
"b <addr> [cnt] set breakpoint at given instr addr\n"
@ -1194,7 +1194,7 @@ bpt_cmds(void)
default:
termch = cmd;
cmd = skipbl();
cmd = skipbl();
if (cmd == '?') {
printf(breakpoint_help_string);
break;
@ -1360,7 +1360,7 @@ static void xmon_show_stack(unsigned long sp, unsigned long lr,
sp + REGS_OFFSET);
break;
}
printf("--- Exception: %lx %s at ", regs.trap,
printf("--- Exception: %lx %s at ", regs.trap,
getvecname(TRAP(&regs)));
pc = regs.nip;
lr = regs.link;
@ -1624,14 +1624,14 @@ static void super_regs(void)
cmd = skipbl();
if (cmd == '\n') {
unsigned long sp, toc;
unsigned long sp, toc;
asm("mr %0,1" : "=r" (sp) :);
asm("mr %0,2" : "=r" (toc) :);
printf("msr = "REG" sprg0= "REG"\n",
mfmsr(), mfspr(SPRN_SPRG0));
printf("pvr = "REG" sprg1= "REG"\n",
mfspr(SPRN_PVR), mfspr(SPRN_SPRG1));
mfspr(SPRN_PVR), mfspr(SPRN_SPRG1));
printf("dec = "REG" sprg2= "REG"\n",
mfspr(SPRN_DEC), mfspr(SPRN_SPRG2));
printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3));
@ -1784,7 +1784,7 @@ byterev(unsigned char *val, int size)
static int brev;
static int mnoread;
static char *memex_help_string =
static char *memex_help_string =
"Memory examine command usage:\n"
"m [addr] [flags] examine/change memory\n"
" addr is optional. will start where left off.\n"
@ -1799,7 +1799,7 @@ static char *memex_help_string =
"NOTE: flags are saved as defaults\n"
"";
static char *memex_subcmd_help_string =
static char *memex_subcmd_help_string =
"Memory examine subcommands:\n"
" hexval write this val to current location\n"
" 'string' write chars from string to this location\n"
@ -2065,7 +2065,7 @@ prdump(unsigned long adrs, long ndump)
nr = mread(adrs, temp, r);
adrs += nr;
for (m = 0; m < r; ++m) {
if ((m & (sizeof(long) - 1)) == 0 && m > 0)
if ((m & (sizeof(long) - 1)) == 0 && m > 0)
putchar(' ');
if (m < nr)
printf("%.2x", temp[m]);
@ -2073,7 +2073,7 @@ prdump(unsigned long adrs, long ndump)
printf("%s", fault_chars[fault_type]);
}
for (; m < 16; ++m) {
if ((m & (sizeof(long) - 1)) == 0)
if ((m & (sizeof(long) - 1)) == 0)
putchar(' ');
printf(" ");
}
@ -2153,13 +2153,13 @@ dump_log_buf(void)
unsigned char buf[128];
size_t len;
if (setjmp(bus_error_jmp) != 0) {
if (setjmp(bus_error_jmp) != 0) {
printf("Error dumping printk buffer!\n");
return;
}
return;
}
catch_memory_errors = 1;
sync();
catch_memory_errors = 1;
sync();
kmsg_dump_rewind_nolock(&dumper);
while (kmsg_dump_get_line_nolock(&dumper, false, buf, sizeof(buf), &len)) {
@ -2167,10 +2167,10 @@ dump_log_buf(void)
printf("%s", buf);
}
sync();
/* wait a little while to see if we get a machine check */
__delay(200);
catch_memory_errors = 0;
sync();
/* wait a little while to see if we get a machine check */
__delay(200);
catch_memory_errors = 0;
}
/*