Module Name: src
Committed By: pooka
Date: Wed Nov 11 16:50:17 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: ltsleep.c
Log Message:
set return value properly
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpkern/ltsleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/ltsleep.c
diff -u src/sys/rump/librump/rumpkern/ltsleep.c:1.20 src/sys/rump/librump/rumpkern/ltsleep.c:1.21
--- src/sys/rump/librump/rumpkern/ltsleep.c:1.20 Wed Nov 11 16:47:50 2009
+++ src/sys/rump/librump/rumpkern/ltsleep.c Wed Nov 11 16:50:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ltsleep.c,v 1.20 2009/11/11 16:47:50 pooka Exp $ */
+/* $NetBSD: ltsleep.c,v 1.21 2009/11/11 16:50:17 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ltsleep.c,v 1.20 2009/11/11 16:47:50 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ltsleep.c,v 1.21 2009/11/11 16:50:17 pooka Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -61,8 +61,11 @@
/* protected by biglock */
if (timo) {
- rv = rumpuser_cv_timedwait(ltsp->cv, rump_giantlock,
- timo / hz, (timo % hz) * (1000000000/hz));
+ if (rumpuser_cv_timedwait(ltsp->cv, rump_giantlock,
+ timo / hz, (timo % hz) * (1000000000/hz)) == 0)
+ rv = 0;
+ else
+ rv = EWOULDBLOCK;
} else {
rumpuser_cv_wait(ltsp->cv, rump_giantlock);
rv = 0;