Do a pass over the broken LKM's and update them to use the "new"

convention of having their entry point named "<modname>_mod"".
Symorder is enforcing this when the current bsd.kmod.mk is installed.

I've not tested all these, but at least they all compile now.

Reattach them to the makefile.

Note that the change that I made to symorder needs to be compiled and
installed before any LKM's will work - the last version was corrupting
the relocation tables.  A "make world" will to this, but if you
manually run a make on the lkm's you'll need to take care of it by
hand.

13 files changed, 47 insertions, 48 deletions

diff --git a/lkm/Makefile b/lkm/Makefile
index da2eda3..a859667 100644
--- a/lkm/Makefile
+++ b/lkm/Makefile
@@ -1,12 +1,8 @@
-#	$Id: Makefile,v 1.13 1995/10/10 08:23:13 swallace Exp $
+#	$Id: Makefile,v 1.14 1995/10/28 02:49:46 ache Exp $
 
-#
-# temp. disabled:
-# atapi coff ibcs2 ipfw linux syscons wcd
-#
-SUBDIR= cd9660 fdesc if_disc if_ppp if_sl if_tun \
-	kernfs msdos nfs nullfs \
-	pcic portal procfs umapfs union
+SUBDIR=	cd9660 coff fdesc ibcs2 if_disc if_ppp if_sl if_tun \
+	ipfw kernfs linux msdos nfs nullfs \
+	pcic portal procfs syscons umapfs union wcd
 #
 # Doesn't work:
 # mfs
diff --git a/lkm/coff/coff.c b/lkm/coff/coff.c
index 6a3bf9b..9dd7117 100644
--- a/lkm/coff/coff.c
+++ b/lkm/coff/coff.c
@@ -25,7 +25,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: coff.c,v 1.1 1994/10/14 08:46:12 sos Exp $
+ *	$Id: coff.c,v 1.2 1995/05/30 06:06:00 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -40,19 +40,19 @@ extern const struct execsw coff_execsw;
 
 MOD_EXEC("ibcs2_coff_mod", -1, (struct execsw*)&coff_execsw)
 
-coff_load(struct lkm_table *lkmtp, int cmd)
+ibcs2_coff_load(struct lkm_table *lkmtp, int cmd)
 {
 	uprintf("coff loader installed\n");
 	return 0;
 }
 
-coff_unload(struct lkm_table *lkmtp, int cmd)
+ibcs2_coff_unload(struct lkm_table *lkmtp, int cmd)
 {
 	uprintf("coff loader removed\n");
 	return 0;
 }
 
-coff_init(struct lkm_table *lkmtp, int cmd, int ver)
+ibcs2_coff_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, coff_load, coff_unload, nosys);
+	DISPATCH(lkmtp, cmd, ver, ibcs2_coff_load, ibcs2_coff_unload, nosys);
 }
diff --git a/lkm/ibcs2/Makefile b/lkm/ibcs2/Makefile
index 6069595..1d24244 100644
--- a/lkm/ibcs2/Makefile
+++ b/lkm/ibcs2/Makefile
@@ -10,6 +10,7 @@ SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 NOMAN=
 CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2
 CLEANFILES+= vnode_if.h vnode_if.c
