summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2013-07-29 14:31:45 +0200
committerMarek Szyprowski <m.szyprowski@samsung.com>2013-08-27 09:18:29 +0200
commita2547380393ac82c659b40182b0da8d05a8365f3 (patch)
tree45ff811ef870825743dd88eb14128003a9e3e375 /arch/x86/include
parentf7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e (diff)
downloadop-kernel-dev-a2547380393ac82c659b40182b0da8d05a8365f3.zip
op-kernel-dev-a2547380393ac82c659b40182b0da8d05a8365f3.tar.gz
drivers: dma-contiguous: clean source code and prepare for device tree
This patch cleans the initialization of dma contiguous framework. The all-in-one dma_declare_contiguous() function is now separated into dma_contiguous_reserve_area() which only steals the the memory from memblock allocator and dma_contiguous_add_device() function, which assigns given device to the specified reserved memory area. This improves the flexibility in defining contiguous memory areas and assigning device to them, because now it is possible to assign more than one device to the given contiguous memory area. Such split in initialization procedure is also required for upcoming device tree support. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Acked-by: Tomasz Figa <t.figa@samsung.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/dma-contiguous.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/dma-contiguous.h b/arch/x86/include/asm/dma-contiguous.h
index c092416..b4b38ba 100644
--- a/arch/x86/include/asm/dma-contiguous.h
+++ b/arch/x86/include/asm/dma-contiguous.h
@@ -4,7 +4,6 @@
#ifdef __KERNEL__
#include <linux/types.h>
-#include <asm-generic/dma-contiguous.h>
static inline void
dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
OpenPOWER on IntegriCloud