aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/tick-oneshot.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-09-09 15:38:57 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-09-09 16:20:01 -0400
commit61c22c34c6f80a8e89cff5ff717627c54cc14fd4 (patch)
tree33349263152d3ed4fd7d65e4c3d60340e6676b5c /kernel/time/tick-oneshot.c
parent82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff)
clockevents: remove WARN_ON which was used to gather information
The issue of the endless reprogramming loop due to a too small min_delta_ns was fixed with the previous updates of the clock events code, but we had no information about the spread of this problem. I added a WARN_ON to get automated information via kerneloops.org and to get some direct reports, which allowed me to analyse the affected machines. The WARN_ON has served its purpose and would be annoying for a release kernel. Remove it and just keep the information about the increase of the min_delta_ns value. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/tick-oneshot.c')
-rw-r--r--kernel/time/tick-oneshot.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index 2e35501e61dd..2e8de678e767 100644
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -43,19 +43,17 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
43 * and emit a warning. 43 * and emit a warning.
44 */ 44 */
45 if (++i > 2) { 45 if (++i > 2) {
46 printk(KERN_WARNING "CE: __tick_program_event of %s is " 46 /* Increase the min. delta and try again */
47 "stuck %llx %llx\n", dev->name ? dev->name : "?",
48 now.tv64, expires.tv64);
49 printk(KERN_WARNING
50 "CE: increasing min_delta_ns %ld to %ld nsec\n",
51 dev->min_delta_ns, dev->min_delta_ns << 1);
52 WARN_ON(1);
53
54 /* Double the min. delta and try again */
55 if (!dev->min_delta_ns) 47 if (!dev->min_delta_ns)
56 dev->min_delta_ns = 5000; 48 dev->min_delta_ns = 5000;
57 else 49 else
58 dev->min_delta_ns <<= 1; 50 dev->min_delta_ns += dev->min_delta_ns >> 1;
51
52 printk(KERN_WARNING
53 "CE: %s increasing min_delta_ns to %lu nsec\n",
54 dev->name ? dev->name : "?",
55 dev->min_delta_ns << 1);
56
59 i = 0; 57 i = 0;
60 } 58 }
61 59