git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*
[sfrench/cifs-2.6.git]
/
arch
/
openrisc
/
mm
/
ioremap.c
diff --git
a/arch/openrisc/mm/ioremap.c
b/arch/openrisc/mm/ioremap.c
index 2175e4bfd9fc0a28e80df5dca135493ec3728720..c9697529b3f079c6ff4c5c84299f1f975d0b3d6d 100644
(file)
--- a/
arch/openrisc/mm/ioremap.c
+++ b/
arch/openrisc/mm/ioremap.c
@@
-126,7
+126,7
@@
pte_t __ref *pte_alloc_one_kernel(struct mm_struct *mm,
if (likely(mem_init_done)) {
pte = (pte_t *) __get_free_page(GFP_KERNEL);
} else {
- pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));
+ pte = (pte_t *) __va(memblock_
phys_
alloc(PAGE_SIZE, PAGE_SIZE));
}
if (pte)