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

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

Merge "cpufreq: interactive_pro: Fix race condition in adding/deleting timers"

parents 8725aa2a f5d12045

drivers/cpufreq/cpufreq_interactive_pro.c

+1 −1
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static void cpufreq_interactive_timer_start( 
	u64 expires = round_to_nw_start(pcpu->last_evaluated_jiffy, tunables);

	unsigned long flags;



	spin_lock_irqsave(&pcpu->load_lock, flags);

	pcpu->cpu_timer.expires = expires;

	add_timer_on(&pcpu->cpu_timer, cpu);

	if (tunables->timer_slack_val >= 0 &&
@@ -211,7 +212,6 @@ static void cpufreq_interactive_timer_start( 
		add_timer_on(&pcpu->cpu_slack_timer, cpu);

	}



	spin_lock_irqsave(&pcpu->load_lock, flags);

	pcpu->time_in_idle =

		get_cpu_idle_time(cpu, &pcpu->time_in_idle_timestamp,

				  tunables->io_is_busy);