On Thu, 11 May 2017 20:52:56 +0200
christophe leroy <christophe.le...@c-s.fr> wrote:
> Le 11/05/2017 à 19:14, christophe leroy a écrit :
> >
> >
> > Le 11/05/2017 à 17:15, Nicholas Piggin a écrit :
> >> Cc: Scott Wood <o...@buserror.net>
> >> Cc: Christophe Leroy <christophe.le...@c-s.fr>
> >> Signed-off-by: Nicholas Piggin <npig...@gmail.com>
> >> ---
> >> arch/powerpc/xmon/xmon.c | 5 ++++-
> >> 1 file changed, 4 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
> >> index f11f65634aab..ec420b0e6e88 100644
> >> --- a/arch/powerpc/xmon/xmon.c
> >> +++ b/arch/powerpc/xmon/xmon.c
> >> @@ -1242,10 +1242,13 @@ bpt_cmds(void)
> >> {
> >> int cmd;
> >> unsigned long a;
> >> - int mode, i;
> >> + int i;
> >> struct bpt *bp;
> >> +#ifndef CONFIG_8xx
> >
> > Would be better to use CONFIG_PPC_8xx
> >
> > As stated in arch/powerpc/platform/Kconfig.cputype, CONFIG_8xx is temp
> > to handle compat with arch/ppc, and we are trying to get rid of it
>
> I had the same comment in https://patchwork.ozlabs.org/patch/700354/
> I also suggested to move the relevant declarations inside the switch()
How's this one?
---
arch/powerpc/xmon/xmon.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index f11f65634aab..438fdb0fb142 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1242,14 +1242,16 @@ 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
+ int mode;
+ const char badaddr[] = "Only kernel addresses are permitted "
+ "for breakpoints\n";
+
case 'd': /* bd - hardware data breakpoint */
mode = 7;
cmd = inchar();
--
2.11.0
