diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2012-08-23 18:09:13 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-08-24 06:26:03 -0400 |
| commit | e3bc8049e524f13e09a58f5bad70b6738494277a (patch) | |
| tree | 7aa67c965467ca1850af22a69b397e65e96dc8ea | |
| parent | ca5dd3954a62dc14c2afff1c34b3b5d8dc74f777 (diff) | |
powerpc: Fixup whitespace in xmon
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>
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 013f28668781..9b49c65ee7a4 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -895,13 +895,13 @@ cmds(struct pt_regs *excp) | |||
| 895 | #endif | 895 | #endif |
| 896 | default: | 896 | default: |
| 897 | printf("Unrecognized command: "); | 897 | printf("Unrecognized command: "); |
| 898 | do { | 898 | do { |
| 899 | if (' ' < cmd && cmd <= '~') | 899 | if (' ' < cmd && cmd <= '~') |
| 900 | putchar(cmd); | 900 | putchar(cmd); |
| 901 | else | 901 | else |
| 902 | printf("\\x%x", cmd); | 902 | printf("\\x%x", cmd); |
| 903 | cmd = inchar(); | 903 | cmd = inchar(); |
| 904 | } while (cmd != '\n'); | 904 | } while (cmd != '\n'); |
| 905 | printf(" (type ? for help)\n"); | 905 | printf(" (type ? for help)\n"); |
| 906 | break; | 906 | break; |
| 907 | } | 907 | } |
| @@ -1098,7 +1098,7 @@ static long check_bp_loc(unsigned long addr) | |||
| 1098 | return 1; | 1098 | return 1; |
| 1099 | } | 1099 | } |
| 1100 | 1100 | ||
| 1101 | static char *breakpoint_help_string = | 1101 | static char *breakpoint_help_string = |
| 1102 | "Breakpoint command usage:\n" | 1102 | "Breakpoint command usage:\n" |
| 1103 | "b show breakpoints\n" | 1103 | "b show breakpoints\n" |
| 1104 | "b <addr> [cnt] set breakpoint at given instr addr\n" | 1104 | "b <addr> [cnt] set breakpoint at given instr addr\n" |
| @@ -1194,7 +1194,7 @@ bpt_cmds(void) | |||
| 1194 | 1194 | ||
| 1195 | default: | 1195 | default: |
| 1196 | termch = cmd; | 1196 | termch = cmd; |
| 1197 | cmd = skipbl(); | 1197 | cmd = skipbl(); |
| 1198 | if (cmd == '?') { | 1198 | if (cmd == '?') { |
| 1199 | printf(breakpoint_help_string); | 1199 | printf(breakpoint_help_string); |
| 1200 | break; | 1200 | break; |
| @@ -1360,7 +1360,7 @@ static void xmon_show_stack(unsigned long sp, unsigned long lr, | |||
| 1360 | sp + REGS_OFFSET); | 1360 | sp + REGS_OFFSET); |
| 1361 | break; | 1361 | break; |
| 1362 | } | 1362 | } |
| 1363 | printf("--- Exception: %lx %s at ", regs.trap, | 1363 | printf("--- Exception: %lx %s at ", regs.trap, |
| 1364 | getvecname(TRAP(®s))); | 1364 | getvecname(TRAP(®s))); |
| 1365 | pc = regs.nip; | 1365 | pc = regs.nip; |
| 1366 | lr = regs.link; | 1366 | lr = regs.link; |
| @@ -1624,14 +1624,14 @@ static void super_regs(void) | |||
| 1624 | 1624 | ||
| 1625 | cmd = skipbl(); | 1625 | cmd = skipbl(); |
| 1626 | if (cmd == '\n') { | 1626 | if (cmd == '\n') { |
| 1627 | unsigned long sp, toc; | 1627 | unsigned long sp, toc; |
| 1628 | asm("mr %0,1" : "=r" (sp) :); | 1628 | asm("mr %0,1" : "=r" (sp) :); |
| 1629 | asm("mr %0,2" : "=r" (toc) :); | 1629 | asm("mr %0,2" : "=r" (toc) :); |
| 1630 | 1630 | ||
| 1631 | printf("msr = "REG" sprg0= "REG"\n", | 1631 | printf("msr = "REG" sprg0= "REG"\n", |
| 1632 | mfmsr(), mfspr(SPRN_SPRG0)); | 1632 | mfmsr(), mfspr(SPRN_SPRG0)); |
| 1633 | printf("pvr = "REG" sprg1= "REG"\n", | 1633 | printf("pvr = "REG" sprg1= "REG"\n", |
| 1634 | mfspr(SPRN_PVR), mfspr(SPRN_SPRG1)); | 1634 | mfspr(SPRN_PVR), mfspr(SPRN_SPRG1)); |
| 1635 | printf("dec = "REG" sprg2= "REG"\n", | 1635 | printf("dec = "REG" sprg2= "REG"\n", |
| 1636 | mfspr(SPRN_DEC), mfspr(SPRN_SPRG2)); | 1636 | mfspr(SPRN_DEC), mfspr(SPRN_SPRG2)); |
| 1637 | printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3)); | 1637 | printf("sp = "REG" sprg3= "REG"\n", sp, mfspr(SPRN_SPRG3)); |
| @@ -1784,7 +1784,7 @@ byterev(unsigned char *val, int size) | |||
| 1784 | static int brev; | 1784 | static int brev; |
| 1785 | static int mnoread; | 1785 | static int mnoread; |
| 1786 | 1786 | ||
| 1787 | static char *memex_help_string = | 1787 | static char *memex_help_string = |
| 1788 | "Memory examine command usage:\n" | 1788 | "Memory examine command usage:\n" |
| 1789 | "m [addr] [flags] examine/change memory\n" | 1789 | "m [addr] [flags] examine/change memory\n" |
| 1790 | " addr is optional. will start where left off.\n" | 1790 | " addr is optional. will start where left off.\n" |
| @@ -1799,7 +1799,7 @@ static char *memex_help_string = | |||
| 1799 | "NOTE: flags are saved as defaults\n" | 1799 | "NOTE: flags are saved as defaults\n" |
| 1800 | ""; | 1800 | ""; |
| 1801 | 1801 | ||
| 1802 | static char *memex_subcmd_help_string = | 1802 | static char *memex_subcmd_help_string = |
| 1803 | "Memory examine subcommands:\n" | 1803 | "Memory examine subcommands:\n" |
| 1804 | " hexval write this val to current location\n" | 1804 | " hexval write this val to current location\n" |
| 1805 | " 'string' write chars from string to this location\n" | 1805 | " 'string' write chars from string to this location\n" |
| @@ -2065,7 +2065,7 @@ prdump(unsigned long adrs, long ndump) | |||
| 2065 | nr = mread(adrs, temp, r); | 2065 | nr = mread(adrs, temp, r); |
| 2066 | adrs += nr; | 2066 | adrs += nr; |
| 2067 | for (m = 0; m < r; ++m) { | 2067 | for (m = 0; m < r; ++m) { |
| 2068 | if ((m & (sizeof(long) - 1)) == 0 && m > 0) | 2068 | if ((m & (sizeof(long) - 1)) == 0 && m > 0) |
| 2069 | putchar(' '); | 2069 | putchar(' '); |
| 2070 | if (m < nr) | 2070 | if (m < nr) |
| 2071 | printf("%.2x", temp[m]); | 2071 | printf("%.2x", temp[m]); |
| @@ -2073,7 +2073,7 @@ prdump(unsigned long adrs, long ndump) | |||
| 2073 | printf("%s", fault_chars[fault_type]); | 2073 | printf("%s", fault_chars[fault_type]); |
| 2074 | } | 2074 | } |
| 2075 | for (; m < 16; ++m) { | 2075 | for (; m < 16; ++m) { |
| 2076 | if ((m & (sizeof(long) - 1)) == 0) | 2076 | if ((m & (sizeof(long) - 1)) == 0) |
| 2077 | putchar(' '); | 2077 | putchar(' '); |
| 2078 | printf(" "); | 2078 | printf(" "); |
| 2079 | } | 2079 | } |
| @@ -2153,13 +2153,13 @@ dump_log_buf(void) | |||
| 2153 | unsigned char buf[128]; | 2153 | unsigned char buf[128]; |
| 2154 | size_t len; | 2154 | size_t len; |
| 2155 | 2155 | ||
| 2156 | if (setjmp(bus_error_jmp) != 0) { | 2156 | if (setjmp(bus_error_jmp) != 0) { |
| 2157 | printf("Error dumping printk buffer!\n"); | 2157 | printf("Error dumping printk buffer!\n"); |
| 2158 | return; | 2158 | return; |
| 2159 | } | 2159 | } |
| 2160 | 2160 | ||
| 2161 | catch_memory_errors = 1; | 2161 | catch_memory_errors = 1; |
| 2162 | sync(); | 2162 | sync(); |
| 2163 | 2163 | ||
| 2164 | kmsg_dump_rewind_nolock(&dumper); | 2164 | kmsg_dump_rewind_nolock(&dumper); |
| 2165 | while (kmsg_dump_get_line_nolock(&dumper, false, buf, sizeof(buf), &len)) { | 2165 | while (kmsg_dump_get_line_nolock(&dumper, false, buf, sizeof(buf), &len)) { |
| @@ -2167,10 +2167,10 @@ dump_log_buf(void) | |||
| 2167 | printf("%s", buf); | 2167 | printf("%s", buf); |
| 2168 | } | 2168 | } |
| 2169 | 2169 | ||
| 2170 | sync(); | 2170 | sync(); |
| 2171 | /* wait a little while to see if we get a machine check */ | 2171 | /* wait a little while to see if we get a machine check */ |
| 2172 | __delay(200); | 2172 | __delay(200); |
| 2173 | catch_memory_errors = 0; | 2173 | catch_memory_errors = 0; |
| 2174 | } | 2174 | } |
| 2175 | 2175 | ||
| 2176 | /* | 2176 | /* |
