Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ANDROID: Revert "ANDROID: gki_defconfig: removed CONFIG_PM_WAKELOCKS"

Browse source 
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 b82fc46d57.

Bug: 148922129
Test: Boot
Change-Id: I8b8f4f46db3647313485abff21a5659bd881b687
Signed-off-by: Sandeep Patil <sspatil@google.com>
This commit is contained in:
Sandeep Patil 2020-02-07 10:09:15 -08:00 committed by Alistair Delva
parent 7ce4293b17
commit 4cf5c45850
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm64/configs/gki_defconfig
View file

@ -55,6 +55,9 @@ CONFIG_ARM64_SW_TTBR0_PAN=y
CONFIG_RANDOMIZE_BASE=y
# CONFIG_DMI is not set
CONFIG_COMPAT=y
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

3
arch/x86/configs/gki_defconfig
View file

@ -41,6 +41,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_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y