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

Commit 38df92b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of... 

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  NOHZ: Properly feed cpufreq ondemand governor
parents c4c5ab30 f2e21c96

kernel/time/tick-sched.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -222,6 +222,15 @@ void tick_nohz_stop_sched_tick(int inidle) 




	cpu = smp_processor_id();

	cpu = smp_processor_id();

	ts = &per_cpu(tick_cpu_sched, cpu);

	ts = &per_cpu(tick_cpu_sched, cpu);



	/*

	 * Call to tick_nohz_start_idle stops the last_update_time from being

	 * updated. Thus, it must not be called in the event we are called from

	 * irq_exit() with the prior state different than idle.

	 */

	if (!inidle && !ts->inidle)

		goto end;



	now = tick_nohz_start_idle(ts);

	now = tick_nohz_start_idle(ts);





	/*

	/*
@@ -239,9 +248,6 @@ void tick_nohz_stop_sched_tick(int inidle) 
	if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))

	if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE))

		goto end;

		goto end;





	if (!inidle && !ts->inidle)

		goto end;



	ts->inidle = 1;

	ts->inidle = 1;





	if (need_resched())

	if (need_resched())