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: replace alloc_bootmem with memblock_alloc
[sfrench/cifs-2.6.git]
/
arch
/
microblaze
/
mm
/
init.c
diff --git
a/arch/microblaze/mm/init.c
b/arch/microblaze/mm/init.c
index df6de7ccdc2eb6fad45f93fcb1dbd74c0fff01e8..8c7f074ec20ffab651187b34a1b916e547570cfe 100644
(file)
--- a/
arch/microblaze/mm/init.c
+++ b/
arch/microblaze/mm/init.c
@@
-377,7
+377,7
@@
void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
if (mem_init_done)
p = kzalloc(size, mask);
else {
- p =
alloc_bootmem(size
);
+ p =
memblock_alloc(size, 0
);
if (p)
memset(p, 0, size);
}