diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2010-07-12 14:36:09 +1000 | 
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-14 17:14:00 +1000 | 
| commit | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (patch) | |
| tree | bd92b3804ff0bea083d69af0ede52f99ab34c0af /arch/powerpc/sysdev/fsl_pci.c | |
| parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) | |
| download | olio-linux-3.10-95f72d1ed41a66f1c1c29c24d479de81a0bea36f.tar.xz olio-linux-3.10-95f72d1ed41a66f1c1c29c24d479de81a0bea36f.zip  | |
lmb: rename to memblock
via following scripts
      FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
      sed -i \
        -e 's/lmb/memblock/g' \
        -e 's/LMB/MEMBLOCK/g' \
        $FILES
      for N in $(find . -name lmb.[ch]); do
        M=$(echo $N | sed 's/lmb/memblock/g')
        mv $N $M
      done
and remove some wrong change like lmbench and dlmb etc.
also move memblock.c from lib/ to mm/
Suggested-by: Ingo Molnar <mingo@elte.hu>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index a14760fe513..356c6a0e1b2 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -23,7 +23,7 @@  #include <linux/string.h>  #include <linux/init.h>  #include <linux/bootmem.h> -#include <linux/lmb.h> +#include <linux/memblock.h>  #include <linux/log2.h>  #include <linux/slab.h> @@ -190,7 +190,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose,  	pr_info("%s: PCICSRBAR @ 0x%x\n", name, pcicsrbar);  	/* Setup inbound mem window */ -	mem = lmb_end_of_DRAM(); +	mem = memblock_end_of_DRAM();  	sz = min(mem, paddr_lo);  	mem_log = __ilog2_u64(sz);  |