From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wPBBz2qHNzDqbs for ; Fri, 12 May 2017 10:47:23 +1000 (AEST) Received: by mail-pf0-x241.google.com with SMTP id w69so5037559pfk.1 for ; Thu, 11 May 2017 17:47:23 -0700 (PDT) Date: Fri, 12 May 2017 10:47:07 +1000 From: Nicholas Piggin To: christophe leroy Cc: linuxppc-dev@lists.ozlabs.org, Scott Wood Subject: Re: [PATCH 3/3] powerpc/8xx: xmon compile fix Message-ID: <20170512104707.5393eaa1@roar.ozlabs.ibm.com> In-Reply-To: References: <20170511151522.4772-1-npiggin@gmail.com> <20170511151522.4772-3-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 11 May 2017 20:52:56 +0200 christophe leroy wrote: > Le 11/05/2017 à 19:14, christophe leroy a écrit : > > > > > > Le 11/05/2017 à 17:15, Nicholas Piggin a écrit : > >> Cc: Scott Wood > >> Cc: Christophe Leroy > >> Signed-off-by: Nicholas Piggin > >> --- > >> 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