diff options
Diffstat (limited to 'arch/powerpc/sysdev/dart_iommu.c')
| -rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index c8b96ed7c015..559db2b846a9 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <linux/dma-mapping.h> | 36 | #include <linux/dma-mapping.h> |
| 37 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 38 | #include <linux/suspend.h> | 38 | #include <linux/suspend.h> |
| 39 | #include <linux/lmb.h> | 39 | #include <linux/memblock.h> |
| 40 | #include <linux/gfp.h> | 40 | #include <linux/gfp.h> |
| 41 | #include <asm/io.h> | 41 | #include <asm/io.h> |
| 42 | #include <asm/prom.h> | 42 | #include <asm/prom.h> |
| @@ -232,7 +232,7 @@ static int __init dart_init(struct device_node *dart_node) | |||
| 232 | * that to work around what looks like a problem with the HT bridge | 232 | * that to work around what looks like a problem with the HT bridge |
| 233 | * prefetching into invalid pages and corrupting data | 233 | * prefetching into invalid pages and corrupting data |
| 234 | */ | 234 | */ |
| 235 | tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE); | 235 | tmp = memblock_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE); |
| 236 | dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) & | 236 | dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) & |
| 237 | DARTMAP_RPNMASK); | 237 | DARTMAP_RPNMASK); |
| 238 | 238 | ||
| @@ -407,7 +407,7 @@ void __init alloc_dart_table(void) | |||
| 407 | if (iommu_is_off) | 407 | if (iommu_is_off) |
| 408 | return; | 408 | return; |
| 409 | 409 | ||
| 410 | if (!iommu_force_on && lmb_end_of_DRAM() <= 0x40000000ull) | 410 | if (!iommu_force_on && memblock_end_of_DRAM() <= 0x40000000ull) |
| 411 | return; | 411 | return; |
| 412 | 412 | ||
| 413 | /* 512 pages (2MB) is max DART tablesize. */ | 413 | /* 512 pages (2MB) is max DART tablesize. */ |
| @@ -416,7 +416,7 @@ void __init alloc_dart_table(void) | |||
| 416 | * will blow up an entire large page anyway in the kernel mapping | 416 | * will blow up an entire large page anyway in the kernel mapping |
| 417 | */ | 417 | */ |
| 418 | dart_tablebase = (unsigned long) | 418 | dart_tablebase = (unsigned long) |
| 419 | abs_to_virt(lmb_alloc_base(1UL<<24, 1UL<<24, 0x80000000L)); | 419 | abs_to_virt(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L)); |
| 420 | 420 | ||
| 421 | printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase); | 421 | printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase); |
| 422 | } | 422 | } |
