History

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

Linus Torvalds committed 9 months ago

Commit f896d1c2 parents b7ff715 23ea2a41 file · +4 −1Browse files

Unified · Split

arch/arm/include/asm/string.h+4−1
@@ -42,7 +42,10 @@ static inline void *memset32(uint32_t *p, uint32_t v, __kernel_size_t n) · 41 unmodified lines
42extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi);42extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi);
43static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)43static 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/*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t