Revert "ANDROID: arm64: defconfig: Enable EAS by default"

This reverts commit 588085feb4
(change Iec9098f27c0353dabc23bd98efbca6479de41796), except
for the CONFIG_ENERGY_MODEL=y addition which is now upstream.

There's no need to carry any out-of-tree changes to
arch/arm64/configs/defconfig, since Android doesn't use this.

Change-Id: Icd0bf6af5d3c8b931361f36813b705f7f44f6eb0
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2020-08-12 11:20:49 -07:00 committed by Greg Kroah-Hartman
parent b5c8a97d50
commit 08c984e8b5

View File

@ -11,12 +11,10 @@ CONFIG_TASK_XACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_UCLAMP_TASK=y
CONFIG_NUMA_BALANCING=y
CONFIG_MEMCG=y
CONFIG_MEMCG_SWAP=y
CONFIG_BLK_CGROUP=y
CONFIG_UCLAMP_TASK_GROUP=y
CONFIG_CGROUP_PIDS=y
CONFIG_CGROUP_HUGETLB=y
CONFIG_CPUSETS=y
@ -80,7 +78,6 @@ CONFIG_ARM_CPUIDLE=y
CONFIG_ARM_PSCI_CPUIDLE=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y