From 0450b5433dd0a88908a4e68cad188297eb270a57 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 15 Sep 2024 09:16:49 +0000 Subject: [PATCH] ANDROID: fix up abi break in arm64 cpu_hwcaps In commit 286c8ca924b2 ("arm64: errata: Add workaround for Arm errata 3194386 and 3312417"), we add a new cpucap type, but as that breaks the existing kernel ABI for Android systems, we need to properly use one of the reserved slots for it instead of adding a new one. Fixes: 286c8ca924b2 ("arm64: errata: Add workaround for Arm errata 3194386 and 3312417") Change-Id: I7bbb7ffcc59cbfa9a1f03f7081df3387b8151a86 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/tools/cpucaps | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index acd0872f412e..1829755b4139 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -86,9 +86,8 @@ WORKAROUND_NXP_ERR050104 WORKAROUND_QCOM_FALKOR_E1003 WORKAROUND_REPEAT_TLBI WORKAROUND_SPECULATIVE_AT -WORKAROUND_SPECULATIVE_SSBS WORKAROUND_SPECULATIVE_UNPRIV_LOAD -ANDROID_KABI_RESERVE_02 +WORKAROUND_SPECULATIVE_SSBS ANDROID_KABI_RESERVE_03 ANDROID_KABI_RESERVE_04 ANDROID_KABI_RESERVE_05