diff options
author | Nicholas Piggin <npiggin@gmail.com> | 2017-05-12 02:47:07 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-05-30 06:59:51 +0200 |
commit | 09b6c1129f899c72d70b8bea36020644aa3b5a28 (patch) | |
tree | 229ab8575203e1f4ef578f2b3a4ae8e32076602a /arch/powerpc/xmon/xmon.c | |
parent | powerpc/powernv: Fix CPU_HOTPLUG=n idle.c compile error (diff) | |
download | linux-09b6c1129f899c72d70b8bea36020644aa3b5a28.tar.xz linux-09b6c1129f899c72d70b8bea36020644aa3b5a28.zip |
powerpc/xmon: Fix compile error with PPC_8xx=y
Rearrange the code so that mode and badaddr are only defined when
they're used.
Also unsplit the string for easier grepping, and switch from CONFIG_8xx
which is deprecated to CONFIG_PPC_8xx.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/xmon/xmon.c')
-rw-r--r-- | arch/powerpc/xmon/xmon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index f11f65634aab..a728e1919613 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -1242,14 +1242,14 @@ bpt_cmds(void) { int cmd; unsigned long a; - int mode, i; + int i; struct bpt *bp; - const char badaddr[] = "Only kernel addresses are permitted " - "for breakpoints\n"; cmd = inchar(); switch (cmd) { -#ifndef CONFIG_8xx +#ifndef CONFIG_PPC_8xx + static const char badaddr[] = "Only kernel addresses are permitted for breakpoints\n"; + int mode; case 'd': /* bd - hardware data breakpoint */ mode = 7; cmd = inchar(); |