@@ -52,7 +52,6 @@ config ARCH_OMAP4
select USB_ARCH_HAS_EHCI
select ARM_CPU_SUSPEND if PM
select ARCH_HAS_BARRIERS
- select ZONE_DMA
comment "OMAP Core Type"
depends on ARCH_OMAP2
@@ -1210,7 +1210,4 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
.init_machine = omap_4430sdp_init,
.timer = &omap4_timer,
.restart = omap_prcm_restart,
-#ifdef CONFIG_ZONE_DMA
- .dma_zone_size = 500 * 1024 * 1024,
-#endif
MACHINE_END
@@ -819,7 +819,4 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")
.timer = &omap4_timer,
.restart = omap_prcm_restart,
.dt_compat = omap4_panda_match,
-#ifdef CONFIG_ZONE_DMA
- .dma_zone_size = 500 * 1024 * 1024,
-#endif
MACHINE_END
@@ -503,14 +503,10 @@ static void *__alloc_from_contiguous(struct device *dev, size_t size,
size_t count = size >> PAGE_SHIFT;
struct page *page;
- pr_err("__alloc_from_contiguous: count=%lu, order=%lu\n", (unsigned long)count, order);
-
page = dma_alloc_from_contiguous(dev, count, order);
if (!page)
return NULL;
- pr_err("__alloc_from_contiguous: page=%p, size=%lu\n", page, (unsigned long)size);
-
__dma_clear_buffer(page, size);
__dma_remap(page, size, prot);
This reverts commit dce4ad0eabf45def016d0bf47c000320fa9de6a9. Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/board-4430sdp.c | 3 --- arch/arm/mach-omap2/board-omap4panda.c | 3 --- arch/arm/mm/dma-mapping.c | 4 ---- 4 files changed, 0 insertions(+), 11 deletions(-)