From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + clockevents-ensure-taht-min_delta_ns-is-increased-in-error-path.patch added to -mm tree Date: Mon, 23 Nov 2009 15:28:12 -0800 Message-ID: <200911232328.nANNSCGS025305@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:59032 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752809AbZKWX2i (ORCPT ); Mon, 23 Nov 2009 18:28:38 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: u.kleine-koenig@pengutronix.de, a.p.zijlstra@chello.nl, luming.yu@gmail.com, mingo@elte.hu, tglx@linutronix.de 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.pa= tch 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 cod= e *** 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/mm= otm/ ------------------------------------------------------ Subject: clockevents: ensure taht min_delta_ns is increased in error pa= th =46rom: Uwe Kleine-K=F6nig tick_dev_program_event failed to increase min_delta_ns if the initial value was 1. Signed-off-by: Uwe Kleine-K=F6nig Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Luming Yu Signed-off-by: Andrew Morton --- 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-i= s-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 <=3D 1) dev->min_delta_ns =3D 5000; else dev->min_delta_ns +=3D dev->min_delta_ns >> 1; _ Patches currently in -mm which might be from u.kleine-koenig@pengutroni= x.de 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" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html