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
/
s390
/
numa
/
numa.c
diff --git
a/arch/s390/numa/numa.c
b/arch/s390/numa/numa.c
index 5bd374491f9461467790e1e0522f838827f094df..297f5d8b0890729709e5023bd0b6ae69ba13b9c7 100644
(file)
--- a/
arch/s390/numa/numa.c
+++ b/
arch/s390/numa/numa.c
@@
-64,7
+64,7
@@
static __init pg_data_t *alloc_node_data(void)
{
pg_data_t *res;
- res = (pg_data_t *) memblock_alloc(sizeof(pg_data_t), 8);
+ res = (pg_data_t *) memblock_
phys_
alloc(sizeof(pg_data_t), 8);
memset(res, 0, sizeof(pg_data_t));
return res;
}