From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1IVvV1-0005s0-CQ for user-mode-linux-devel@lists.sourceforge.net; Thu, 13 Sep 2007 13:41:19 -0700 Received: from saraswathi.solana.com ([198.99.130.12]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1IVvUz-0007yE-Qg for user-mode-linux-devel@lists.sourceforge.net; Thu, 13 Sep 2007 13:41:19 -0700 Date: Thu, 13 Sep 2007 16:41:12 -0400 From: Jeff Dike Message-ID: <20070913204112.GA9991@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 3/3] UML - Fix usec to nsec conversion List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: LKML , uml-devel microseconds need to be multiplied by a thousand, not a billion, to get nanoseconds. Signed-off-by: Jeff Dike -- arch/um/os-Linux/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.22/arch/um/os-Linux/time.c =================================================================== --- linux-2.6.22.orig/arch/um/os-Linux/time.c 2007-09-12 16:45:28.000000000 -0400 +++ linux-2.6.22/arch/um/os-Linux/time.c 2007-09-13 11:37:05.000000000 -0400 @@ -48,7 +48,7 @@ static inline unsigned long long tv_to_n */ return ((unsigned long long) tv->tv_sec) * UM_NSEC_PER_SEC + - tv->tv_usec * UM_NSEC_PER_SEC; + tv->tv_usec * UM_NSEC_PER_USEC; } unsigned long long disable_timer(void) ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933250AbXIMUm2 (ORCPT ); Thu, 13 Sep 2007 16:42:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758258AbXIMUl7 (ORCPT ); Thu, 13 Sep 2007 16:41:59 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:60215 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754595AbXIMUl6 (ORCPT ); Thu, 13 Sep 2007 16:41:58 -0400 Date: Thu, 13 Sep 2007 16:41:12 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 3/3] UML - Fix usec to nsec conversion Message-ID: <20070913204112.GA9991@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org microseconds need to be multiplied by a thousand, not a billion, to get nanoseconds. Signed-off-by: Jeff Dike -- arch/um/os-Linux/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.22/arch/um/os-Linux/time.c =================================================================== --- linux-2.6.22.orig/arch/um/os-Linux/time.c 2007-09-12 16:45:28.000000000 -0400 +++ linux-2.6.22/arch/um/os-Linux/time.c 2007-09-13 11:37:05.000000000 -0400 @@ -48,7 +48,7 @@ static inline unsigned long long tv_to_n */ return ((unsigned long long) tv->tv_sec) * UM_NSEC_PER_SEC + - tv->tv_usec * UM_NSEC_PER_SEC; + tv->tv_usec * UM_NSEC_PER_USEC; } unsigned long long disable_timer(void)