Commit f896d1c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux 

Pull ARM fix from Russell King:
 "Just one fix for memset64() on big endian 32-bit ARM systems"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9468/1: fix memset64() on big-endian
parents b7ff7151 23ea2a4c

arch/arm/include/asm/string.h

+4 −1
Original line number Diff line number Diff line
@@ -42,7 +42,10 @@ static inline void *memset32(uint32_t *p, uint32_t v, __kernel_size_t n) 
extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi);

static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)

{

	if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))

		return __memset64(p, v, n * 8, v >> 32);

	else

		return __memset64(p, v >> 32, n * 8, v);

}



/*