projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lmb: rename to memblock
[deliverable/linux.git]
/
arch
/
powerpc
/
platforms
/
pasemi
/
iommu.c
diff --git
a/arch/powerpc/platforms/pasemi/iommu.c
b/arch/powerpc/platforms/pasemi/iommu.c
index 7b1d608ea3c828c5fe195e77a2e1aa2f8a70e1e2..1f9fb2c577613c64335f4c61b348efc6701de3a2 100644
(file)
--- a/
arch/powerpc/platforms/pasemi/iommu.c
+++ b/
arch/powerpc/platforms/pasemi/iommu.c
@@
-204,7
+204,7
@@
int __init iob_init(struct device_node *dn)
pr_debug(" -> %s\n", __func__);
/* Allocate a spare page to map all invalid IOTLB pages. */
pr_debug(" -> %s\n", __func__);
/* Allocate a spare page to map all invalid IOTLB pages. */
- tmp =
lmb
_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
+ tmp =
memblock
_alloc(IOBMAP_PAGE_SIZE, IOBMAP_PAGE_SIZE);
if (!tmp)
panic("IOBMAP: Cannot allocate spare page!");
/* Empty l1 is marked invalid */
if (!tmp)
panic("IOBMAP: Cannot allocate spare page!");
/* Empty l1 is marked invalid */
@@
-275,7
+275,7
@@
void __init alloc_iobmap_l2(void)
return;
#endif
/* For 2G space, 8x64 pages (2^21 bytes) is max total l2 size */
return;
#endif
/* For 2G space, 8x64 pages (2^21 bytes) is max total l2 size */
- iob_l2_base = (u32 *)abs_to_virt(
lmb
_alloc_base(1UL<<21, 1UL<<21, 0x80000000));
+ iob_l2_base = (u32 *)abs_to_virt(
memblock
_alloc_base(1UL<<21, 1UL<<21, 0x80000000));
printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base);
}
printk(KERN_INFO "IOBMAP L2 allocated at: %p\n", iob_l2_base);
}
This page took
0.023524 seconds
and
5
git commands to generate.