tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes/cleanups from Catalin Marinas:
"Some fixes that turned up during the merge window:

- Add brackets to the io_stop_wc macro

- Avoid -Warray-bounds warning with the LSE atomics inline asm

- Apply __ro_after_init to memory_limit"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: mm: apply __ro_after_init to memory_limit
arm64: atomics: lse: Dereference matching size
asm-generic: Add missing brackets for io_stop_wc macro

Linus Torvalds b21bae9a 0854dc81

+4 -4
+1 -1
arch/arm64/include/asm/atomic_lse.h
··· 249 249 " mov %" #w "[tmp], %" #w "[old]\n" \ 250 250 " cas" #mb #sfx "\t%" #w "[tmp], %" #w "[new], %[v]\n" \ 251 251 " mov %" #w "[ret], %" #w "[tmp]" \ 252 - : [ret] "+r" (x0), [v] "+Q" (*(unsigned long *)ptr), \ 252 + : [ret] "+r" (x0), [v] "+Q" (*(u##sz *)ptr), \ 253 253 [tmp] "=&r" (tmp) \ 254 254 : [old] "r" (x1), [new] "r" (x2) \ 255 255 : cl); \
+1 -1
arch/arm64/include/asm/cmpxchg.h
··· 243 243 " cbnz %" #w "[tmp], 1f\n" \ 244 244 " wfe\n" \ 245 245 "1:" \ 246 - : [tmp] "=&r" (tmp), [v] "+Q" (*(unsigned long *)ptr) \ 246 + : [tmp] "=&r" (tmp), [v] "+Q" (*(u##sz *)ptr) \ 247 247 : [val] "r" (val)); \ 248 248 } 249 249
+1 -1
arch/arm64/mm/init.c
··· 172 172 } 173 173 EXPORT_SYMBOL(pfn_is_map_memory); 174 174 175 - static phys_addr_t memory_limit = PHYS_ADDR_MAX; 175 + static phys_addr_t memory_limit __ro_after_init = PHYS_ADDR_MAX; 176 176 177 177 /* 178 178 * Limit the memory size that was specified via FDT.
+1 -1
include/asm-generic/barrier.h
··· 285 285 * write-combining memory accesses before this macro with those after it. 286 286 */ 287 287 #ifndef io_stop_wc 288 - #define io_stop_wc do { } while (0) 288 + #define io_stop_wc() do { } while (0) 289 289 #endif 290 290 291 291 #endif /* !__ASSEMBLY__ */