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

+4 -1
+4 -1
arch/arm/include/asm/string.h
··· 42 extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi); 43 static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n) 44 { 45 - return __memset64(p, v, n * 8, v >> 32); 46 } 47 48 /*
··· 42 extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi); 43 static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n) 44 { 45 + if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN)) 46 + return __memset64(p, v, n * 8, v >> 32); 47 + else 48 + return __memset64(p, v >> 32, n * 8, v); 49 } 50 51 /*