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

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
parents 0854dc81 bb425a75

arch/arm64/include/asm/atomic_lse.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ __lse__cmpxchg_case_##name##sz(volatile void *ptr, \ 
	"	mov	%" #w "[tmp], %" #w "[old]\n"			\

	"	cas" #mb #sfx "\t%" #w "[tmp], %" #w "[new], %[v]\n"	\

	"	mov	%" #w "[ret], %" #w "[tmp]"			\

	: [ret] "+r" (x0), [v] "+Q" (*(unsigned long *)ptr),		\

	: [ret] "+r" (x0), [v] "+Q" (*(u##sz *)ptr),			\

	  [tmp] "=&r" (tmp)						\

	: [old] "r" (x1), [new] "r" (x2)				\

	: cl);								\

arch/arm64/include/asm/cmpxchg.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static inline void __cmpwait_case_##sz(volatile void *ptr, \ 
	"	cbnz	%" #w "[tmp], 1f\n"				\

	"	wfe\n"							\

	"1:"								\

	: [tmp] "=&r" (tmp), [v] "+Q" (*(unsigned long *)ptr)		\

	: [tmp] "=&r" (tmp), [v] "+Q" (*(u##sz *)ptr)			\

	: [val] "r" (val));						\

}

arch/arm64/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int pfn_is_map_memory(unsigned long pfn) 
}

EXPORT_SYMBOL(pfn_is_map_memory);



static phys_addr_t memory_limit = PHYS_ADDR_MAX;

static phys_addr_t memory_limit __ro_after_init = PHYS_ADDR_MAX;



/*

 * Limit the memory size that was specified via FDT.

include/asm-generic/barrier.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ do { \ 
 * write-combining memory accesses before this macro with those after it.

 */

#ifndef io_stop_wc

#define io_stop_wc do { } while (0)

#define io_stop_wc() do { } while (0)

#endif



#endif /* !__ASSEMBLY__ */