Removing dead CONFIG_PPC47x
in [Kernel]
|
From: Josh Boyer on 9 Jun 2010 08:10 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 <siccegge(a)cs.fau.de> Thanks, I'll pull this one in and get it merged. 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(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Benjamin Herrenschmidt on 10 Jun 2010 05:00 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 <siccegge(a)cs.fau.de> > > 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(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|
Pages: 1 Prev: [patch] sata_sil24: memset() overflow Next: sata_sil24: memset() overflow |