Remove remnants of cthreads

* doc/hurd.texi: Index pthread.h instead of cthreads.h
* libports/Makefile (SRCS): Drop stubs.c.
* libports/stubs.c: Remove file.
* mach-defpager/default_pager.c (default_pager): Drop disabled cthreads
calls.
* pfinet/kmem_cache.c: Fix comment.
* proc/stubs.c: Fix comments.

6 files changed, 4 insertions, 50 deletions

diff --git a/doc/hurd.texi b/doc/hurd.texi
index 77d2357a..f63cfcda 100644
--- a/doc/hurd.texi
+++ b/doc/hurd.texi
@@ -824,7 +824,7 @@ the rest of the Hurd relies upon them quite heavily.
 @node Threads Library
 @section Threads Library
 @scindex libpthread
-@scindex cthreads.h
+@scindex pthread.h
 
 All Hurd servers and libraries are aggressively multithreaded in order
 to take full advantage of any multiprocessing capabilities provided by
diff --git a/libports/Makefile b/libports/Makefile
index 78a3e366..9b483e61 100644
--- a/libports/Makefile
+++ b/libports/Makefile
@@ -30,7 +30,7 @@ SRCS = create-bucket.c create-class.c \
  resume-bucket-rpcs.c resume-all-rpcs.c interrupt-rpcs.c \
  init.c complete-deallocate.c get-right.c get-send-right.c \
  count-class.c count-bucket.c \
- enable-class.c enable-bucket.c bucket-iterate.c class-iterate.c stubs.c \
+ enable-class.c enable-bucket.c bucket-iterate.c class-iterate.c \
  notify-dead-name.c notify-no-senders.c notify-port-destroyed.c \
  notify-msg-accepted.c notify-port-deleted.c notify-send-once.c \
  interrupt-operation.c interrupt-on-notify.c interrupt-notified-rpcs.c \
diff --git a/libports/stubs.c b/libports/stubs.c
deleted file mode 100644
index de4ae4dd..00000000
--- a/libports/stubs.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Written by Michael I. Bushnell.
-
-   This file is part of the GNU Hurd.
-
-   The GNU Hurd is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2, or (at
-   your option) any later version.
-
-   The GNU Hurd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
-
-/* This file contains stubs for some cthreads functions.
-   It should only get used if the user isn't otherwise using cthreads. */
-
-#if 0
-#include <cthreads.h>
-
-void condition_wait (condition_t c, mutex_t m) __attribute__ ((weak));
-     
-void
-condition_wait (condition_t c, mutex_t m)
-{
-}
-
-void cond_broadcast (condition_t c) __attribute__ ((weak));
-
-void
-cond_broadcast (condition_t c)
-{
-}
-#endif
diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
index 58fddfa9..0596704e 100644
--- a/mach-defpager/default_pager.c
+++ b/mach-defpager/default_pager.c
@@ -3152,11 +3152,6 @@ default_pager()
 		start_default_pager_thread(FALSE);
 
 	default_pager_default_thread(0); /* Become the default_pager server */
-#if 0
-	cthread_fork (default_pager_default_thread, 0);
-	/*	cthread_exit (cthread_self ()); */
-	thread_suspend (mach_thread_self ());
-#endif
 }
 
 /*
diff --git a/pfinet/kmem_cache.c b/pfinet/kmem_cache.c
index aab192e1..4e381a0a 100644
--- a/pfinet/kmem_cache.c
+++ b/pfinet/kmem_cache.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 /* Hack replacement for Linux's kmem_cache_t allocator, using plain malloc
-   and cthreads locking.  The locking here is probably unnecessary.  */
+   and pthread locking.  The locking here is probably unnecessary.  */
 
 #include <pthread.h>
 #include <linux/malloc.h>
diff --git a/proc/stubs.c b/proc/stubs.c
index e984f234..e0ab96eb 100644
--- a/proc/stubs.c
+++ b/proc/stubs.c
@@ -40,8 +40,7 @@ struct msg_sig_post_request
   mach_port_t refport;
 };
 
-/* Send the Mach message indicated by msg_spec.   call cthread_exit
-   when it has been delivered. */
+/* Send the Mach message indicated by msg_spec.  */
 static void *
 blocking_message_send (void *arg)
 {