From 7eeea0767401e68b315e08785fbc95af77ca90cd Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Thu, 9 Jul 2020 17:22:04 -0700 Subject: [PATCH] ANDROID: gki_defconfig: Enable Kprobes This commit effectively reverts commmit 2f7f6ce2cfa8 ("ANDROID: gki_defconfig: disable KPROBES, update ABI") The change at https://android-review.googlesource.com/1328978 restricts access to kprobes enough to mitigate potential issues with it. Bug: 149659981 Signed-off-by: Sandeep Patil Change-Id: I3772b7683e7844017bff4b388e74d52698f896f9 --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 1851512f3e33..33caadd56fcc 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -79,6 +79,7 @@ CONFIG_ARM_SCPI_PROTOCOL=y CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_SHADOW_CALL_STACK=y CONFIG_LTO_CLANG=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index ef9c952dbe15..e527aebb72d4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -57,6 +57,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_IA32_EMULATION=y +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_LTO_CLANG=y CONFIG_CFI_CLANG=y