From 51ad68ca2dc312183239c0c5b885cbd8b08ca376 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sun, 15 Nov 1998 15:33:52 +0000
Subject: Finished updating module event handlers to be compatible with
 modeventhand_t.

---
 sys/alpha/linux/linux_sysvec.c  | 10 ++--------
 sys/coda/coda_fbsd.c            |  4 ++--
 sys/fs/coda/coda_fbsd.c         |  4 ++--
 sys/fs/unionfs/union_subr.c     |  5 +++--
 sys/gnu/i386/fpemul/fpu_entry.c |  4 ++--
 sys/i386/i386/math_emulate.c    |  4 ++--
 sys/i386/ibcs2/ibcs2_sysvec.c   |  4 ++--
 sys/i386/linux/linux_sysvec.c   | 10 ++--------
 sys/miscfs/union/union_subr.c   |  5 +++--
 sys/netinet/ip_fw.c             |  4 ++--
 sys/sys/exec.h                  |  5 ++---
 11 files changed, 24 insertions(+), 35 deletions(-)

(limited to 'sys')

diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index cf8c021..b088f0f 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.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_sysvec.c,v 1.36 1998/10/11 21:08:02 alex Exp $
+ *  $Id: linux_sysvec.c,v 1.37 1998/10/16 03:55:00 peter Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -448,14 +448,8 @@ Elf32_Brandinfo *linux_brandlist[] = {
 					NULL
 				};
 
-/*
- * XXX: this is WRONG, it needs to be SI_SUB_EXEC, but this is just at the
- * "proof of concept" stage and will be fixed shortly
- */
-static int linux_elf_modevent __P((module_t mod, modeventtype_t type, void *data));
-
 static int
-linux_elf_modevent(module_t mod, modeventtype_t type, void *data)
+linux_elf_modevent(module_t mod, int type, void *data)
 {
 	Elf32_Brandinfo **brandinfo;
 	int error;
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index ef548b5..57512de 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.7 1998/09/29 20:19:45 rvb Exp $
+ *  $Id: coda_fbsd.c,v 1.8 1998/11/03 08:55:05 peter Exp $
  * 
  */
 
@@ -90,7 +90,7 @@ int     vcdebug = 1;
 #if !defined(VFS_LKM) || defined(VFS_KLD)
 
 static int
-codadev_modevent(module_t mod, modeventtype_t type, void *data)
+codadev_modevent(module_t mod, int type, void *data)
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index ef548b5..57512de 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.7 1998/09/29 20:19:45 rvb Exp $
+ *  $Id: coda_fbsd.c,v 1.8 1998/11/03 08:55:05 peter Exp $
  * 
  */
 
@@ -90,7 +90,7 @@ int     vcdebug = 1;
 #if !defined(VFS_LKM) || defined(VFS_KLD)
 
 static int
-codadev_modevent(module_t mod, modeventtype_t type, void *data)
+codadev_modevent(module_t mod, int type, void *data)
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 96df62d..18d79b5 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.31 1998/07/15 04:17:44 bde Exp $
+ * $Id: union_subr.c,v 1.32 1998/11/03 08:01:48 peter Exp $
  */
 
 #include <sys/param.h>
@@ -1196,7 +1196,8 @@ union_dircheck(struct proc *p, struct vnode **vp, struct file *fp)
 	return error;
 }
 
