From: Will Deacon <will@kernel.org>
Date: Wed, 22 Jan 2020 11:35:05 +0000 (+0000)
Subject: Merge branch 'for-next/errata' into for-next/core
X-Git-Tag: v5.10.7~3440^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab3906c53144837f1a192b5c3ba71ec2f938c187;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-next/errata' into for-next/core

* for-next/errata: (3 commits)
  arm64: Workaround for Cortex-A55 erratum 1530923
  ...
---

ab3906c53144837f1a192b5c3ba71ec2f938c187
diff --cc arch/arm64/include/asm/cpucaps.h
index 33ff25c1,3d1aa1b..a61c336
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -55,9 -55,8 +55,9 @@@
  #define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM	45
  #define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM	46
  #define ARM64_WORKAROUND_1542419		47
- #define ARM64_WORKAROUND_1319367		48
+ #define ARM64_WORKAROUND_SPECULATIVE_AT_NVHE	48
 +#define ARM64_HAS_E0PD				49
  
 -#define ARM64_NCAPS				49
 +#define ARM64_NCAPS				50
  
  #endif /* __ASM_CPUCAPS_H */