The patch titled
clockevents: ensure that min_delta_ns is increased in error path
has been removed from the -mm tree. Its filename was
clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: clockevents: ensure that min_delta_ns is increased in error path
From: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Luming Yu <luming.yu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/time/tick-oneshot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/time/tick-oneshot.c~clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path kernel/time/tick-oneshot.c
--- a/kernel/time/tick-oneshot.c~clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path
+++ a/kernel/time/tick-oneshot.c
@@ -44,7 +44,7 @@ int tick_dev_program_event(struct clock_
*/
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;
_
Patches currently in -mm which might be from u.kleine-koenig@xxxxxxxxxxxxxx are
rtc-mc13783-fix-use-after-free-bug.patch
linux-next.patch
timer-print-function-name-for-timer-callbacks-modifying-preemption-count.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