-static int union_modevent(module_t mod, modeventtype_t type, void *data)
+static int
+union_modevent(module_t mod, int type, void *data)
 {
 	switch (type) {
 	case MOD_LOAD:
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 5128865..8482c2a 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
  *
  * W. Metzenthen   June 1994.
  *
- *  $Id: fpu_entry.c,v 1.16 1998/10/18 04:36:58 peter Exp $
+ *  $Id: fpu_entry.c,v 1.17 1998/10/18 07:44:33 peter Exp $
  *
  */
 
@@ -516,7 +516,7 @@ gnufpu_mod(struct lkm_table *lkmtp, int cmd, int ver)
 #else /* !LKM */
 
 static int
-gnufpu_modevent(module_t mod, modeventtype_t type, void *unused) 
+gnufpu_modevent(module_t mod, int type, void *unused) 
 {
 	switch (type) {
 	case MOD_LOAD:
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index 0e80743..56714bb 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
  * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
  *
  *	from: 386BSD 0.1
- *	$Id: math_emulate.c,v 1.29 1998/10/18 07:40:29 peter Exp $
+ *	$Id: math_emulate.c,v 1.30 1998/10/21 17:10:49 rnordier Exp $
  */
 
 /*
@@ -1575,7 +1575,7 @@ fpu_mod(struct lkm_table *lkmtp, int cmd, int ver)
 #else /* !LKM */
 
 static int
-fpu_modevent(module_t mod, modeventtype_t type, void *unused)
+fpu_modevent(module_t mod, int type, void *unused)
 {
 	switch (type) {
 	case MOD_LOAD:
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index ac22f32..5340962 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.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_sysvec.c,v 1.9 1998/11/06 16:00:47 peter Exp $
+ * $Id: ibcs2_sysvec.c,v 1.10 1998/11/07 04:34:02 peter Exp $
  */
 
 #include <sys/param.h>
@@ -67,7 +67,7 @@ struct sysentvec ibcs2_svr3_sysvec = {
  * the presence of the subsystem.
  */
 static int
-ibcs2_modevent(module_t mod, modeventtype_t type, void *unused)
+ibcs2_modevent(module_t mod, int type, void *unused)
 {
 	/* Do not care */
 	return 0;
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index cf8c021..b088f0f 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.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_sysvec.c,v 1.36 1998/10/11 21:08:02 alex Exp $
+ *  $Id: linux_sysvec.c,v 1.37 1998/10/16 03:55:00 peter Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -448,14 +448,8 @@ Elf32_Brandinfo *linux_brandlist[] = {
 					NULL
 				};
 
-/*
- * XXX: this is WRONG, it needs to be SI_SUB_EXEC, but this is just at the
- * "proof of concept" stage and will be fixed shortly
- */
-static int linux_elf_modevent __P((module_t mod, modeventtype_t type, void *data));
-
 static int
-linux_elf_modevent(module_t mod, modeventtype_t type, void *data)
+linux_elf_modevent(module_t mod, int type, void *data)
 {
 	Elf32_Brandinfo **brandinfo;
 	int error;
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 96df62d..18d79b5 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.31 1998/07/15 04:17:44 bde Exp $
+ * $Id: union_subr.c,v 1.32 1998/11/03 08:01:48 peter Exp $
  */
 
 #include <sys/param.h>
@@ -1196,7 +1196,8 @@ union_dircheck(struct proc *p, struct vnode **vp, struct file *fp)
 	return error;
 }
 
-static int union_modevent(module_t mod, modeventtype_t type, void *data)
+static int
+union_modevent(module_t mod, int type, void *data)
 {
 	switch (type) {
 	case MOD_LOAD:
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index bf4beb4..fc31dc6 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.96 1998/08/23 03:07:14 wollman Exp $
+ *	$Id: ip_fw.c,v 1.97 1998/10/16 03:55:01 peter Exp $
  */
 
 /*
@@ -1154,7 +1154,7 @@ ipfw_mod(struct lkm_table *lkmtp, int cmd, int ver)
 }
 #else
 static int
-ipfw_modevent(module_t mod, modeventtype_t type, void *unused)
+ipfw_modevent(module_t mod, int type, void *unused)
 {
 	int s;
 	
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 3df1b15..261791a 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.18 1998/03/02 05:47:40 peter Exp $
+ * $Id: exec.h,v 1.19 1998/10/16 03:55:01 peter Exp $
  */
 
 #ifndef _SYS_EXEC_H_
@@ -85,8 +85,7 @@ int exec_unregister __P((const struct execsw *));
 #ifndef LKM
 #include <sys/module.h>
 #define EXEC_SET(name, execsw_arg) \
-	static int name ## _modevent(module_t mod, modeventtype_t type, \
-		void *data) \
+	static int name ## _modevent(module_t mod, int type, void *data) \
 	{ \
 		struct execsw *exec = (struct execsw *)data; \
 		int error = 0; \
-- 
cgit v1.1