Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c288e0cf authored by Sandeep Patil's avatar Sandeep Patil Committed by Alistair Delva
Browse files

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 b82fc46d.

Bug: 148922129
Test: Boot
Change-Id: I8b8f4f46db3647313485abff21a5659bd881b687
Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
parent 9ad7f75e

arch/arm64/configs/cuttlefish_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ CONFIG_RANDOMIZE_BASE=y 
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_MISC=y

CONFIG_COMPAT=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_PM_DEBUG=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ CONFIG_PHYSICAL_START=0x200000 
CONFIG_PHYSICAL_ALIGN=0x1000000

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0 reboot=p"

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set

CONFIG_PM_DEBUG=y

CONFIG_ACPI_PROCFS_POWER=y

# CONFIG_ACPI_FAN is not set