From 03b6af019b0bd0abd7a92dcbf55c83c27a78d360 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Sep 2019 20:49:38 +0200 Subject: [PATCH] Revert "ANDROID: arm: enable max frequency capping" This reverts commit 3dfddd5691d52ddcd6da3428c98e4e85e62f289f. 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: I7f33f5bbd0b8fd25e648a6ac0bd8ee9bcdc8de16 --- arch/arm/include/asm/topology.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h index 201dc2011c16..2a786f54d8b8 100644 --- a/arch/arm/include/asm/topology.h +++ b/arch/arm/include/asm/topology.h @@ -30,9 +30,6 @@ const struct cpumask *cpu_coregroup_mask(int cpu); /* 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