+EXPORT_SYMS= _ibcs2_mod _ibcs2_emul_path _ibcs2_svr3_sysvec
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/lkm/ibcs2/ibcs2 b/lkm/ibcs2/ibcs2
index 48a4f7a..21f591e 100755
--- a/lkm/ibcs2/ibcs2
+++ b/lkm/ibcs2/ibcs2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: ibcs2,v 1.2 1994/10/16 20:39:16 sos Exp $
+# $Id: ibcs2,v 1.3 1995/10/10 08:38:11 swallace Exp $
 if [ $# -le 1 ]; then
 	LOADERS="coff" # elf
 fi
@@ -10,9 +10,11 @@ kernelfile=`sysctl -n kern.bootfile`
 kernelfile=`basename $kernelfile`
 newkernelfile="/tmp/${kernelfile}+ibcs2"
 
-modload -e ibcs2_init -o $newkernelfile -q /lkm/ibcs2_mod.o
+modload -e ibcs2_mod -o $newkernelfile -q /lkm/ibcs2_mod.o
+
 for loader in $LOADERS; do
-	modload -e${loader}_init -o/tmp/ibcs2_${loader}.o -qu \
+	modload -e ibcs2_${loader}_mod -o/tmp/ibcs2_${loader} -q -u \
 		-A${newkernelfile} /lkm/ibcs2_${loader}_mod.o
 done
+rm ${newkernelfile}
 set +e
diff --git a/lkm/ibcs2/ibcs2.c b/lkm/ibcs2/ibcs2.c
index 005e10f..b39f390 100644
--- a/lkm/ibcs2/ibcs2.c
+++ b/lkm/ibcs2/ibcs2.c
@@ -25,7 +25,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.c,v 1.3 1995/05/30 06:06:06 rgrimes Exp $
+ *	$Id: ibcs2.c,v 1.4 1995/10/10 08:20:28 swallace Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@ ibcs2_unload(struct lkm_table *lkmtp, int cmd)
 }
 
 int
-ibcs2_init(struct lkm_table *lkmtp, int cmd, int ver)
+ibcs2_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, ibcs2_load, ibcs2_unload, nosys);
 }
diff --git a/lkm/ipfw/ipfw_lkm.c b/lkm/ipfw/ipfw_lkm.c
index 73b02a5..a197766 100644
--- a/lkm/ipfw/ipfw_lkm.c
+++ b/lkm/ipfw/ipfw_lkm.c
@@ -84,7 +84,7 @@ int s=splnet();
 	return 0;
 }
 
-ipfw_init(struct lkm_table *lkmtp, int cmd, int ver)
+ipfw_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, ipfw_load, ipfw_unload, nosys);
 }
diff --git a/lkm/linux/linux b/lkm/linux/linux
index e4c3606..e4364a6 100644
--- a/lkm/linux/linux
+++ b/lkm/linux/linux
@@ -1,3 +1,3 @@
 #!/bin/sh
-# $Id$
-modload -e linux_init /lkm/linux_mod.o
+# $Id: linux,v 1.1 1995/06/25 17:29:48 sos Exp $
+modload -e linux_mod -u -q -o /tmp/linux_mod /lkm/linux_mod.o
diff --git a/lkm/linux/linux.c b/lkm/linux/linux.c
index 183ad3e..7d58664 100644
--- a/lkm/linux/linux.c
+++ b/lkm/linux/linux.c
@@ -25,7 +25,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: linux.c,v 1.1 1994/10/14 08:46:12 sos Exp $
+ *	$Id: linux.c,v 1.1 1995/06/25 17:29:48 sos Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,7 @@ linux_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-linux_init(struct lkm_table *lkmtp, int cmd, int ver)
+linux_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, linux_load, linux_unload, nosys);
 }
diff --git a/lkm/syscons/blank/blank_saver.c b/lkm/syscons/blank/blank_saver.c
index e48e037..439adc8 100644
--- a/lkm/syscons/blank/blank_saver.c
+++ b/lkm/syscons/blank/blank_saver.c
@@ -25,7 +25,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: blank_saver.c,v 1.1 1995/02/22 13:45:30 sos Exp $
+ *	$Id: blank_saver.c,v 1.2 1995/05/30 06:06:13 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@ blank_saver(int blank)
 	}
 }
 
-saver_load(struct lkm_table *lkmtp, int cmd)
+blank_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	old_saver = current_saver;
@@ -67,7 +67,7 @@ saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_unload(struct lkm_table *lkmtp, int cmd)
+blank_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
@@ -75,7 +75,7 @@ saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_init(struct lkm_table *lkmtp, int cmd, int ver)
+blank_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, saver_load, saver_unload, nosys);
+	DISPATCH(lkmtp, cmd, ver, blank_saver_load, blank_saver_unload, nosys);
 }
