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

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

Merge "drivers: cpuidle: lpm-levels: Remove ktime_get from suspend path"

parents 29032ef8 5170c83e

drivers/cpuidle/lpm-levels.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1276,7 +1276,6 @@ static int lpm_suspend_enter(suspend_state_t state) 
	struct lpm_cpu *lpm_cpu = cluster->cpu;

	struct lpm_cpu *lpm_cpu = cluster->cpu;

	const struct cpumask *cpumask = get_cpu_mask(cpu);

	const struct cpumask *cpumask = get_cpu_mask(cpu);

	int idx;

	int idx;

	int64_t time = ktime_to_ns(ktime_get());





	for (idx = lpm_cpu->nlevels - 1; idx >= 0; idx--) {

	for (idx = lpm_cpu->nlevels - 1; idx >= 0; idx--) {
@@ -1288,7 +1287,7 @@ static int lpm_suspend_enter(suspend_state_t state) 
		return 0;

		return 0;

	}

	}

	cpu_prepare(cluster, idx, false);

	cpu_prepare(cluster, idx, false);

	cluster_prepare(cluster, cpumask, idx, false, time);

	cluster_prepare(cluster, cpumask, idx, false, 0);

	if (idx > 0)

	if (idx > 0)

		update_debug_pc_event(CPU_ENTER, idx, 0xdeaffeed,

		update_debug_pc_event(CPU_ENTER, idx, 0xdeaffeed,

					0xdeaffeed, false);

					0xdeaffeed, false);
@@ -1310,8 +1309,7 @@ static int lpm_suspend_enter(suspend_state_t state) 
		update_debug_pc_event(CPU_EXIT, idx, true, 0xdeaffeed,

		update_debug_pc_event(CPU_EXIT, idx, true, 0xdeaffeed,

					false);

					false);





	time = ktime_to_ns(ktime_get());

	cluster_unprepare(cluster, cpumask, idx, false, 0);

	cluster_unprepare(cluster, cpumask, idx, false, time);

	cpu_unprepare(cluster, idx, false);

	cpu_unprepare(cluster, idx, false);

	return 0;

	return 0;

}

}