projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
lib
/
alloc.c
diff --git
a/arch/powerpc/lib/alloc.c
b/arch/powerpc/lib/alloc.c
index 4a6c2cf890d9df11a984ae8bc44f9a6a79c1432c..60b0b3fc8fc19725b60e660e41fe48ebb5ea757a 100644
(file)
--- a/
arch/powerpc/lib/alloc.c
+++ b/
arch/powerpc/lib/alloc.c
@@
-10,7
+10,7
@@
void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
{
void *p;
- if (
mem_init_done
)
+ if (
slab_is_available()
)
p = kzalloc(size, mask);
else {
p = memblock_virt_alloc(size, 0);