Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error.

This commit is contained in:
ad 2008-01-02 12:46:07 +00:00
parent 41f847fb03
commit 888ef28a4d
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/rump/librump/rumpkern/locks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: locks.c,v 1.7 2008/01/02 11:49:06 ad Exp $ */
/* $NetBSD: locks.c,v 1.8 2008/01/02 12:46:07 ad Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@ -185,14 +185,6 @@ cv_wait_sig(kcondvar_t *cv, kmutex_t *mtx)
return 0;
}
int
cv_wait_sig(kcondvar_t *cv, kmutex_t *mtx)
{
rumpuser_cv_wait(RUMPCV(cv), mtx->kmtx_mtx);
return 0;
}
int
cv_timedwait(kcondvar_t *cv, kmutex_t *mtx, int ticks)
{
@ -211,15 +203,6 @@ cv_timedwait_sig(kcondvar_t *cv, kmutex_t *mtx, int ticks)
return rumpuser_cv_timedwait(RUMPCV(cv), mtx->kmtx_mtx, ticks);
}
int
cv_timedwait_sig(kcondvar_t *cv, kmutex_t *mtx, int ticks)
{
extern int hz;
KASSERT(hz == 100);
return rumpuser_cv_timedwait(RUMPCV(cv), mtx->kmtx_mtx, ticks);
}
void
cv_signal(kcondvar_t *cv)
{