diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-13 17:47:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-13 17:47:35 +1100 |
| commit | cbcb37740f3de213e6ff58d810e0968002be9b4f (patch) | |
| tree | 96ffb4dd52548cd2df917e3656b3ceec38969678 /arch/microblaze/mm/init.c | |
| parent | 6ade7cb5626d979024d0a0c426ff2812e2f1c657 (diff) | |
| parent | bf3563d3cbbf029d4e906f509d5ffdb95c85ea79 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/microblaze/mm/init.c')
| -rw-r--r-- | arch/microblaze/mm/init.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 44f4b8910c21..7e97d44f6538 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -374,12 +374,14 @@ void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask) { void *p; - if (mem_init_done) + if (mem_init_done) { p = kzalloc(size, mask); - else { + } else { p = memblock_alloc(size, SMP_CACHE_BYTES); - if (p) - memset(p, 0, size); + if (!p) + panic("%s: Failed to allocate %zu bytes\n", + __func__, size); } + return p; } |