Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu Kernel Team (http://www.linux-archive.org/ubuntu-kernel-team/)
-   -   Revert "workaround cma highmem broken" (http://www.linux-archive.org/ubuntu-kernel-team/624601-revert-workaround-cma-highmem-broken.html)

Paolo Pisati 01-24-2012 11:26 AM

Revert "workaround cma highmem broken"
 
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(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index fe013c5..7bac6ae 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -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
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 2b06e6c..eed6d40 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -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
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 8086266..035d56f 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -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
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 9c05132..6f1fa3e 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -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
", (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
", page, (unsigned long)size);
-
__dma_clear_buffer(page, size);
__dma_remap(page, size, prot);

--
1.7.5.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team


All times are GMT. The time now is 11:44 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.