From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161274AbWF0URH (ORCPT ); Tue, 27 Jun 2006 16:17:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161275AbWF0URG (ORCPT ); Tue, 27 Jun 2006 16:17:06 -0400 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:61568 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1161272AbWF0URA (ORCPT ); Tue, 27 Jun 2006 16:17:00 -0400 Message-Id: <20060627201423.217921000@sous-sol.org> References: <20060627200745.771284000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Tue, 27 Jun 2006 00:00:15 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Jeff Dike , user-mode-linux-devel@lists.sourceforge.net Subject: [PATCH 15/25] UML: fix uptime Content-Disposition: inline; filename=uml-fix-uptime.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Jeff Dike The use of signed instead of unsigned here broke the calculations on negative numbers that are involved in calculating wall_to_monotonic. Signed-off-by: Jeff Dike Signed-off-by: Chris Wright --- arch/um/kernel/time_kern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.17.1.orig/arch/um/kernel/time_kern.c +++ linux-2.6.17.1/arch/um/kernel/time_kern.c @@ -87,7 +87,7 @@ void timer_irq(union uml_pt_regs *regs) void time_init_kern(void) { - unsigned long long nsecs; + long long nsecs; nsecs = os_nsecs(); set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION, --