From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 06:10:12 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm-arm/next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b1df32851fdf915d6bb35a30c8052dceab88bed3;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'kvm-arm/next'
---

b1df32851fdf915d6bb35a30c8052dceab88bed3
diff --cc arch/arm64/include/asm/barrier.h
index 065ba482daf0,5a8367a2b868..2175ec0004ed
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@@ -23,8 -23,13 +23,9 @@@
  #define dsb(opt)	asm volatile("dsb " #opt : : : "memory")
  
  #define psb_csync()	asm volatile("hint #17" : : : "memory")
+ #define tsb_csync()	asm volatile("hint #18" : : : "memory")
  #define csdb()		asm volatile("hint #20" : : : "memory")
  
 -#define spec_bar()	asm volatile(ALTERNATIVE("dsb nsh\nisb\n",		\
 -						 SB_BARRIER_INSN"nop\n",	\
 -						 ARM64_HAS_SB))
 -
  #ifdef CONFIG_ARM64_PSEUDO_NMI
  #define pmr_sync()						\
  	do {							\