From 6ab09372b73238be66ddf062fb926bc327dcc0a7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Sep 2019 20:49:51 +0200 Subject: [PATCH] Revert "ANDROID: arm64: enable max frequency capping" This reverts commit f125452fcb9aa79eb125235ba18a73b978b74c45. We want to back-out the eas-dev merge that happened in the tree after 5.3-rc1 as those patches "should" all be in Linus's tree now. This is done to handle the merge conflicts with 5.4-rc1. Cc: Todd Kjos Signed-off-by: Greg Kroah-Hartman Change-Id: I1ecea74dbe14b3ce717ce6727eebf3171fdfa2ba --- arch/arm64/include/asm/topology.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h index 8e0a96d71bd6..0524f2438649 100644 --- a/arch/arm64/include/asm/topology.h +++ b/arch/arm64/include/asm/topology.h @@ -42,9 +42,6 @@ int pcibus_to_node(struct pci_bus *bus); /* Replace task scheduler's default frequency-invariant accounting */ #define arch_scale_freq_capacity topology_get_freq_scale -/* Replace task scheduler's default max-frequency-invariant accounting */ -#define arch_scale_max_freq_capacity topology_get_max_freq_scale - /* Replace task scheduler's default cpu-invariant accounting */ #define arch_scale_cpu_capacity topology_get_cpu_scale