aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-11-07 15:03:07 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2012-11-17 13:30:39 -0500
commit00b42959106a9ca1c2899e591ae4e9a83ad6af05 (patch)
tree7dd755a813fe7a7fe635082fc5010eb73725f2fe /kernel/time
parent33a5f6261a61af28f7b4c86f9f958da0f206c914 (diff)
irq_work: Don't stop the tick with pending works
Don't stop the tick if we have pending irq works on the queue, otherwise if the arch can't raise self-IPIs, we may not find an opportunity to execute the pending works for a while. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Acked-by: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-sched.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 9e945aa090ac..f249e8c3e58e 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -20,6 +20,7 @@
20#include <linux/profile.h> 20#include <linux/profile.h>
21#include <linux/sched.h> 21#include <linux/sched.h>
22#include <linux/module.h> 22#include <linux/module.h>
23#include <linux/irq_work.h>
23 24
24#include <asm/irq_regs.h> 25#include <asm/irq_regs.h>
25 26
@@ -289,7 +290,7 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
289 } while (read_seqretry(&xtime_lock, seq)); 290 } while (read_seqretry(&xtime_lock, seq));
290 291
291 if (rcu_needs_cpu(cpu, &rcu_delta_jiffies) || printk_needs_cpu(cpu) || 292 if (rcu_needs_cpu(cpu, &rcu_delta_jiffies) || printk_needs_cpu(cpu) ||
292 arch_needs_cpu(cpu)) { 293 arch_needs_cpu(cpu) || irq_work_needs_cpu()) {
293 next_jiffies = last_jiffies + 1; 294 next_jiffies = last_jiffies + 1;
294 delta_jiffies = 1; 295 delta_jiffies = 1;
295 } else { 296 } else {