Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-10
+8
-10
kernel/time/tick-oneshot.c
+8
-10
kernel/time/tick-oneshot.c
···
43
43
* and emit a warning.
44
44
*/
45
45
if (++i > 2) {
46
-
printk(KERN_WARNING "CE: __tick_program_event of %s is "
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 */
46
+
/* Increase the min. delta and try again */
55
47
if (!dev->min_delta_ns)
56
48
dev->min_delta_ns = 5000;
57
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
57
i = 0;
60
58
}
61
59