From 2256ee3484454f1eaa11f321b191cbfdf260e12d Mon Sep 17 00:00:00 2001 From: Sandeep Patil Date: Fri, 7 Feb 2020 10:09:15 -0800 Subject: [PATCH] ANDROID: Revert "ANDROID: gki_defconfig: removed CONFIG_PM_WAKELOCKS" CONFIG_PM_WAKELOCKS are needed by existing driver code that uses APIs like pm_wake_lock/unlock(). We can't disable yet just yet even though userspace has stopped using the /sys/power/wake_lock interface. This reverts commit b82fc46d57da841e02ced5f8e8727aff5510d9bd. Bug: 148922129 Test: Boot Change-Id: I8b8f4f46db3647313485abff21a5659bd881b687 Signed-off-by: Sandeep Patil --- arch/arm64/configs/gki_defconfig | 3 +++ arch/x86/configs/gki_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 863d169b462a..79e925553f9c 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -54,6 +54,9 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y CONFIG_RANDOMIZE_BASE=y # CONFIG_DMI is not set +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_ENERGY_MODEL=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index a9d4b4fdd212..2f093dee35ce 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -45,6 +45,9 @@ CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y CONFIG_NR_CPUS=32 CONFIG_EFI=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=0 +# CONFIG_PM_WAKELOCKS_GC is not set CONFIG_CPU_FREQ_TIMES=y CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y