From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1GSH8U-0006go-MU for user-mode-linux-devel@lists.sourceforge.net; Tue, 26 Sep 2006 10:54:26 -0700 Received: from [198.99.130.12] (helo=saraswathi.solana.com) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1GSH8T-0005vj-CR for user-mode-linux-devel@lists.sourceforge.net; Tue, 26 Sep 2006 10:54:25 -0700 Message-Id: <200609261753.k8QHrOOC005545@ccure.user-mode-linux.org> Mime-Version: 1.0 Date: Tue, 26 Sep 2006 13:53:24 -0400 From: Jeff Dike Subject: [uml-devel] [PATCH 4/5] UML - Fix sleep length bug 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: akpm@osdl.org Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net um_timer shouldn't add local_offset to the host time since get_time already did it. This threw off sleep when a settimeofday or equivalent had happened. Signed-off-by: Jeff Dike Index: linux-2.6.18-mm/arch/um/kernel/time.c =================================================================== --- linux-2.6.18-mm.orig/arch/um/kernel/time.c 2006-09-12 10:43:38.000000000 -0400 +++ linux-2.6.18-mm/arch/um/kernel/time.c 2006-09-22 10:15:45.000000000 -0400 @@ -95,7 +95,7 @@ irqreturn_t um_timer(int irq, void *dev, do_timer(1); - nsecs = get_time() + local_offset; + nsecs = get_time(); xtime.tv_sec = nsecs / NSEC_PER_SEC; xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC; ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel