From 4f64777ff63aa6a2cd2154db39a1f46f4c178398 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 Jan 2022 13:48:42 +0100 Subject: [PATCH] ANDROID: GKI: remove CONFIG_RCU_FAST_NO_HZ from gki_defconfig CONFIG_RCU_FAST_NO_HZ is no longer a config option, so remove it from the gki_defconfig files so that the build will work again. Fixes: e2c73a6860bd ("rcu: Remove the RCU_FAST_NO_HZ Kconfig option") Signed-off-by: Greg Kroah-Hartman Change-Id: I980087ec0712fd3fc5843f227e5b88c9a87d5fa1 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 1b5b9965d0c9..d6cf95de27d0 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -13,7 +13,6 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y CONFIG_RCU_EXPERT=y -CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index d71d7933c837..4e1d587510e7 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -15,7 +15,6 @@ CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y CONFIG_RCU_EXPERT=y -CONFIG_RCU_FAST_NO_HZ=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y