Switch from cthreads to pthreads

Makefiles, headers, types, macros and function calls are renamed where
appropriate.

Most of this work was done by Barry deFreese and Thomas DiModica.

* auth/Makefile: Switch from cthreads to pthreads.
* auth/auth.c: Likewise.
* boot/Makefile: Likewise.
* boot/boot.c: Likewise.
* boot/ux.c: Likewise.
* console-client/Makefile: Likewise.
* console-client/console.c: Likewise.
* console-client/driver.c: Likewise.
* console-client/driver.h: Likewise.
* console-client/generic-speaker.c: Likewise.
* console-client/kbd-repeat.c: Likewise.
* console-client/ncursesw.c: Likewise.
* console-client/pc-kbd.c: Likewise.
* console-client/pc-mouse.c: Likewise.
* console-client/timer.c: Likewise.
* console-client/trans.c: Likewise.
* console-client/vga.c: Likewise.
* console/Makefile: Likewise.
* console/console.c: Likewise.
* console/display.c: Likewise.
* console/input.c: Likewise.
* console/pager.c: Likewise.
* defpager/backing.c: Likewise.
* exec/Makefile: Likewise.
* exec/exec.c: Likewise.
* exec/hashexec.c: Likewise.
* exec/priv.h: Likewise.
* ext2fs/Makefile: Likewise.
* ext2fs/balloc.c: Likewise.
* ext2fs/dir.c: Likewise.
* ext2fs/ext2fs.c: Likewise.
* ext2fs/ext2fs.h: Likewise.
* ext2fs/ialloc.c: Likewise.
* ext2fs/inode.c: Likewise.
* ext2fs/msg.c: Likewise.
* ext2fs/pager.c: Likewise.
* ext2fs/pokel.c: Likewise.
* ext2fs/storeinfo.c: Likewise.
* ext2fs/truncate.c: Likewise.
* fatfs/Makefile: Likewise.
* fatfs/dir.c: Likewise.
* fatfs/fat.c: Likewise.
* fatfs/fatfs.h: Likewise.
* fatfs/inode.c: Likewise.
* fatfs/main.c: Likewise.
* fatfs/pager.c: Likewise.
* fatfs/virt-inode.c: Likewise.
* ftpfs/Makefile: Likewise.
* ftpfs/ccache.c: Likewise.
* ftpfs/ccache.h: Likewise.
* ftpfs/conn.c: Likewise.
* ftpfs/dir.c: Likewise.
* ftpfs/fs.c: Likewise.
* ftpfs/ftpfs.c: Likewise.
* ftpfs/ftpfs.h: Likewise.
* ftpfs/ncache.c: Likewise.
* ftpfs/netfs.c: Likewise.
* ftpfs/node.c: Likewise.
* hostmux/Makefile: Likewise.
* hostmux/hostmux.h: Likewise.
* hostmux/mux.c: Likewise.
* hostmux/node.c: Likewise.
* hostmux/stubs.c: Likewise.
* hurd/shared.h: Likewise.
* isofs/Makefile: Likewise.
* isofs/inode.c: Likewise.
* isofs/lookup.c: Likewise.
* isofs/main.c: Likewise.
* isofs/pager.c: Likewise.
* libcons/Makefile: Likewise.
* libcons/cons-switch.c: Likewise.
* libcons/cons.h: Likewise.
* libcons/dir-changed.c: Likewise.
* libcons/file-changed.c: Likewise.
* libcons/init-init.c: Likewise.
* libcons/vcons-close.c: Likewise.
* libcons/vcons-input.c: Likewise.
* libcons/vcons-move-mouse.c: Likewise.
* libcons/vcons-open.c: Likewise.
* libcons/vcons-scrollback.c: Likewise.
* libdiskfs/Makefile: Likewise.
* libdiskfs/boot-start.c: Likewise.
* libdiskfs/dead-name.c: Likewise.
* libdiskfs/dir-chg.c: Likewise.
* libdiskfs/dir-link.c: Likewise.
* libdiskfs/dir-lookup.c: Likewise.
* libdiskfs/dir-mkdir.c: Likewise.
* libdiskfs/dir-mkfile.c: Likewise.
* libdiskfs/dir-readdir.c: Likewise.
* libdiskfs/dir-rename.c: Likewise.
* libdiskfs/dir-renamed.c: Likewise.
* libdiskfs/dir-rmdir.c: Likewise.
* libdiskfs/dir-unlink.c: Likewise.
* libdiskfs/disk-pager.c: Likewise.
* libdiskfs/diskfs-pager.h: Likewise.
* libdiskfs/diskfs.h: Likewise.
* libdiskfs/file-access.c: Likewise.
* libdiskfs/file-chg.c: Likewise.
* libdiskfs/file-exec.c: Likewise.
* libdiskfs/file-get-fs-opts.c: Likewise.
* libdiskfs/file-get-trans.c: Likewise.
* libdiskfs/file-get-transcntl.c: Likewise.
* libdiskfs/file-getcontrol.c: Likewise.
* libdiskfs/file-getfh.c: Likewise.
* libdiskfs/file-lock-stat.c: Likewise.
* libdiskfs/file-lock.c: Likewise.
* libdiskfs/file-reparent.c: Likewise.
* libdiskfs/file-set-trans.c: Likewise.
* libdiskfs/file-sync.c: Likewise.
* libdiskfs/file-syncfs.c: Likewise.
* libdiskfs/fsys-getroot.c: Likewise.
* libdiskfs/fsys-options.c: Likewise.
* libdiskfs/fsys-syncfs.c: Likewise.
* libdiskfs/ifsock.c: Likewise.
* libdiskfs/init-first.c: Likewise.
* libdiskfs/init-init.c: Likewise.
* libdiskfs/init-startup.c: Likewise.
* libdiskfs/io-duplicate.c: Likewise.
* libdiskfs/io-get-conch.c: Likewise.
* libdiskfs/io-identity.c: Likewise.
* libdiskfs/io-map-cntl.c: Likewise.
* libdiskfs/io-map.c: Likewise.
* libdiskfs/io-modes-get.c: Likewise.
* libdiskfs/io-modes-off.c: Likewise.
* libdiskfs/io-modes-on.c: Likewise.
* libdiskfs/io-modes-set.c: Likewise.
* libdiskfs/io-owner-get.c: Likewise.
* libdiskfs/io-owner-mod.c: Likewise.
* libdiskfs/io-prenotify.c: Likewise.
* libdiskfs/io-read.c: Likewise.
* libdiskfs/io-readable.c: Likewise.
* libdiskfs/io-reauthenticate.c: Likewise.
* libdiskfs/io-rel-conch.c: Likewise.
* libdiskfs/io-restrict-auth.c: Likewise.
* libdiskfs/io-revoke.c: Likewise.
* libdiskfs/io-seek.c: Likewise.
* libdiskfs/io-sigio.c: Likewise.
* libdiskfs/io-stat.c: Likewise.
* libdiskfs/io-write.c: Likewise.
* libdiskfs/lookup.c: Likewise.
* libdiskfs/name-cache.c: Likewise.
* libdiskfs/node-drop.c: Likewise.
* libdiskfs/node-make.c: Likewise.
* libdiskfs/node-nput.c: Likewise.
* libdiskfs/node-nputl.c: Likewise.
* libdiskfs/node-nref.c: Likewise.
* libdiskfs/node-nrefl.c: Likewise.
* libdiskfs/node-nrele.c: Likewise.
* libdiskfs/node-nrelel.c: Likewise.
* libdiskfs/peropen-rele.c: Likewise.
* libdiskfs/priv.h: Likewise.
* libdiskfs/shutdown.c: Likewise.
* libdiskfs/sync-interval.c: Likewise.
* libfshelp/Makefile: Likewise.
* libfshelp/fetch-root.c: Likewise.
* libfshelp/fshelp.h: Likewise.
* libfshelp/get-identity.c: Likewise.
* libfshelp/lock-acquire.c: Likewise.
* libfshelp/lock-init.c: Likewise.
* libfshelp/locks.h: Likewise.
* libfshelp/set-active.c: Likewise.
* libfshelp/trans.h: Likewise.
* libfshelp/transbox-init.c: Likewise.
* libiohelp/Makefile: Likewise.
* libiohelp/get_conch.c: Likewise.
* libiohelp/handle_io_release_conch.c: Likewise.
* libiohelp/initialize_conch.c: Likewise.
* libiohelp/iohelp.h: Likewise.
* libiohelp/verify_user_conch.c: Likewise.
* libnetfs/Makefile: Likewise.
* libnetfs/dir-lookup.c: Likewise.
* libnetfs/dir-mkdir.c: Likewise.
* libnetfs/dir-mkfile.c: Likewise.
* libnetfs/dir-readdir.c: Likewise.
* libnetfs/dir-rmdir.c: Likewise.
* libnetfs/dir-unlink.c: Likewise.
* libnetfs/drop-node.c: Likewise.
* libnetfs/file-chauthor.c: Likewise.
* libnetfs/file-check-access.c: Likewise.
* libnetfs/file-chflags.c: Likewise.
* libnetfs/file-chmod.c: Likewise.
* libnetfs/file-chown.c: Likewise.
* libnetfs/file-exec.c: Likewise.
* libnetfs/file-get-storage-info.c: Likewise.
* libnetfs/file-get-translator.c: Likewise.
* libnetfs/file-lock-stat.c: Likewise.
* libnetfs/file-lock.c: Likewise.
* libnetfs/file-reparent.c: Likewise.
* libnetfs/file-set-size.c: Likewise.
* libnetfs/file-set-translator.c: Likewise.
* libnetfs/file-statfs.c: Likewise.
* libnetfs/file-sync.c: Likewise.
* libnetfs/file-syncfs.c: Likewise.
* libnetfs/file-utimes.c: Likewise.
* libnetfs/fsys-getroot.c: Likewise.
* libnetfs/fsys-set-options.c: Likewise.
* libnetfs/init-init.c: Likewise.
* libnetfs/io-clear-some-openmodes.c: Likewise.
* libnetfs/io-duplicate.c: Likewise.
* libnetfs/io-get-openmodes.c: Likewise.
* libnetfs/io-get-owner.c: Likewise.
* libnetfs/io-identity.c: Likewise.
* libnetfs/io-mod-owner.c: Likewise.
* libnetfs/io-read.c: Likewise.
* libnetfs/io-readable.c: Likewise.
* libnetfs/io-reauthenticate.c: Likewise.
* libnetfs/io-restrict-auth.c: Likewise.
* libnetfs/io-revoke.c: Likewise.
* libnetfs/io-seek.c: Likewise.
* libnetfs/io-set-all-openmodes.c: Likewise.
* libnetfs/io-set-some-openmodes.c: Likewise.
* libnetfs/io-stat.c: Likewise.
* libnetfs/io-write.c: Likewise.
* libnetfs/make-node.c: Likewise.
* libnetfs/netfs.h: Likewise.
* libnetfs/nput.c: Likewise.
* libnetfs/nref.c: Likewise.
* libnetfs/nrele.c: Likewise.
* libnetfs/release-peropen.c: Likewise.
* libnetfs/shutdown.c: Likewise.
* libpager/Makefile: Likewise.
* libpager/chg-compl.c: Likewise.
* libpager/clean.c: Likewise.
* libpager/data-request.c: Likewise.
* libpager/data-return.c: Likewise.
* libpager/data-unlock.c: Likewise.
* libpager/inhibit-term.c: Likewise.
* libpager/lock-completed.c: Likewise.
* libpager/lock-object.c: Likewise.
* libpager/mark-error.c: Likewise.
* libpager/no-senders.c: Likewise.
* libpager/object-init.c: Likewise.
* libpager/object-terminate.c: Likewise.
* libpager/offer-page.c: Likewise.
* libpager/pager-attr.c: Likewise.
* libpager/pager-create.c: Likewise.
* libpager/pager-shutdown.c: Likewise.
* libpager/priv.h: Likewise.
* libpager/seqnos.c: Likewise.
* libpipe/Makefile: Likewise.
* libpipe/pipe.c: Likewise.
* libpipe/pipe.h: Likewise.
* libports/Makefile: Likewise.
* libports/begin-rpc.c: Likewise.
* libports/bucket-iterate.c: Likewise.
* libports/claim-right.c: Likewise.
* libports/class-iterate.c: Likewise.
* libports/complete-deallocate.c: Likewise.
* libports/count-bucket.c: Likewise.
* libports/count-class.c: Likewise.
* libports/create-bucket.c: Likewise.
* libports/create-internal.c: Likewise.
* libports/destroy-right.c: Likewise.
* libports/enable-bucket.c: Likewise.
* libports/enable-class.c: Likewise.
* libports/end-rpc.c: Likewise.
* libports/get-right.c: Likewise.
* libports/import-port.c: Likewise.
* libports/inhibit-all-rpcs.c: Likewise.
* libports/inhibit-bucket-rpcs.c: Likewise.
* libports/inhibit-class-rpcs.c: Likewise.
* libports/inhibit-port-rpcs.c: Likewise.
* libports/init.c: Likewise.
* libports/interrupt-notified-rpcs.c: Likewise.
* libports/interrupt-on-notify.c: Likewise.
* libports/interrupt-operation.c: Likewise.
* libports/interrupt-rpcs.c: Likewise.
* libports/interrupted.c: Likewise.
* libports/lookup-port.c: Likewise.
* libports/manage-multithread.c: Likewise.
* libports/no-senders.c: Likewise.
* libports/port-deref-weak.c: Likewise.
* libports/port-deref.c: Likewise.
* libports/port-ref-weak.c: Likewise.
* libports/port-ref.c: Likewise.
* libports/ports.h: Likewise.
* libports/reallocate-from-external.c: Likewise.
* libports/reallocate-port.c: Likewise.
* libports/resume-all-rpcs.c: Likewise.
* libports/resume-bucket-rpcs.c: Likewise.
* libports/resume-class-rpcs.c: Likewise.
* libports/resume-port-rpcs.c: Likewise.
* libports/stubs.c: Likewise.
* libports/transfer-right.c: Likewise.
* libstore/Makefile: Likewise.
* libstore/gunzip.c: Likewise.
* libstore/part.c: Likewise.
* libstore/unzipstore.c: Likewise.
* libthreads/Makefile: Likewise.
* libtreefs/dir-lookup.c: Likewise.
* libtreefs/fsys-getroot.c: Likewise.
* libtreefs/fsys-hooks.c: Likewise.
* libtreefs/fsys.c: Likewise.
* libtreefs/trans-help.c: Likewise.
* libtreefs/trans-start.c: Likewise.
* libtreefs/treefs.h: Likewise.
* libtrivfs/cntl-create.c: Likewise.
* libtrivfs/dyn-classes.c: Likewise.
* libtrivfs/io-reauthenticate.c: Likewise.
* libtrivfs/io-restrict-auth.c: Likewise.
* libtrivfs/protid-clean.c: Likewise.
* libtrivfs/protid-dup.c: Likewise.
* libtrivfs/trivfs.h: Likewise.
* mach-defpager/Makefile: Likewise.
* mach-defpager/default_pager.c: Likewise.
* mach-defpager/kalloc.c: Likewise.
* mach-defpager/main.c: Likewise.
* nfs/Makefile: Likewise.
* nfs/cache.c: Likewise.
* nfs/main.c: Likewise.
* nfs/mount.c: Likewise.
* nfs/name-cache.c: Likewise.
* nfs/nfs.h: Likewise.
* nfs/ops.c: Likewise.
* nfs/rpc.c: Likewise.
* nfsd/Makefile: Likewise.
* nfsd/cache.c: Likewise.
* nfsd/loop.c: Likewise.
* nfsd/main.c: Likewise.
* nfsd/nfsd.h: Likewise.
* pfinet/Makefile: Likewise.
* pfinet/ethernet.c: Likewise.
* pfinet/glue-include/asm/spinlock.h: Likewise.
* pfinet/glue-include/linux/interrupt.h: Likewise.
* pfinet/glue-include/linux/sched.h: Likewise.
* pfinet/glue-include/linux/timer.h: Likewise.
* pfinet/glue-include/linux/wait.h: Likewise.
* pfinet/iioctl-ops.c: Likewise.
* pfinet/io-ops.c: Likewise.
* pfinet/kmem_cache.c: Likewise.
* pfinet/main.c: Likewise.
* pfinet/options.c: Likewise.
* pfinet/pfinet-ops.c: Likewise.
* pfinet/pfinet.h: Likewise.
* pfinet/sched.c: Likewise.
* pfinet/socket-ops.c: Likewise.
* pfinet/socket.c: Likewise.
* pfinet/timer-emul.c: Likewise.
* pfinet/tunnel.c: Likewise.
* pflocal/Makefile: Likewise.
* pflocal/connq.c: Likewise.
* pflocal/io.c: Likewise.
* pflocal/sock.c: Likewise.
* pflocal/sock.h: Likewise.
* pflocal/socket.c: Likewise.
* pflocal/sserver.c: Likewise.
* proc/Makefile: Likewise.
* proc/info.c: Likewise.
* proc/main.c: Likewise.
* proc/mgt.c: Likewise.
* proc/msg.c: Likewise.
* proc/proc.h: Likewise.
* proc/stubs.c: Likewise.
* proc/wait.c: Likewise.
* storeio/Makefile: Likewise.
* storeio/dev.c: Likewise.
* storeio/dev.h: Likewise.
* storeio/open.c: Likewise.
* storeio/open.h: Likewise.
* storeio/pager.c: Likewise.
* storeio/storeio.c: Likewise.
* term/Makefile: Likewise.
* term/devio.c: Likewise.
* term/hurdio.c: Likewise.
* term/main.c: Likewise.
* term/munge.c: Likewise.
* term/ptyio.c: Likewise.
* term/term.h: Likewise.
* term/users.c: Likewise.
* tmpfs/Makefile: Likewise.
* tmpfs/dir.c: Likewise.
* tmpfs/node.c: Likewise.
* tmpfs/tmpfs.c: Likewise.
* tmpfs/tmpfs.h: Likewise.
* trans/Makefile: Likewise.
* trans/fakeroot.c: Likewise.
* trans/fifo.c: Likewise.
* trans/hello-mt.c: Likewise.
* trans/new-fifo.c: Likewise.
* trans/streamio.c: Likewise.
* ufs/Makefile: Likewise.
* ufs/alloc.c: Likewise.
* ufs/dir.c: Likewise.
* ufs/hyper.c: Likewise.
* ufs/inode.c: Likewise.
* ufs/main.c: Likewise.
* ufs/pager.c: Likewise.
* ufs/pokeloc.c: Likewise.
* ufs/sizes.c: Likewise.
* ufs/ufs.h: Likewise.
* usermux/Makefile: Likewise.
* usermux/mux.c: Likewise.
* usermux/node.c: Likewise.
* usermux/usermux.h: Likewise.
* utils/Makefile: Likewise.
* utils/fakeauth.c: Likewise.
* utils/rpctrace.c: Likewise.

