From 7a8376be7469895257d8fe8671dcee4d40119037 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 16 Apr 2024 07:47:56 +0000 Subject: [PATCH] ANDROID: use reserved cpucaps for new capability In commit 2b1dc0666e7f ("arm64: Rename ARM64_WORKAROUND_2966298"), a new quirk is added to the tree, which breaks the Android ABI. Fix this up by using the space reserved for this for the new capability Fixes: 2b1dc0666e7f ("arm64: Rename ARM64_WORKAROUND_2966298") Signed-off-by: Greg Kroah-Hartman Change-Id: Ic3a9d32d85eaf86eef77593dc150bb566600cea7 --- 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 ee17b571c2c5..3095d5aa8945 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -71,7 +71,6 @@ WORKAROUND_2064142 WORKAROUND_2077057 WORKAROUND_2457168 WORKAROUND_2658417 -WORKAROUND_SPECULATIVE_UNPRIV_LOAD WORKAROUND_TRBE_OVERWRITE_FILL_MODE WORKAROUND_TSB_FLUSH_FAILURE WORKAROUND_TRBE_WRITE_OUT_OF_RANGE @@ -87,7 +86,7 @@ WORKAROUND_NXP_ERR050104 WORKAROUND_QCOM_FALKOR_E1003 WORKAROUND_REPEAT_TLBI WORKAROUND_SPECULATIVE_AT -ANDROID_KABI_RESERVE_01 +WORKAROUND_SPECULATIVE_UNPRIV_LOAD ANDROID_KABI_RESERVE_02 ANDROID_KABI_RESERVE_03 ANDROID_KABI_RESERVE_04