Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 248152b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents c1b84144 e7e29b4c

arch/m68k/include/asm/dma-mapping.h

+16 −0
Original line number Diff line number Diff line
@@ -21,6 +21,22 @@ extern void *dma_alloc_coherent(struct device *, size_t, 
extern void dma_free_coherent(struct device *, size_t,

			      void *, dma_addr_t);



static inline void *dma_alloc_attrs(struct device *dev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flag,

				    struct dma_attrs *attrs)

{

	/* attrs is not supported and ignored */

	return dma_alloc_coherent(dev, size, dma_handle, flag);

}



static inline void dma_free_attrs(struct device *dev, size_t size,

				  void *cpu_addr, dma_addr_t dma_handle,

				  struct dma_attrs *attrs)

{

	/* attrs is not supported and ignored */

	dma_free_coherent(dev, size, cpu_addr, dma_handle);

}



static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,

					  dma_addr_t *handle, gfp_t flag)

{

arch/m68k/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <uapi/asm/unistd.h>





#define NR_syscalls		348

#define NR_syscalls		349



#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_STAT

arch/m68k/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -353,5 +353,6 @@ 
#define __NR_process_vm_readv	345

#define __NR_process_vm_writev	346

#define __NR_kcmp		347

#define __NR_finit_module	348



#endif /* _UAPI_ASM_M68K_UNISTD_H_ */

arch/m68k/kernel/syscalltable.S

+1 −0
Original line number Diff line number Diff line
@@ -368,4 +368,5 @@ ENTRY(sys_call_table) 
	.long sys_process_vm_readv	/* 345 */

	.long sys_process_vm_writev

	.long sys_kcmp

	.long sys_finit_module

include/asm-generic/dma-mapping-broken.h

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,22 @@ extern void 
dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

		    dma_addr_t dma_handle);



static inline void *dma_alloc_attrs(struct device *dev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flag,

				    struct dma_attrs *attrs)

{

	/* attrs is not supported and ignored */

	return dma_alloc_coherent(dev, size, dma_handle, flag);

}



static inline void dma_free_attrs(struct device *dev, size_t size,

				  void *cpu_addr, dma_addr_t dma_handle,

				  struct dma_attrs *attrs)

{

	/* attrs is not supported and ignored */

	dma_free_coherent(dev, size, cpu_addr, dma_handle);

}



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)