From fcd62521793f9674dc832a153fa60fec1f866e4c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Nov 2021 12:47:05 +0100 Subject: [PATCH] Revert "ANDROID: GKI: update Kconfig options for CONFIG_PREEMPT" This reverts commit 3d1f7b2753458b722cefade7b25f1df78091f241 as it is no longer needed because the config options got renamed back (thankfully) in commit a8b76910e465 ("preempt: Restore preemption model selection configs") Fixes: a8b76910e465 ("preempt: Restore preemption model selection configs") Signed-off-by: Greg Kroah-Hartman Change-Id: Id51a4f54483cb39f99fb0e8242277c1e9c67a9e5 --- 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 9ea1a078586a..b64dcb1b5c90 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -6,7 +6,7 @@ CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_JIT_ALWAYS_ON=y # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set -CONFIG_PREEMPT_BEHAVIOUR=y +CONFIG_PREEMPT=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 94ed97b50cfd..a264306054ff 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -8,7 +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_PREEMPT_BEHAVIOUR=y +CONFIG_PREEMPT=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_TASKSTATS=y CONFIG_TASK_XACCT=y