The patch titled
clockevents: ensure taht min_delta_ns is increased in error path
has been added to the -mm tree. Its filename is
clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: clockevents: ensure taht 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
linux-next.patch
hrtimer-correct-a-few-numbers-in-comments.patch
clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path.patch
mxcmmc-fix-error-path-in-mxcmci_probe.patch
spi-drain-mxc-spi-transfer-buffer-when-probing-device.patch
rtc-add-freescale-mc13783-rtc-driver.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
