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

Commit 2d618bdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel 

Pull hexagon fixes from Richard Kuo:
 "Some small fixes for module compilation"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  hexagon: export csum_partial_copy_nocheck
  hexagon: add memset_io() helper
parents f2125992 330e261c

arch/hexagon/include/asm/io.h

+6 −0
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, 
	memcpy((void *) dst, src, count);

}



static inline void memset_io(volatile void __iomem *addr, int value,

			     size_t size)

{

	memset((void __force *)addr, value, size);

}



#define PCI_IO_ADDR	(volatile void __iomem *)



/*

arch/hexagon/lib/checksum.c

+1 −0
Original line number Diff line number Diff line
@@ -199,3 +199,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) 
	memcpy(dst, src, len);

	return csum_partial(dst, len, sum);

}

EXPORT_SYMBOL(csum_partial_copy_nocheck);