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

Commit 5740a4ea authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpuidle: lpm-levels: Remove sched_set_cpu_cstate calls"

parents 777f22ba fe64686f

drivers/cpuidle/lpm-levels.c

+0 −6
Original line number Diff line number Diff line
@@ -1371,11 +1371,6 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 
	const struct cpumask *cpumask = get_cpu_mask(dev->cpu);

	ktime_t start = ktime_get();

	uint64_t start_time = ktime_to_ns(start), end_time;

	struct power_params *pwr_params;



	pwr_params = &cpu->levels[idx].pwr;

	sched_set_cpu_cstate(dev->cpu, idx + 1,

			pwr_params->energy_overhead, pwr_params->latency_us);



	cpu_prepare(cpu, idx, true);

	cluster_prepare(cpu->parent, cpumask, idx, true, start_time);
@@ -1394,7 +1389,6 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 


	cluster_unprepare(cpu->parent, cpumask, idx, true, end_time);

	cpu_unprepare(cpu, idx, true);

	sched_set_cpu_cstate(smp_processor_id(), 0, 0, 0);

	dev->last_residency = ktime_us_delta(ktime_get(), start);

	update_history(dev, idx);

	trace_cpu_idle_exit(idx, success);

include/linux/sched.h

+0 −5
Original line number Diff line number Diff line
@@ -2754,11 +2754,6 @@ static inline int sched_update_freq_max_load(const cpumask_t *cpumask) 
	return 0;

}



static inline void

sched_set_cpu_cstate(int cpu, int cstate, int wakeup_energy, int wakeup_latency)

{

}



#ifdef CONFIG_SCHED_WALT

extern int register_cpu_cycle_counter_cb(struct cpu_cycle_counter_cb *cb);

extern void sched_set_io_is_busy(int val);