From ec0b9c28afb08aea9e7102525a45a9990279cd51 Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Wed, 18 Oct 2023 13:50:59 -0700
Subject: [PATCH] ANDROID: GKI: Enable CONFIG_CFI_CLANG for RISC-V

RISC-V CFI support was added in v6.6. Enable it in gki_defconfig.

Bug: 307341041
Link: https://github.com/google/android-riscv64/issues/56
Test: launch_cvd
Change-Id: I00ca3251c511504057d38decf023a58b846cbbde
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
 arch/riscv/configs/gki_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index b442e293afe4..025a4dba324c 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -63,6 +63,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_CFI_CLANG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y