From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933194AbYHRTbV (ORCPT ); Mon, 18 Aug 2008 15:31:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761879AbYHRTaX (ORCPT ); Mon, 18 Aug 2008 15:30:23 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40866 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757649AbYHRTaW (ORCPT ); Mon, 18 Aug 2008 15:30:22 -0400 Date: Mon, 18 Aug 2008 12:19:46 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, jejb@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Oleg Nesterov , Mark McLoughlin , Oliver Pinter , Roland McGrath , Thomas Gleixner Subject: [patch 14/49] posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun Message-ID: <20080818191946.GO10350@suse.de> References: <20080818191012.663450219@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="posix-timers-do_schedule_next_timer-fix-the-setting-of-si_overrun.patch" In-Reply-To: <20080818191834.GA10350@suse.de> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.25-stable review patch. If anyone has any objections, please let us know. ------------------ From: Oleg Nesterov commit 54da1174922cddd4be83d5a364b2e0fdd693f513 upstream do_schedule_next_timer() sets info->si_overrun = timr->it_overrun_last, this discards the already accumulated overruns. Signed-off-by: Oleg Nesterov Cc: Mark McLoughlin Cc: Oliver Pinter Cc: Roland McGrath Cc: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman --- kernel/posix-timers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -290,7 +290,7 @@ void do_schedule_next_timer(struct sigin else schedule_next_timer(timr); - info->si_overrun = timr->it_overrun_last; + info->si_overrun += timr->it_overrun_last; } if (timr) --