19 files changed, 61 insertions, 59 deletions

diff --git a/libpager/Makefile b/libpager/Makefile
index 40eed16f..4d635b17 100644
--- a/libpager/Makefile
+++ b/libpager/Makefile
@@ -27,7 +27,8 @@ SRCS = data-request.c data-return.c data-unlock.c pager-port.c \
 	offer-page.c
 installhdrs = pager.h
 
-HURDLIBS= threads ports
+HURDLIBS= ports
+LDLIBS += -lpthread
 OBJS = $(SRCS:.c=.o) memory_objectServer.o notifyServer.o
 
 MIGSFLAGS = -DSEQNOS
diff --git a/libpager/chg-compl.c b/libpager/chg-compl.c
index 7d3994b0..890e89b8 100644
--- a/libpager/chg-compl.c
+++ b/libpager/chg-compl.c
@@ -37,19 +37,19 @@ _pager_seqnos_memory_object_change_completed (mach_port_t obj,
       return EOPNOTSUPP;
     }
   
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seq);
 
   for (ar = p->attribute_requests; ar; ar = ar->next)
     if (ar->may_cache == maycache && ar->copy_strategy == strat)
       {
 	if (ar->attrs_pending && !--ar->attrs_pending)
-	  condition_broadcast (&p->wakeup);
+	  pthread_cond_broadcast (&p->wakeup);
 	break;
       }
   
   _pager_release_seqno (p, seq);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
   return 0;
 }
