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
Unified · Split
| @@ -42,7 +42,10 @@ static inline void *memset32(uint32_t *p, uint32_t v, __kernel_size_t n) · 41 unmodified lines | |||
| 42 | extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi); | 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) | 43 | static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n) |
| 44 | { | 44 | { |
| 45 | return __memset64(p, v, n * 8, v >> 32); | 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); | ||
| 46 | } | 49 | } |
| 47 | 50 | ||
| 48 | /* | 51 | /* |