u.kleine-koenig at pengutronix
Nov 20, 2009, 11:23 AM
Post #1 of 1
(67 views)
Permalink
|
|
[PATCH 2/2] clockevents: assert min_delta_ns being increased in error path
|
|
tick_dev_program_event failed to increase min_delta_ns if the initial
value was 1.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig [at] pengutronix>
Cc: Thomas Gleixner <tglx [at] linutronix>
Cc: Ingo Molnar <mingo [at] elte>
Cc: Peter Zijlstra <a.p.zijlstra [at] chello>
Cc: Luming Yu <luming.yu [at] gmail>
---
kernel/time/tick-oneshot.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index 2dd23c3..c3712c4 100644
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -44,7 +44,7 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires,
*/
if (++i > 2) {
/* Increase the min. delta and try again */
- if (!dev->min_delta_ns)
+ if (dev->min_delta_ns <= 1)
dev->min_delta_ns = 5000;
else
dev->min_delta_ns += dev->min_delta_ns >> 1;
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
|