diff --git a/libpager/clean.c b/libpager/clean.c
index e891617f..031f7d1b 100644
--- a/libpager/clean.c
+++ b/libpager/clean.c
@@ -32,7 +32,7 @@ _pager_clean (void *arg)
 
   if (p->pager_state != NOTINIT)
     {
-      mutex_lock (&p->interlock);
+      pthread_mutex_lock (&p->interlock);
       _pager_free_structure (p);
 #ifdef KERNEL_INIT_RACE
       for (i = p->init_head; i; i = tmp)
@@ -43,7 +43,7 @@ _pager_clean (void *arg)
 	  free (i);
 	}
 #endif
-      mutex_unlock (&p->interlock);
+      pthread_mutex_unlock (&p->interlock);
     }
 
   pager_clear_user_data (p->upi);
diff --git a/libpager/data-request.c b/libpager/data-request.c
index 36725b11..4454facb 100644
--- a/libpager/data-request.c
+++ b/libpager/data-request.c
@@ -41,7 +41,7 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
     return EOPNOTSUPP;
 
   /* Acquire the right to meddle with the pagemap */
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
 
   /* sanity checks -- we don't do multi-page requests yet.  */
@@ -107,7 +107,7 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
 
   /* Let someone else in.  */
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 
   if (!doread)
     goto allow_term_out;
