summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/i386/ibcs2/ibcs2_xenix.c4
-rw-r--r--sys/i386/isa/pcvt/pcvt_vtf.c4
-rw-r--r--sys/kern/kern_threads.c4
-rw-r--r--sys/vm/vm_pageout.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 8e932857123d..8694e2a1220f 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ibcs2_xenix.c,v 1.13 1997/07/20 09:39:50 bde Exp $
+ * $Id: ibcs2_xenix.c,v 1.14 1997/11/06 19:28:46 phk Exp $
*/
#include <sys/param.h>
@@ -133,7 +133,7 @@ xenix_nap(struct proc *p, struct xenix_nap_args *uap)
DPRINTF(("IBCS2: 'xenix nap %d ms'\n", SCARG(uap, millisec)));
period = (long)SCARG(uap, millisec) / (1000/hz);
if (period)
- while (tsleep(&period, PUSER, "nap", period)
+ while (tsleep(&period, PPAUSE, "nap", period)
!= EWOULDBLOCK) ;
return 0;
}
diff --git a/sys/i386/isa/pcvt/pcvt_vtf.c b/sys/i386/isa/pcvt/pcvt_vtf.c
index 23ea49eed23f..e3f78785e733 100644
--- a/sys/i386/isa/pcvt/pcvt_vtf.c
+++ b/sys/i386/isa/pcvt/pcvt_vtf.c
@@ -1995,7 +1995,7 @@ roll_up(struct video_state *svsp, int n)
n * svsp->maxcol);
/*XXX*/ if(svsp->scroll_lock && svsp->openf && curproc)
- tsleep((caddr_t)&(svsp->scroll_lock), PUSER, "scrlck", 0);
+ tsleep((caddr_t)&(svsp->scroll_lock), PPAUSE, "scrlck", 0);
}
/*---------------------------------------------------------------------------*
@@ -2061,7 +2061,7 @@ roll_down(struct video_state *svsp, int n)
n * svsp->maxcol);
/*XXX*/ if(svsp->scroll_lock && svsp->openf && curproc)
- tsleep((caddr_t)&(svsp->scroll_lock), PUSER, "scrlck", 0);
+ tsleep((caddr_t)&(svsp->scroll_lock), PPAUSE, "scrlck", 0);
}
/*---------------------------------------------------------------------------*
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index 03cc9c9e322b..1121f09837d1 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
* in Germany will I accept domestic beer. This code may or may not work
* and I certainly make no claims as to its fitness for *any* purpose.
*
- * $Id: kern_threads.c,v 1.6 1998/02/25 06:30:15 bde Exp $
+ * $Id: kern_threads.c,v 1.7 1998/03/30 09:50:18 phk Exp $
*/
#include <sys/param.h>
@@ -98,7 +98,7 @@ thr_sleep(struct proc *p, struct thr_sleep_args *uap) {
if (p->p_wakeup == 0) {
sleepstart = ticks;
p->p_flag |= P_SINTR;
- error = tsleep(p, PUSER, "thrslp", timo);
+ error = tsleep(p, PRIBIO, "thrslp", timo);
p->p_flag &= ~P_SINTR;
if (error == EWOULDBLOCK) {
p->p_wakeup = 0;
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 1e51f0a9a422..2c090ab3f170 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_pageout.c,v 1.120 1998/03/16 01:55:58 dyson Exp $
+ * $Id: vm_pageout.c,v 1.121 1998/03/30 09:56:58 phk Exp $
*/
/*
@@ -1278,7 +1278,7 @@ vm_daemon()
struct proc *p;
while (TRUE) {
- tsleep(&vm_daemon_needed, PUSER, "psleep", 0);
+ tsleep(&vm_daemon_needed, PPAUSE, "psleep", 0);
if (vm_pageout_req_swapout) {
swapout_procs(vm_pageout_req_swapout);
vm_pageout_req_swapout = 0;