From 3d1f7b2753458b722cefade7b25f1df78091f241 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 4 Nov 2021 09:04:39 +0100 Subject: [PATCH] ANDROID: GKI: update Kconfig options for CONFIG_PREEMPT Commit c597bfddc9e9 ("sched: Provide Kconfig support for default dynamic preempt mode") changed the dependancies for CONFIG_PREEMPT, now CONFIG_PREEMPT_BEHAVIOR needs to be set, so fix up the GKI config files to properly do this. Fixes: c597bfddc9e9 ("sched: Provide Kconfig support for default dynamic preempt mode") Signed-off-by: Greg Kroah-Hartman Change-Id: I9b2e80b93985159a1925af3af8c221b556577f3d --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 8132ab4101a1..f4dbc2445e52 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -5,7 +5,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y -CONFIG_PREEMPT=y +CONFIG_PREEMPT_BEHAVIOUR=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_TASKSTATS=y CONFIG_TASK_XACCT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 420dadfe6d42..11218693a8fd 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -7,7 +7,7 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y -CONFIG_PREEMPT=y +CONFIG_PREEMPT_BEHAVIOUR=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_TASKSTATS=y CONFIG_TASK_XACCT=y