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/powerpc/mm/pgtable-book3e.c | |
| parent | 6ade7cb5626d979024d0a0c426ff2812e2f1c657 (diff) | |
| parent | bf3563d3cbbf029d4e906f509d5ffdb95c85ea79 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/powerpc/mm/pgtable-book3e.c')
| -rw-r--r-- | arch/powerpc/mm/pgtable-book3e.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/mm/pgtable-book3e.c b/arch/powerpc/mm/pgtable-book3e.c index 53cbc7dc2df2..1032ef7aaf62 100644 --- a/arch/powerpc/mm/pgtable-book3e.c +++ b/arch/powerpc/mm/pgtable-book3e.c @@ -57,8 +57,16 @@ void vmemmap_remove_mapping(unsigned long start, static __ref void *early_alloc_pgtable(unsigned long size) { - return memblock_alloc_try_nid(size, size, MEMBLOCK_LOW_LIMIT, - __pa(MAX_DMA_ADDRESS), NUMA_NO_NODE); + void *ptr; + + ptr = memblock_alloc_try_nid(size, size, MEMBLOCK_LOW_LIMIT, + __pa(MAX_DMA_ADDRESS), NUMA_NO_NODE); + + if (!ptr) + panic("%s: Failed to allocate %lu bytes align=0x%lx max_addr=%lx\n", + __func__, size, size, __pa(MAX_DMA_ADDRESS)); + + return ptr; } /* |