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 1IxSDF-0001Q8-KO for user-mode-linux-devel@lists.sourceforge.net; Wed, 28 Nov 2007 11:04:45 -0800 Received: from saraswathi.solana.com ([198.99.130.12]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1IxSDF-00005j-1r for user-mode-linux-devel@lists.sourceforge.net; Wed, 28 Nov 2007 11:04:45 -0800 Date: Wed, 28 Nov 2007 14:04:40 -0500 From: Jeff Dike Message-ID: <20071128190440.GA8308@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 3/4] UML - after_sleep_interval should return something 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 [ This should be merged with uml-fix-no_hz-busy-loop.patch ] I forgot to have an int-returning function actually return something. Signed-off-by: Jeff Dike --- arch/um/os-Linux/time.c | 1 + 1 file changed, 1 insertion(+) Index: linux-2.6.22/arch/um/os-Linux/time.c =================================================================== --- linux-2.6.22.orig/arch/um/os-Linux/time.c 2007-11-28 10:42:52.000000000 -0500 +++ linux-2.6.22/arch/um/os-Linux/time.c 2007-11-28 11:37:19.000000000 -0500 @@ -77,6 +77,7 @@ long long os_nsecs(void) #ifdef UML_CONFIG_NO_HZ static int after_sleep_interval(struct timespec *ts) { + return 0; } #else static inline long long timespec_to_us(const struct timespec *ts) ------------------------------------------------------------------------- SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel