Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven:
"The asm-generic changeset has been ack'ed by Arnd."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Wire up finit_module
asm-generic/dma-mapping-broken.h: Provide dma_alloc_attrs()/dma_free_attrs()
m68k: Provide dma_alloc_attrs()/dma_free_attrs()
+35
-1
+16
arch/m68k/include/asm/dma-mapping.h
+16
arch/m68k/include/asm/dma-mapping.h
···
21
21
extern void dma_free_coherent(struct device *, size_t,
22
22
void *, dma_addr_t);
23
23
24
+
static inline void *dma_alloc_attrs(struct device *dev, size_t size,
25
+
dma_addr_t *dma_handle, gfp_t flag,
26
+
struct dma_attrs *attrs)
27
+
{
28
+
/* attrs is not supported and ignored */
29
+
return dma_alloc_coherent(dev, size, dma_handle, flag);
30
+
}
31
+
32
+
static inline void dma_free_attrs(struct device *dev, size_t size,
33
+
void *cpu_addr, dma_addr_t dma_handle,
34
+
struct dma_attrs *attrs)
35
+
{
36
+
/* attrs is not supported and ignored */
37
+
dma_free_coherent(dev, size, cpu_addr, dma_handle);
38
+
}
39
+
24
40
static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
25
41
dma_addr_t *handle, gfp_t flag)
26
42
{
+1
-1
arch/m68k/include/asm/unistd.h
+1
-1
arch/m68k/include/asm/unistd.h
+1
arch/m68k/include/uapi/asm/unistd.h
+1
arch/m68k/include/uapi/asm/unistd.h
+1
arch/m68k/kernel/syscalltable.S
+1
arch/m68k/kernel/syscalltable.S
+16
include/asm-generic/dma-mapping-broken.h
+16
include/asm-generic/dma-mapping-broken.h
···
16
16
dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
17
17
dma_addr_t dma_handle);
18
18
19
+
static inline void *dma_alloc_attrs(struct device *dev, size_t size,
20
+
dma_addr_t *dma_handle, gfp_t flag,
21
+
struct dma_attrs *attrs)
22
+
{
23
+
/* attrs is not supported and ignored */
24
+
return dma_alloc_coherent(dev, size, dma_handle, flag);
25
+
}
26
+
27
+
static inline void dma_free_attrs(struct device *dev, size_t size,
28
+
void *cpu_addr, dma_addr_t dma_handle,
29
+
struct dma_attrs *attrs)
30
+
{
31
+
/* attrs is not supported and ignored */
32
+
dma_free_coherent(dev, size, cpu_addr, dma_handle);
33
+
}
34
+
19
35
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
20
36
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
21
37