Merge "Revert "sched: Influence cpu_power based on max_freq and efficiency"" (88efb4d9) · Commits · e / devices / android_kernel_sony_msm8994

kernel/sched/fair.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -5563,7 +5563,7 @@ static inline int get_sd_load_idx(struct sched_domain *sd,

		static unsigned long default_scale_freq_power(struct sched_domain *sd, int cpu)
		{
		return capacity_scale_cpu_freq(cpu);
		return SCHED_POWER_SCALE;
		}

		unsigned long __weak arch_scale_freq_power(struct sched_domain *sd, int cpu)
		@@ -5632,9 +5632,6 @@ static void update_cpu_power(struct sched_domain *sd, int cpu)

		sdg->sgp->power_orig = power;

		power *= capacity_scale_cpu_efficiency(cpu);
		power >>= SCHED_POWER_SHIFT;

		if (sched_feat(ARCH_POWER))
		power *= arch_scale_freq_power(sd, cpu);
		else