---

yaml --- r: 323547 b: refs/heads/master c: 803b0eb h: refs/heads/master i: 323545: 06aa83a 323543: d2c331c v: v3
git-mirror · Sep 23, 2012 · d3fc6ef · d3fc6ef
1 parent c46c587
commit d3fc6ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a11e2058f02feb6884efb067f328012c318a13f
+refs/heads/master: 803b0ebae921714d1c36f0996db8125eda5fae53
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
@@ -430,6 +430,8 @@ enum
 	NR_SOFTIRQS
 };
 
+#define SOFTIRQ_STOP_IDLE_MASK (~(1 << RCU_SOFTIRQ))
+
 /* map softirq index to softirq name. update 'softirq_to_name' in
  * kernel/softirq.c when adding a new softirq.
  */

diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
@@ -436,7 +436,8 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
 	if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
 		static int ratelimit;
 
-		if (ratelimit < 10) {
+		if (ratelimit < 10 &&
+		    (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
 			printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
 			       (unsigned int) local_softirq_pending());
 			ratelimit++;