From d517cafdc21b6e5e625ac92c760dce3f0760b598 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Sun, 18 May 2008 13:18:01 -0500 Subject: [PATCH] --- yaml --- r: 97021 b: refs/heads/master c: f9ebcd9d410ba7209a8f321c41edf8615fc3ce67 h: refs/heads/master i: 97019: 346265081d3c6b0264723c73612cb6078db7c093 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 23 +++++++---------------- trunk/arch/powerpc/boot/4xx.c | 21 --------------------- trunk/arch/powerpc/mm/hash_low_32.S | 2 ++ trunk/lib/lmb.c | 3 ++- 5 files changed, 12 insertions(+), 39 deletions(-) diff --git a/[refs] b/[refs] index a12c97ac3c62..d02ac1c97c8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3d3d3cdb12dcc72e7bbff3d01073b7600349d3c +refs/heads/master: f9ebcd9d410ba7209a8f321c41edf8615fc3ce67 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 21c069543b16..c68a1189140c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -982,6 +982,13 @@ L: bonding-devel@lists.sourceforge.net W: http://sourceforge.net/projects/bonding/ S: Supported +BROADBAND PROCESSOR ARCHITECTURE +P: Arnd Bergmann +M: arnd@arndb.de +L: linuxppc-dev@ozlabs.org +W: http://www.penguinppc.org/ppc64/ +S: Supported + BROADCOM B44 10/100 ETHERNET DRIVER P: Gary Zambrano M: zambrano@broadcom.com @@ -1045,14 +1052,6 @@ L: linux-kernel@vger.kernel.org L: discuss@x86-64.org S: Maintained -CELL BROADBAND ENGINE ARCHITECTURE -P: Arnd Bergmann -M: arnd@arndb.de -L: linuxppc-dev@ozlabs.org -L: cbe-oss-dev@ozlabs.org -W: http://www.ibm.com/developerworks/power/cell/ -S: Supported - CFAG12864B LCD DRIVER P: Miguel Ojeda Sandonis M: maxextreme@gmail.com @@ -3767,14 +3766,6 @@ M: dbrownell@users.sourceforge.net L: spi-devel-general@lists.sourceforge.net S: Maintained -SPU FILE SYSTEM -P: Jeremy Kerr -M: jk@ozlabs.org -L: linuxppc-dev@ozlabs.org -L: cbe-oss-dev@ozlabs.org -W: http://www.ibm.com/developerworks/power/cell/ -S: Supported - STABLE BRANCH: P: Greg Kroah-Hartman M: greg@kroah.com diff --git a/trunk/arch/powerpc/boot/4xx.c b/trunk/arch/powerpc/boot/4xx.c index 5c878436f348..758edf1c5815 100644 --- a/trunk/arch/powerpc/boot/4xx.c +++ b/trunk/arch/powerpc/boot/4xx.c @@ -21,25 +21,6 @@ #include "reg.h" #include "dcr.h" -static unsigned long chip_11_errata(unsigned long memsize) -{ - unsigned long pvr; - - pvr = mfpvr(); - - switch (pvr & 0xf0000ff0) { - case 0x40000850: - case 0x400008d0: - case 0x200008d0: - memsize -= 4096; - break; - default: - break; - } - - return memsize; -} - /* Read the 4xx SDRAM controller to get size of system memory. */ void ibm4xx_sdram_fixup_memsize(void) { @@ -53,7 +34,6 @@ void ibm4xx_sdram_fixup_memsize(void) memsize += SDRAM_CONFIG_BANK_SIZE(bank_config); } - memsize = chip_11_errata(memsize); dt_fixup_memory(0, memsize); } @@ -219,7 +199,6 @@ void ibm4xx_denali_fixup_memsize(void) bank = 4; /* 4 banks */ memsize = cs * (1 << (col+row)) * bank * dpath; - memsize = chip_11_errata(memsize); dt_fixup_memory(0, memsize); } diff --git a/trunk/arch/powerpc/mm/hash_low_32.S b/trunk/arch/powerpc/mm/hash_low_32.S index b9ba7d930801..ddeaf9e38ad5 100644 --- a/trunk/arch/powerpc/mm/hash_low_32.S +++ b/trunk/arch/powerpc/mm/hash_low_32.S @@ -1,4 +1,6 @@ /* + * $Id: hashtable.S,v 1.6 1999/10/08 01:56:15 paulus Exp $ + * * PowerPC version * Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org) * Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP diff --git a/trunk/lib/lmb.c b/trunk/lib/lmb.c index 867f7b5a8231..5d7b9286503e 100644 --- a/trunk/lib/lmb.c +++ b/trunk/lib/lmb.c @@ -48,7 +48,8 @@ void lmb_dump_all(void) } pr_info(" reserved.cnt = 0x%lx\n", lmb.reserved.cnt); - pr_info(" reserved.size = 0x%lx\n", lmb.reserved.size); + pr_info(" reserved.size = 0x%llx\n", + (unsigned long long)lmb.memory.size); for (i=0; i < lmb.reserved.cnt ;i++) { pr_info(" reserved.region[0x%lx].base = 0x%llx\n", i, (unsigned long long)lmb.reserved.region[i].base);