Module Name: src
Committed By: pgoyette
Date: Thu Sep 13 22:53:52 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: compat_09_mod.c
compat_10_mod.c compat_12_mod.c compat_13_mod.c compat_14_mod.c
compat_16_mod.c compat_30_mod.c compat_40_mod.c compat_43_mod.c
compat_50_mod.c compat_60_mod.c
Log Message:
When unloading a module with MODULE_CMD_FINI, call the compat_xx_fini()
routine rather than again calling the compat_xx_init() routine!
(Cut&paste strikes again)
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/compat/common/compat_09_mod.c \
src/sys/compat/common/compat_10_mod.c \
src/sys/compat/common/compat_14_mod.c \
src/sys/compat/common/compat_16_mod.c \
src/sys/compat/common/compat_43_mod.c
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/compat_12_mod.c \
src/sys/compat/common/compat_13_mod.c \
src/sys/compat/common/compat_40_mod.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/compat/common/compat_30_mod.c
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/compat/common/compat_60_mod.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/compat_09_mod.c
diff -u src/sys/compat/common/compat_09_mod.c:1.1.2.2 src/sys/compat/common/compat_09_mod.c:1.1.2.3
--- src/sys/compat/common/compat_09_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_09_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_09_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -84,7 +84,7 @@ compat_09_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_09_init();
case MODULE_CMD_FINI:
- return compat_09_init();
+ return compat_09_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_10_mod.c
diff -u src/sys/compat/common/compat_10_mod.c:1.1.2.2 src/sys/compat/common/compat_10_mod.c:1.1.2.3
--- src/sys/compat/common/compat_10_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_10_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_10_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -76,7 +76,7 @@ compat_10_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_10_init();
case MODULE_CMD_FINI:
- return compat_10_init();
+ return compat_10_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_14_mod.c
diff -u src/sys/compat/common/compat_14_mod.c:1.1.2.2 src/sys/compat/common/compat_14_mod.c:1.1.2.3
--- src/sys/compat/common/compat_14_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_14_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_14_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -75,7 +75,7 @@ compat_14_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_14_init();
case MODULE_CMD_FINI:
- return compat_14_init();
+ return compat_14_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_16_mod.c
diff -u src/sys/compat/common/compat_16_mod.c:1.1.2.2 src/sys/compat/common/compat_16_mod.c:1.1.2.3
--- src/sys/compat/common/compat_16_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_16_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_16_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -84,7 +84,7 @@ compat_16_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_16_init();
case MODULE_CMD_FINI:
- return compat_16_init();
+ return compat_16_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_43_mod.c
diff -u src/sys/compat/common/compat_43_mod.c:1.1.2.2 src/sys/compat/common/compat_43_mod.c:1.1.2.3
--- src/sys/compat/common/compat_43_mod.c:1.1.2.2 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_43_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_43_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_43_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_43_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_43_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -183,7 +183,7 @@ compat_43_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_43_init();
case MODULE_CMD_FINI:
- return compat_43_init();
+ return compat_43_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_12_mod.c
diff -u src/sys/compat/common/compat_12_mod.c:1.1.2.3 src/sys/compat/common/compat_12_mod.c:1.1.2.4
--- src/sys/compat/common/compat_12_mod.c:1.1.2.3 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_12_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_12_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_12_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_12_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_12_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -110,7 +110,7 @@ compat_12_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_12_init();
case MODULE_CMD_FINI:
- return compat_12_init();
+ return compat_12_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_13_mod.c
diff -u src/sys/compat/common/compat_13_mod.c:1.1.2.3 src/sys/compat/common/compat_13_mod.c:1.1.2.4
--- src/sys/compat/common/compat_13_mod.c:1.1.2.3 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_13_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_13_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_13_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -88,7 +88,7 @@ compat_13_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_13_init();
case MODULE_CMD_FINI:
- return compat_13_init();
+ return compat_13_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_40_mod.c
diff -u src/sys/compat/common/compat_40_mod.c:1.1.2.3 src/sys/compat/common/compat_40_mod.c:1.1.2.4
--- src/sys/compat/common/compat_40_mod.c:1.1.2.3 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_40_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_40_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_40_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_40_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_40_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -90,7 +90,7 @@ compat_40_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_40_init();
case MODULE_CMD_FINI:
- return compat_40_init();
+ return compat_40_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_30_mod.c
diff -u src/sys/compat/common/compat_30_mod.c:1.1.2.5 src/sys/compat/common/compat_30_mod.c:1.1.2.6
--- src/sys/compat/common/compat_30_mod.c:1.1.2.5 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_30_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_30_mod.c,v 1.1.2.5 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_30_mod.c,v 1.1.2.6 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.1.2.5 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.1.2.6 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -110,7 +110,7 @@ compat_30_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_30_init();
case MODULE_CMD_FINI:
- return compat_30_init();
+ return compat_30_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.9 src/sys/compat/common/compat_50_mod.c:1.1.2.10
--- src/sys/compat/common/compat_50_mod.c:1.1.2.9 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_50_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_50_mod.c,v 1.1.2.9 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_50_mod.c,v 1.1.2.10 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.9 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.10 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -165,7 +165,7 @@ compat_50_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_50_init();
case MODULE_CMD_FINI:
- return compat_50_init();
+ return compat_50_fini();
default:
return ENOTTY;
}
Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.16 src/sys/compat/common/compat_60_mod.c:1.1.2.17
--- src/sys/compat/common/compat_60_mod.c:1.1.2.16 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_60_mod.c Thu Sep 13 22:53:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_60_mod.c,v 1.1.2.16 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_60_mod.c,v 1.1.2.17 2018/09/13 22:53:52 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.16 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.17 2018/09/13 22:53:52 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -120,7 +120,7 @@ compat_60_modcmd(modcmd_t cmd, void *arg
case MODULE_CMD_INIT:
return compat_60_init();
case MODULE_CMD_FINI:
- return compat_60_init();
+ return compat_60_fini();
default:
return ENOTTY;
}
