Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdce291a 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:
  clockevents: remove WARN_ON which was used to gather information
parents 93811d94 61c22c34

kernel/time/tick-oneshot.c

+8 −10
Original line number Diff line number Diff line
@@ -43,19 +43,17 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires, 
		 * and emit a warning.

		 */

		if (++i > 2) {

			printk(KERN_WARNING "CE: __tick_program_event of %s is "

			       "stuck %llx %llx\n", dev->name ? dev->name : "?",

			       now.tv64, expires.tv64);

			printk(KERN_WARNING

			       "CE: increasing min_delta_ns %ld to %ld nsec\n",

			       dev->min_delta_ns, dev->min_delta_ns << 1);

			WARN_ON(1);



			/* Double the min. delta and try again */

			/* Increase the min. delta and try again */

			if (!dev->min_delta_ns)

				dev->min_delta_ns = 5000;

			else

				dev->min_delta_ns <<= 1;

				dev->min_delta_ns += dev->min_delta_ns >> 1;



			printk(KERN_WARNING

			       "CE: %s increasing min_delta_ns to %lu nsec\n",

			       dev->name ? dev->name : "?",

			       dev->min_delta_ns << 1);



			i = 0;

		}