aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-02-19 13:12:05 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 17:18:43 -0500
commitbc5393a6c9c0e70b4b43fb2fb63e3315e9a15c8f (patch)
tree7fe069bfde8bef8381bead946e42036e8a325e5a
parent6ba9b346e1e0eca65ec589d32de3a9fe32dc5de6 (diff)
[PATCH] NOHZ: Produce debug output instead of a BUG()
The BUG_ON() in tick_nohz_stop_sched_tick() triggers on some boxen. Remove the BUG_ON and print information about the pending softirq to allow better debugging of the problem. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/time/tick-sched.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 9234e44fc94a..512a4a906467 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -165,7 +165,9 @@ void tick_nohz_stop_sched_tick(void)
165 goto end; 165 goto end;
166 166
167 cpu = smp_processor_id(); 167 cpu = smp_processor_id();
168 BUG_ON(local_softirq_pending()); 168 if (unlikely(local_softirq_pending()))
169 printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
170 local_softirq_pending());
169 171
170 now = ktime_get(); 172 now = ktime_get();
171 /* 173 /*