openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2008-09-09 13:47:01 -07:00
parent 93811d94f7 61c22c34c6
commit bdce291a69
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/time/tick-oneshot.c
View File

@ -43,19 +43,17 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
* and emit a warning. * and emit a warning.
*/ */
if (++i > 2) { if (++i > 2) {
printk(KERN_WARNING "CE: __tick_program_event of %s is " /* Increase the min. delta and try again */
"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 */
if (!dev->min_delta_ns) if (!dev->min_delta_ns)
dev->min_delta_ns = 5000; dev->min_delta_ns = 5000;
else 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; i = 0;
} }