From a1a3544a4cecda54b01267af939607e081db075c Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Fri, 6 Aug 2021 11:16:02 -0700 Subject: [PATCH] ANDROID: GKI: Disable X86_MCE drivers Android does not use these drivers and enabling them causes additional and unwanted epoll wakeups due to uevents at suspend/resume time. Bug: 195607946 Signed-off-by: Alistair Delva Change-Id: Id3d58dc695c0cd6d2a65503a421de1afebd83784 --- arch/x86/configs/gki_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 65d05fc15038..6ea0778d07ef 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -52,6 +52,7 @@ CONFIG_X86_X2APIC=y CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_NR_CPUS=32 +# CONFIG_X86_MCE is not set CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure cgroup.memory=nokmem" @@ -358,7 +359,6 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y CONFIG_DEVFREQ_THERMAL=y CONFIG_THERMAL_EMULATION=y -# CONFIG_X86_PKG_TEMP_THERMAL is not set CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_MFD_SYSCON=y