Commit cf91b415 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: Fix nohz ratelimit
parents e6cb6281 3310d4d3

kernel/time/tick-sched.c

+1 −4
Original line number Diff line number Diff line
@@ -315,9 +315,6 @@ void tick_nohz_stop_sched_tick(int inidle) 
		goto end;

	}



	if (nohz_ratelimit(cpu))

		goto end;



	ts->idle_calls++;

	/* Read jiffies and the time when jiffies were updated last */

	do {
@@ -328,7 +325,7 @@ void tick_nohz_stop_sched_tick(int inidle) 
	} while (read_seqretry(&xtime_lock, seq));



	if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) ||

	    arch_needs_cpu(cpu)) {

	    arch_needs_cpu(cpu) || nohz_ratelimit(cpu)) {

		next_jiffies = last_jiffies + 1;

		delta_jiffies = 1;

	} else {