summaryrefslogtreecommitdiffstats
path: root/arch/c6x
diff options
context:
space:
mode:
Diffstat (limited to 'arch/c6x')
-rw-r--r--arch/c6x/mm/dma-coherent.c4
-rw-r--r--arch/c6x/mm/init.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/c6x/mm/dma-coherent.c b/arch/c6x/mm/dma-coherent.c
index 0be289839ce0..0d3701bc88f6 100644
--- a/arch/c6x/mm/dma-coherent.c
+++ b/arch/c6x/mm/dma-coherent.c
@@ -138,6 +138,10 @@ void __init coherent_mem_init(phys_addr_t start, u32 size)
138 138
139 dma_bitmap = memblock_alloc(BITS_TO_LONGS(dma_pages) * sizeof(long), 139 dma_bitmap = memblock_alloc(BITS_TO_LONGS(dma_pages) * sizeof(long),
140 sizeof(long)); 140 sizeof(long));
141 if (!dma_bitmap)
142 panic("%s: Failed to allocate %zu bytes align=0x%zx\n",
143 __func__, BITS_TO_LONGS(dma_pages) * sizeof(long),
144 sizeof(long));
141} 145}
142 146
143static void c6x_dma_sync(struct device *dev, phys_addr_t paddr, size_t size, 147static void c6x_dma_sync(struct device *dev, phys_addr_t paddr, size_t size,
diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c
index e83c04654238..fe582c3a1794 100644
--- a/arch/c6x/mm/init.c
+++ b/arch/c6x/mm/init.c
@@ -40,6 +40,9 @@ void __init paging_init(void)
40 40
41 empty_zero_page = (unsigned long) memblock_alloc(PAGE_SIZE, 41 empty_zero_page = (unsigned long) memblock_alloc(PAGE_SIZE,
42 PAGE_SIZE); 42 PAGE_SIZE);
43 if (!empty_zero_page)
44 panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
45 __func__, PAGE_SIZE, PAGE_SIZE);
43 46
44 /* 47 /*
45 * Set up user data space 48 * Set up user data space