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.

5 files changed, 25 insertions, 25 deletions

diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index e48e037..439adc8 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/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/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index e639fca..b3dadaf 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/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/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 8dfe086..24b2a58 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/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/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 508d764..7a44bcd 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/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/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index d023228..f78996b 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/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);
 }