diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 20:27:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 20:27:44 -0400 |
| commit | 6f7dd68b755b215deda5188a2c13c00f4776ea66 (patch) | |
| tree | 2a63c972ac89d7ae290910d5c6b1c6300ccbafd5 /arch/powerpc/sysdev/fsl_pci.c | |
| parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (diff) | |
| parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (diff) | |
Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
lmb: rename to memblock
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 a14760fe513a..356c6a0e1b23 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/bootmem.h> | 25 | #include <linux/bootmem.h> |
| 26 | #include <linux/lmb.h> | 26 | #include <linux/memblock.h> |
| 27 | #include <linux/log2.h> | 27 | #include <linux/log2.h> |
| 28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 29 | 29 | ||
| @@ -190,7 +190,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose, | |||
| 190 | pr_info("%s: PCICSRBAR @ 0x%x\n", name, pcicsrbar); | 190 | pr_info("%s: PCICSRBAR @ 0x%x\n", name, pcicsrbar); |
| 191 | 191 | ||
| 192 | /* Setup inbound mem window */ | 192 | /* Setup inbound mem window */ |
| 193 | mem = lmb_end_of_DRAM(); | 193 | mem = memblock_end_of_DRAM(); |
| 194 | sz = min(mem, paddr_lo); | 194 | sz = min(mem, paddr_lo); |
| 195 | mem_log = __ilog2_u64(sz); | 195 | mem_log = __ilog2_u64(sz); |
| 196 | 196 | ||