diff --git a/lkm/syscons/fade/fade_saver.c b/lkm/syscons/fade/fade_saver.c
index e639fca..b3dadaf 100644
--- a/lkm/syscons/fade/fade_saver.c
+++ b/lkm/syscons/fade/fade_saver.c
@@ -25,7 +25,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: fade_saver.c,v 1.1 1995/02/22 13:46:32 sos Exp $
+ *	$Id: fade_saver.c,v 1.2 1995/05/30 06:06:15 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -73,7 +73,7 @@ fade_saver(int blank)
 	}
 }
 
-saver_load(struct lkm_table *lkmtp, int cmd)
+fade_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	old_saver = current_saver;
@@ -82,7 +82,7 @@ saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_unload(struct lkm_table *lkmtp, int cmd)
+fade_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
@@ -90,7 +90,7 @@ saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_init(struct lkm_table *lkmtp, int cmd, int ver)
+fade_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, saver_load, saver_unload, nosys);
+	DISPATCH(lkmtp, cmd, ver, fade_saver_load, fade_saver_unload, nosys);
 }
diff --git a/lkm/syscons/green/green_saver.c b/lkm/syscons/green/green_saver.c
index 8dfe086..24b2a58 100644
--- a/lkm/syscons/green/green_saver.c
+++ b/lkm/syscons/green/green_saver.c
@@ -25,7 +25,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: green_saver.c,v 1.1 1995/02/22 13:47:14 sos Exp $
+ *	$Id: green_saver.c,v 1.2 1995/05/30 06:06:17 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@ green_saver(int blank)
 	}
 }
 
-saver_load(struct lkm_table *lkmtp, int cmd)
+green_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	old_saver = current_saver;
@@ -71,7 +71,7 @@ saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_unload(struct lkm_table *lkmtp, int cmd)
+green_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
@@ -79,7 +79,7 @@ saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_init(struct lkm_table *lkmtp, int cmd, int ver)
+green_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, saver_load, saver_unload, nosys);
+	DISPATCH(lkmtp, cmd, ver, green_saver_load, green_saver_unload, nosys);
 }
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index 508d764..7a44bcd 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -25,7 +25,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: snake_saver.c,v 1.4 1995/05/30 06:06:18 rgrimes Exp $
+ *	$Id: snake_saver.c,v 1.5 1995/09/04 03:02:08 peter Exp $
  */
 
 #include <sys/param.h>
@@ -99,7 +99,7 @@ snake_saver(int blank)
 	}
 }
 
-saver_load(struct lkm_table *lkmtp, int cmd)
+snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	old_saver = current_saver;
@@ -108,7 +108,7 @@ saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_unload(struct lkm_table *lkmtp, int cmd)
+snake_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
@@ -116,7 +116,7 @@ saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_init(struct lkm_table *lkmtp, int cmd, int ver)
+snake_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, saver_load, saver_unload, nosys);
+	DISPATCH(lkmtp, cmd, ver, snake_saver_load, snake_saver_unload, nosys);
 }
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index d023228..f78996b 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -25,7 +25,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: star_saver.c,v 1.2 1995/03/30 15:10:03 sos Exp $
+ *	$Id: star_saver.c,v 1.3 1995/05/30 06:06:20 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -89,7 +89,7 @@ star_saver(int blank)
 	}
 }
 
-saver_load(struct lkm_table *lkmtp, int cmd)
+star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	old_saver = current_saver;
@@ -98,7 +98,7 @@ saver_load(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_unload(struct lkm_table *lkmtp, int cmd)
+star_saver_unload(struct lkm_table *lkmtp, int cmd)
 {
 	(*current_saver)(0);
 	current_saver = old_saver;
@@ -106,7 +106,7 @@ saver_unload(struct lkm_table *lkmtp, int cmd)
 	return 0;
 }
 
-saver_init(struct lkm_table *lkmtp, int cmd, int ver)
+star_saver_mod(struct lkm_table *lkmtp, int cmd, int ver)
 {
-	DISPATCH(lkmtp, cmd, ver, saver_load, saver_unload, nosys);
+	DISPATCH(lkmtp, cmd, ver, star_saver_load, star_saver_unload, nosys);
 }