| commit | 989d6b4926a38e7cdfa63d3c941bdbd435e3f90c | [log] [tgz] |
|---|---|---|
| author | Arnav Kansal <rnv@google.com> | Thu Jan 30 19:53:17 2025 +0000 |
| committer | Arnav Kansal <rnv@google.com> | Fri Jan 31 19:21:32 2025 -0800 |
| tree | 9e4c9b335f0c37711f66de3e48e8bbfffe1eebdc | |
| parent | 99d930f3ece461da976ffeb3c44dfdfbd7a910ec [diff] |
Revert "Disable BTI for the ARM kernel" This reverts commit 4d2b9ba991a70099f011e6f63031981422e2c350. Change-Id: I279d57fa51fb7070bd4453324ddec650ca5e80ed Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/91754 Reviewed-by: Kevin Berry <kpberry@google.com> Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig index 00b42ac..66327fe 100644 --- a/arch/arm64/configs/lakitu_defconfig +++ b/arch/arm64/configs/lakitu_defconfig
@@ -494,7 +494,8 @@ # ARMv8.5 architectural features # CONFIG_AS_HAS_ARMV8_5=y -# CONFIG_ARM64_BTI is not set +CONFIG_ARM64_BTI=y +CONFIG_ARM64_BTI_KERNEL=y CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_AS_HAS_MTE=y