From: Kevin Hao <[email protected]> When fixing the merge conflict of stable commit cde7f2fd6323 ("arm64: errata: Mitigate Ampere1 erratum AC03_CPU_38 at stage-2"), a '.' was accidentally deleted for NXP erratum ERR050481. Restore it to fix the build error.
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Please help me merge this into the following two branches: v6.1/standard/nxp-sdk-5.15/nxp-s32g v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g arch/arm64/kernel/cpu_errata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 208eef97f69e..1122131e840e 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -752,7 +752,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { #endif #ifdef CONFIG_NXP_S32CC_ERRATUM_ERR050481 { - desc = "NXP erratum ERR050481 (TLBI handled incorrectly)", + .desc = "NXP erratum ERR050481 (TLBI handled incorrectly)", .capability = ARM64_WORKAROUND_NXP_ERR050481, .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = has_nxp_s32cc_erratum_err050481, -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12923): https://lists.yoctoproject.org/g/linux-yocto/message/12923 Mute This Topic: https://lists.yoctoproject.org/mt/100538003/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
