From f855de3d0e9be34cd7a5a8fe350541e3bbb9ea16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 12 Feb 2024 21:19:49 -0800 Subject: [PATCH] ANDROID: gki - set CONFIG_BPF_LSM=y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: TreeHugger Bug: 318399407 Signed-off-by: Maciej Żenczykowski Change-Id: I3482eb2f388661b8e32ddd9f5c7d00abde8f8737 (cherry picked from commit b1dc7ef48b6a01e0608710e47201b1182d801183) --- 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 ad7d4ad6555b..4f1ed1c48b3b 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_LSM=y CONFIG_PREEMPT=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_TASKSTATS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index cb1d16a5a1b9..2c778a0d2f0b 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -8,6 +8,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +CONFIG_BPF_LSM=y CONFIG_PREEMPT=y # CONFIG_PREEMPT_DYNAMIC is not set CONFIG_IRQ_TIME_ACCOUNTING=y