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

Commit f23a42d2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lpm-levels: Read next hrtimer event after tick_nohz_idle_stop_tick()"

parents 32bac06d 8000490a

drivers/cpuidle/lpm-levels.c

+3 −3
Original line number Diff line number Diff line
@@ -524,9 +524,6 @@ static int cpu_power_select(struct cpuidle_device *dev, 
	uint32_t min_residency, max_residency;

	struct power_params *pwr_params;



	/* Read the timer from the CPU that is entering idle */

	cpu->next_hrtimer = tick_nohz_get_next_hrtimer();



	if (lpm_disallowed(sleep_us, dev->cpu))

		goto done_select;
@@ -1262,6 +1259,9 @@ static int lpm_cpuidle_enter(struct cpuidle_device *dev, 
	uint64_t start_time = ktime_to_ns(start), end_time;

	int ret = -EBUSY;



	/* Read the timer from the CPU that is entering idle */

	cpu->next_hrtimer = tick_nohz_get_next_hrtimer();



	cpu_prepare(cpu, idx, true);

	cluster_prepare(cpu->parent, cpumask, idx, true, start_time);