@@ -121,10 +121,10 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
   memory_object_data_supply (p->memobjcntl, offset, page, length, 1,
 			     write_lock ? VM_PROT_WRITE : VM_PROT_NONE, 0,
 			     MACH_PORT_NULL);
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_mark_object_error (p, offset, length, 0);
   _pager_allow_termination (p);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
   return 0;
 
@@ -132,9 +132,9 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
   memory_object_data_error (p->memobjcntl, offset, length, EIO);
   _pager_mark_object_error (p, offset, length, EIO);
  allow_term_out:
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_allow_termination (p);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
   return 0;
 
@@ -142,7 +142,7 @@ _pager_seqnos_memory_object_data_request (mach_port_t object,
   _pager_allow_termination (p);
  release_out:
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
   return 0;
 }
diff --git a/libpager/data-return.c b/libpager/data-return.c
index a010c6dc..c70f0e8d 100644
--- a/libpager/data-return.c
+++ b/libpager/data-return.c
@@ -51,7 +51,7 @@ _pager_do_write_request (mach_port_t object,
     return EOPNOTSUPP;
 
   /* Acquire the right to meddle with the pagemap */
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
 
   /* sanity checks -- we don't do multi-page requests yet.  */
@@ -100,7 +100,7 @@ _pager_do_write_request (mach_port_t object,
     if (pm_entries[i] & PM_PAGINGOUT)
       {
 	pm_entries[i] |= PM_WRITEWAIT;
-	condition_wait (&p->wakeup, &p->interlock);
+	pthread_cond_wait (&p->wakeup, &p->interlock);
 	goto retry;
       }
 
@@ -143,7 +143,7 @@ _pager_do_write_request (mach_port_t object,
 
   /* Let someone else in. */
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 
   /* This is inefficient; we should send all the pages to the device at once
      but until the pager library interface is changed, this will have to do. */
@@ -155,7 +155,7 @@ _pager_do_write_request (mach_port_t object,
 				     data + (vm_page_size * i));
 
   /* Acquire the right to meddle with the pagemap */
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_pagemap_resize (p, offset + length);
   pm_entries = &p->pagemap[offset / __vm_page_size];
 
@@ -196,18 +196,18 @@ _pager_do_write_request (mach_port_t object,
       wakeup = 1;
 
   if (wakeup)
-    condition_broadcast (&p->wakeup);
+    pthread_cond_broadcast (&p->wakeup);
 
   _pager_allow_termination (p);
 
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 
   ports_port_deref (p);
   return 0;
 
  release_out:
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
   return 0;
 }
diff --git a/libpager/data-unlock.c b/libpager/data-unlock.c
index 9692f589..02339abb 100644
--- a/libpager/data-unlock.c
+++ b/libpager/data-unlock.c
@@ -36,10 +36,10 @@ _pager_seqnos_memory_object_data_unlock (mach_port_t object,
   if (!p)
     return EOPNOTSUPP;
 
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 
   if (p->pager_state != NORMAL)
     {
diff --git a/libpager/inhibit-term.c b/libpager/inhibit-term.c
index 222bad5e..3f1e2ffe 100644
--- a/libpager/inhibit-term.c
+++ b/libpager/inhibit-term.c
@@ -31,5 +31,5 @@ void
 _pager_allow_termination (struct pager *p)
 {
   if (!--p->noterm && p->termwaiting)
-    condition_broadcast (&p->wakeup);
+    pthread_cond_broadcast (&p->wakeup);
 }
diff --git a/libpager/lock-completed.c b/libpager/lock-completed.c
index 1810959f..9ab640fe 100644
--- a/libpager/lock-completed.c
+++ b/libpager/lock-completed.c
@@ -37,7 +37,7 @@ _pager_seqnos_memory_object_lock_completed (mach_port_t object,
   if (!p)
     return EOPNOTSUPP;
 
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
 
   if (control != p->memobjcntl)
@@ -55,13 +55,13 @@ _pager_seqnos_memory_object_lock_completed (mach_port_t object,
 	if (lr->locks_pending)
 	  --lr->locks_pending;
 	if (!lr->locks_pending && !lr->pending_writes)
-	  condition_broadcast (&p->wakeup);
+	  pthread_cond_broadcast (&p->wakeup);
 	break;
       }
       
  out:
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
 
   return err;
diff --git a/libpager/lock-object.c b/libpager/lock-object.c
index d8d4a1b7..93c89f07 100644
--- a/libpager/lock-object.c
+++ b/libpager/lock-object.c
@@ -33,10 +33,10 @@ _pager_lock_object (struct pager *p,
   int i;
   struct lock_request *lr = 0;
 
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   if (p->pager_state != NORMAL)
     {
-      mutex_unlock (&p->interlock);
+      pthread_mutex_unlock (&p->interlock);
       return;
     }
 
@@ -74,7 +74,7 @@ _pager_lock_object (struct pager *p,
   if (sync)
     {
       while (lr->locks_pending || lr->pending_writes)
-	condition_wait (&p->wakeup, &p->interlock);
+	pthread_cond_wait (&p->wakeup, &p->interlock);
   
       if (! --lr->threads_waiting)
 	{
@@ -103,5 +103,5 @@ _pager_lock_object (struct pager *p,
 	}
     }
 
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 }
diff --git a/libpager/mark-error.c b/libpager/mark-error.c
index 5c4e029d..48ceb950 100644
--- a/libpager/mark-error.c
+++ b/libpager/mark-error.c
@@ -103,7 +103,7 @@ pager_get_error (struct pager *p, vm_address_t addr)
 {
   error_t err;
   
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
 
   addr /= vm_page_size;
 
@@ -116,7 +116,7 @@ pager_get_error (struct pager *p, vm_address_t addr)
   if (! err)
     err = _pager_page_errors[PM_ERROR(p->pagemap[addr])];
 
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 
   return err;
 }
diff --git a/libpager/no-senders.c b/libpager/no-senders.c
index 3c2400c4..223cadd2 100644
--- a/libpager/no-senders.c
+++ b/libpager/no-senders.c
@@ -29,10 +29,10 @@ _pager_do_seqnos_mach_notify_no_senders (mach_port_t notify,
   if (!p)
     return EOPNOTSUPP;
   
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   
   ports_no_senders (p, mscount);
 
diff --git a/libpager/object-init.c b/libpager/object-init.c
index eeb50993..90ffc016 100644
--- a/libpager/object-init.c
+++ b/libpager/object-init.c
@@ -34,7 +34,7 @@ _pager_seqnos_memory_object_init (mach_port_t object,
   if (!p)
     return EOPNOTSUPP;
 
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
 
   if (pagesize != __vm_page_size)
@@ -72,7 +72,7 @@ _pager_seqnos_memory_object_init (mach_port_t object,
 
  out:
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
 
   return 0;
diff --git a/libpager/object-terminate.c b/libpager/object-terminate.c
index dc53541c..896e2c20 100644
--- a/libpager/object-terminate.c
+++ b/libpager/object-terminate.c
@@ -33,7 +33,7 @@ _pager_seqnos_memory_object_terminate (mach_port_t object,
   if (!p)
     return EOPNOTSUPP;
 
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   _pager_wait_for_seqno (p, seqno);
   
   if (control != p->memobjcntl)
@@ -50,7 +50,7 @@ _pager_seqnos_memory_object_terminate (mach_port_t object,
   while (p->noterm)
     {
       p->termwaiting = 1;
-      condition_wait (&p->wakeup, &p->interlock);
+      pthread_cond_wait (&p->wakeup, &p->interlock);
     }
 
   /* Destry the ports we received; mark that in P so that it doesn't bother
@@ -78,7 +78,7 @@ _pager_seqnos_memory_object_terminate (mach_port_t object,
 
  out:
   _pager_release_seqno (p, seqno);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
   ports_port_deref (p);
 
   return 0;
@@ -108,7 +108,7 @@ _pager_free_structure (struct pager *p)
     }
 
   if (wakeup)
-    condition_broadcast (&p->wakeup);
+    pthread_cond_broadcast (&p->wakeup);
 
   if (p->memobjcntl != MACH_PORT_NULL)
     {
diff --git a/libpager/offer-page.c b/libpager/offer-page.c
index aed22197..ef58c4b0 100644
--- a/libpager/offer-page.c
+++ b/libpager/offer-page.c
@@ -28,7 +28,7 @@ pager_offer_page (struct pager *p,
 		  vm_offset_t offset,
 		  vm_address_t buf)
 {
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
 
   if (_pager_pagemap_resize (p, offset + vm_page_size))
     {
@@ -36,9 +36,9 @@ pager_offer_page (struct pager *p,
 
       while (*pm_entry & PM_INCORE)
 	{
-	  mutex_unlock (&p->interlock);
+	  pthread_mutex_unlock (&p->interlock);
 	  pager_flush_some (p, offset, vm_page_size, 1);
-	  mutex_lock (&p->interlock);
+	  pthread_mutex_lock (&p->interlock);
 	}
       *pm_entry |= PM_INCORE;
 
@@ -47,6 +47,6 @@ pager_offer_page (struct pager *p,
 				 precious, MACH_PORT_NULL);
     }
 
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 }
 
diff --git a/libpager/pager-attr.c b/libpager/pager-attr.c
index cbc1533f..7629f1dc 100644
--- a/libpager/pager-attr.c
+++ b/libpager/pager-attr.c
@@ -30,7 +30,7 @@ pager_change_attributes (struct pager *p,
 {
   struct attribute_request *ar = 0;
   
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
 
   /* If there's nothing to do we might be able to return.  However,
      if the user asked us to wait, and there are pending changes,
@@ -39,7 +39,7 @@ pager_change_attributes (struct pager *p,
   if (p->may_cache == may_cache && p->copy_strategy == copy_strategy
       && ! (p->attribute_requests && wait))
     {
-      mutex_unlock (&p->interlock);
+      pthread_mutex_unlock (&p->interlock);
       return;
     }
 
@@ -48,7 +48,7 @@ pager_change_attributes (struct pager *p,
   
   if (p->pager_state == NOTINIT)
     {
-      mutex_unlock (&p->interlock);
+      pthread_mutex_unlock (&p->interlock);
       return;
     }
 
@@ -83,7 +83,7 @@ pager_change_attributes (struct pager *p,
   if (wait)
     {
       while (ar->attrs_pending)
-	condition_wait (&p->wakeup, &p->interlock);
+	pthread_cond_wait (&p->wakeup, &p->interlock);
 
       if (! --ar->threads_waiting)
 	{
@@ -94,5 +94,5 @@ pager_change_attributes (struct pager *p,
 	}
     }
   
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 }
diff --git a/libpager/pager-create.c b/libpager/pager-create.c
index 26d1aad2..318c9f15 100644
--- a/libpager/pager-create.c
+++ b/libpager/pager-create.c
@@ -32,8 +32,8 @@ pager_create (struct user_pager_info *upi,
 
   p->upi = upi;
   p->pager_state = NOTINIT;
-  mutex_init (&p->interlock);
-  condition_init (&p->wakeup);
+  pthread_mutex_init (&p->interlock, NULL);
+  pthread_cond_init (&p->wakeup, NULL);
   p->lock_requests = 0;
   p->attribute_requests = 0;
   p->may_cache = may_cache;
diff --git a/libpager/pager-shutdown.c b/libpager/pager-shutdown.c
index b729b3f2..86c70af0 100644
--- a/libpager/pager-shutdown.c
+++ b/libpager/pager-shutdown.c
@@ -25,9 +25,9 @@ pager_shutdown (struct pager *p)
   /* Sync and flush pager */
   pager_sync (p, 1);
   pager_flush (p, 1);
-  mutex_lock (&p->interlock);
+  pthread_mutex_lock (&p->interlock);
   p->pager_state = SHUTDOWN;
   ports_destroy_right (p);
-  mutex_unlock (&p->interlock);
+  pthread_mutex_unlock (&p->interlock);
 }
 
diff --git a/libpager/priv.h b/libpager/priv.h
index f68c6092..e6b2546b 100644
--- a/libpager/priv.h
+++ b/libpager/priv.h
@@ -21,6 +21,7 @@
 #include <mach.h>
 #include <hurd.h>
 #include <sys/mman.h>
+#include <pthread.h>
 #include "pager.h"
 #include <hurd/ports.h>
 
@@ -40,8 +41,8 @@ struct pager
       SHUTDOWN,			/* ignore all further requests */
     } pager_state;
 
-  struct mutex interlock;
-  struct condition wakeup;
+  pthread_mutex_t interlock;
+  pthread_cond_t wakeup;
 
   struct lock_request *lock_requests; /* pending lock requests */
   struct attribute_request *attribute_requests; /* pending attr requests */
diff --git a/libpager/seqnos.c b/libpager/seqnos.c
index 7d8bcba7..77bfbf21 100644
--- a/libpager/seqnos.c
+++ b/libpager/seqnos.c
@@ -28,7 +28,7 @@ _pager_wait_for_seqno (struct pager *p,
   while (seqno != p->seqno + 1)
     {
       p->waitingforseqno = 1;
-      condition_wait (&p->wakeup, &p->interlock);
+      pthread_cond_wait (&p->wakeup, &p->interlock);
     }
 }
 
@@ -44,7 +44,7 @@ _pager_release_seqno (struct pager *p,
   if (p->waitingforseqno)
     {
       p->waitingforseqno = 0;
-      condition_broadcast (&p->wakeup);
+      pthread_cond_broadcast (&p->wakeup);
     }
 }
 
@@ -59,10 +59,10 @@ _pager_update_seqno (mach_port_t object,
   p = ports_lookup_port (0, object, _pager_class);
   if (p)
     {
-      mutex_lock (&p->interlock);
+      pthread_mutex_lock (&p->interlock);
       _pager_wait_for_seqno (p, seqno);
       _pager_release_seqno (p, seqno);
-      mutex_unlock (&p->interlock);
+      pthread_mutex_unlock (&p->interlock);
 
       ports_port_deref (p);
     }