Re: linux-next: manual merge of the arm64 tree with Linus' tree
flat view
From: Catalin Marinas <catalin.marinas@arm.com>
Date: 2021-03-29 09:23:48
Also in:
lkml
On Mon, Mar 29, 2021 at 09:29:40AM +1100, Stephen Rothwell wrote:
quoted hunk ↗ jump to hunk
diff --cc arch/arm64/include/asm/cpucaps.h index c40f2490cd7b,9e3ec4dd56d8..000000000000--- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h@@@ -66,8 -66,8 +66,9 @@@ #define ARM64_WORKAROUND_1508412 58 #define ARM64_HAS_LDAPR 59 #define ARM64_KVM_PROTECTED_MODE 60 -#define ARM64_HAS_EPAN 61 +#define ARM64_WORKAROUND_NVIDIA_CARMEL_CNP 61 ++#define ARM64_HAS_EPAN 62 --#define ARM64_NCAPS 62 ++#define ARM64_NCAPS 63 #endif /* __ASM_CPUCAPS_H */
Thanks Stephen, it looks fine. -- Catalin