Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758693Ab0FJI7b (ORCPT ); Thu, 10 Jun 2010 04:59:31 -0400 Received: from gate.crashing.org ([63.228.1.57]:36334 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752931Ab0FJI7a (ORCPT ); Thu, 10 Jun 2010 04:59:30 -0400 Subject: Re: [PATCH 5b/5] Removing dead CONFIG_PPC47x From: Benjamin Herrenschmidt To: Josh Boyer Cc: Christoph Egger , Paul Mackerras , Stephen Rothwell , Torez Smith , Dave Kleikamp , linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org, vamos@i4.informatik.uni-erlangen.de In-Reply-To: <20100609120522.GH7801@zod.rchland.ibm.com> References: <20100609110239.GA28290@faui48a.informatik.uni-erlangen.de> <20100609120522.GH7801@zod.rchland.ibm.com> Content-Type: text/plain; charset="UTF-8" Date: Thu, 10 Jun 2010 18:59:04 +1000 Message-ID: <1276160344.1962.65.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1436 Lines: 48 On Wed, 2010-06-09 at 08:05 -0400, Josh Boyer wrote: > On Wed, Jun 09, 2010 at 01:02:39PM +0200, Christoph Egger wrote: > >CONFIG_PPC47x should actually be spelled CONFIG_PPC_47x as reported by > >Andreas Schwab. > > > >Signed-off-by: Christoph Egger > > Thanks, I'll pull this one in and get it merged. I pulled your tree along with a couple of other things. I'll do a few tests tomorrow before sending to Linus. Cheers, Ben. > josh > > >--- > > arch/powerpc/mm/44x_mmu.c | 4 ---- > > 1 files changed, 0 insertions(+), 4 deletions(-) > > > >diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c > >index d8c6efb..f70da7e 100644 > >--- a/arch/powerpc/mm/44x_mmu.c > >+++ b/arch/powerpc/mm/44x_mmu.c > >@@ -76,11 +76,11 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys) > > "tlbwe %1,%3,%5\n" > > "tlbwe %0,%3,%6\n" > > : > >-#ifdef CONFIG_PPC47x > >+#ifdef CONFIG_PPC_47x > > : "r" (PPC47x_TLB2_S_RWX), > > #else > > : "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G), > > #endif > > "r" (phys), > > "r" (virt | PPC44x_TLB_VALID | PPC44x_TLB_256M), > > "r" (entry), > >-- > >1.6.3.3 > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/