projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
[firefly-linux-kernel-4.4.55.git]
/
arch
/
hexagon
/
kernel
/
dma.c
diff --git
a/arch/hexagon/kernel/dma.c
b/arch/hexagon/kernel/dma.c
index e711ace62fdf9b60eb93d97cf0de193d936cce35..37302218ca4a2e9243bf0fc192047d12c4eac365 100644
(file)
--- a/
arch/hexagon/kernel/dma.c
+++ b/
arch/hexagon/kernel/dma.c
@@
-54,7
+54,8
@@
static struct gen_pool *coherent_pool;
/* Allocates from a pool of uncached memory that was reserved at boot time */
void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
/* Allocates from a pool of uncached memory that was reserved at boot time */
void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_addr, gfp_t flag)
+ dma_addr_t *dma_addr, gfp_t flag,
+ struct dma_attrs *attrs)
{
void *ret;
{
void *ret;
@@
-81,7
+82,7
@@
void *hexagon_dma_alloc_coherent(struct device *dev, size_t size,
}
static void hexagon_free_coherent(struct device *dev, size_t size, void *vaddr,
}
static void hexagon_free_coherent(struct device *dev, size_t size, void *vaddr,
- dma_addr_t dma_addr)
+ dma_addr_t dma_addr
, struct dma_attrs *attrs
)
{
gen_pool_free(coherent_pool, (unsigned long) vaddr, size);
}
{
gen_pool_free(coherent_pool, (unsigned long) vaddr, size);
}
@@
-202,8
+203,8
@@
static void hexagon_sync_single_for_device(struct device *dev,
}
struct dma_map_ops hexagon_dma_ops = {
}
struct dma_map_ops hexagon_dma_ops = {
- .alloc
_coherent
= hexagon_dma_alloc_coherent,
- .free
_coherent
= hexagon_free_coherent,
+ .alloc
= hexagon_dma_alloc_coherent,
+ .free
= hexagon_free_coherent,
.map_sg = hexagon_map_sg,
.map_page = hexagon_map_page,
.sync_single_for_cpu = hexagon_sync_single_for_cpu,
.map_sg = hexagon_map_sg,
.map_page = hexagon_map_page,
.sync_single_for_cpu = hexagon_sync_single_for_cpu,