Module Name: src
Committed By: pgoyette
Date: Sat Sep 15 02:14:39 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_20_mod.c compat_30_mod.c compat_40_mod.c
compat_50_mod.c compat_60_mod.c compat_70_mod.c compat_80_mod.c
Log Message:
Since we've already removed the maximum recursion depth for
required modules, there's no need for us to force loading of
the most-recent (ie, "deepest") modules first. So, simplify
the required-modules lists to require only the next-highest
version's module.
This will also make it easier to add new compat_xx modules
for future release versions.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 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_20_mod.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 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.6 -r1.1.2.7 src/sys/compat/common/compat_30_mod.c
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/compat_70_mod.c \
src/sys/compat/common/compat_80_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.3 src/sys/compat/common/compat_09_mod.c:1.1.2.4
--- src/sys/compat/common/compat_09_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_09_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_09_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_09_mod.c,v 1.1.2.4 2018/09/15 02:14:39 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.3 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -69,12 +69,8 @@ compat_09_fini(void)
return 0;
}
-#define REQD_09_1 "compat_80,compat_70,compat_60,compat_50,"
-#define REQD_09_2 "compat_40,compat_30,compat_20,compat_16,"
-#define REQD_09_3 "compat_14,compat_13,compat_12,compat_10,"
-#define REQD_09_4 "compat_util,compat_sysctl_09_43"
-
-MODULE(MODULE_CLASS_EXEC, compat_09, REQD_09_1 REQD_09_2 REQD_09_3 REQD_09_4);
+MODULE(MODULE_CLASS_EXEC, compat_09,
+ "compat_10,compat_util,compat_sysctl_09_43");
static int
compat_09_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_10_mod.c
diff -u src/sys/compat/common/compat_10_mod.c:1.1.2.3 src/sys/compat/common/compat_10_mod.c:1.1.2.4
--- src/sys/compat/common/compat_10_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_10_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_10_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_10_mod.c,v 1.1.2.4 2018/09/15 02:14:39 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.3 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -62,11 +62,7 @@ compat_10_fini(void)
return 0;
}
-#define REQD_10_1 "compat_80,compat_70,compat_60,compat_50,"
-#define REQD_10_2 "compat_40,compat_30,compat_20,compat_16,"
-#define REQD_10_3 "compat_14,compat_13,compat_12,compat_util"
-
-MODULE(MODULE_CLASS_EXEC, compat_10, REQD_10_1 REQD_10_2 REQD_10_3);
+MODULE(MODULE_CLASS_EXEC, compat_10, "compat_12,compat_util");
static int
compat_10_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_14_mod.c
diff -u src/sys/compat/common/compat_14_mod.c:1.1.2.3 src/sys/compat/common/compat_14_mod.c:1.1.2.4
--- src/sys/compat/common/compat_14_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_14_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_14_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_14_mod.c,v 1.1.2.4 2018/09/15 02:14:39 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.3 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -62,10 +62,7 @@ compat_14_fini(void)
return 0;
}
-#define REQD_14_1 "compat_80,compat_70,compat_60,compat_50,"
-#define REQD_14_2 "compat_40,compat_30,compat_20,compat_16"
-
-MODULE(MODULE_CLASS_EXEC, compat_14, REQD_14_1 REQD_14_2);
+MODULE(MODULE_CLASS_EXEC, compat_14, "compat_16");
static int
compat_14_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_16_mod.c
diff -u src/sys/compat/common/compat_16_mod.c:1.1.2.3 src/sys/compat/common/compat_16_mod.c:1.1.2.4
--- src/sys/compat/common/compat_16_mod.c:1.1.2.3 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_16_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_mod.c,v 1.1.2.3 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_16_mod.c,v 1.1.2.4 2018/09/15 02:14:39 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.3 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -71,10 +71,7 @@ compat_16_fini(void)
return error;
}
-#define REQD_16_1 "compat_80,compat_70,compat_60,compat_50,"
-#define REQD_16_2 "compat_40,compat_30,compat_20"
-
-MODULE(MODULE_CLASS_EXEC, compat_16, REQD_16_1 REQD_16_2);
+MODULE(MODULE_CLASS_EXEC, compat_16, "compat_20");
static int
compat_16_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_20_mod.c
diff -u src/sys/compat/common/compat_20_mod.c:1.1.2.3 src/sys/compat/common/compat_20_mod.c:1.1.2.4
--- src/sys/compat/common/compat_20_mod.c:1.1.2.3 Thu Sep 13 21:42:24 2018
+++ src/sys/compat/common/compat_20_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_20_mod.c,v 1.1.2.3 2018/09/13 21:42:24 pgoyette Exp $ */
+/* $NetBSD: compat_20_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_20_mod.c,v 1.1.2.3 2018/09/13 21:42:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_20_mod.c,v 1.1.2.4 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -78,9 +78,7 @@ compat_20_fini(void)
return error;
}
-#define REQD_20 "compat_80,compat_70,compat_60,compat_50,compat_40,compat_30"
-
-MODULE(MODULE_CLASS_EXEC, compat_20, REQD_20);
+MODULE(MODULE_CLASS_EXEC, compat_20, "compat_30");
static int
compat_20_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_12_mod.c
diff -u src/sys/compat/common/compat_12_mod.c:1.1.2.4 src/sys/compat/common/compat_12_mod.c:1.1.2.5
--- src/sys/compat/common/compat_12_mod.c:1.1.2.4 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_12_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_12_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_12_mod.c,v 1.1.2.5 2018/09/15 02:14:39 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.4 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_12_mod.c,v 1.1.2.5 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -96,11 +96,7 @@ compat_12_fini(void)
return 0;
}
-#define REQD_12_1 "compat_80,compat_70,compat_60,compat_50,"
-#define REQD_12_2 "compat_40,compat_30,compat_20,compat_16,"
-#define REQD_12_3 "compat_14,compat_13"
-
-MODULE(MODULE_CLASS_EXEC, compat_12, REQD_12_1 REQD_12_2 REQD_12_3);
+MODULE(MODULE_CLASS_EXEC, compat_12, "compat_13");
static int
compat_12_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_13_mod.c
diff -u src/sys/compat/common/compat_13_mod.c:1.1.2.4 src/sys/compat/common/compat_13_mod.c:1.1.2.5
--- src/sys/compat/common/compat_13_mod.c:1.1.2.4 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_13_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_13_mod.c,v 1.1.2.5 2018/09/15 02:14:39 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.4 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_mod.c,v 1.1.2.5 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -74,11 +74,7 @@ compat_13_fini(void)
return 0;
}
-#define REQD_13_1 "compat_80,compat_70,compat_60,compat_50,"
-#define REQD_13_2 "compat_40,compat_30,compat_20,compat_16,"
-#define REQD_13_3 "compat_14"
-
-MODULE(MODULE_CLASS_EXEC, compat_13, REQD_13_1 REQD_13_2 REQD_13_3);
+MODULE(MODULE_CLASS_EXEC, compat_13, "compat_14");
static int
compat_13_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_40_mod.c
diff -u src/sys/compat/common/compat_40_mod.c:1.1.2.4 src/sys/compat/common/compat_40_mod.c:1.1.2.5
--- src/sys/compat/common/compat_40_mod.c:1.1.2.4 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_40_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_40_mod.c,v 1.1.2.4 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_40_mod.c,v 1.1.2.5 2018/09/15 02:14:39 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.4 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_40_mod.c,v 1.1.2.5 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -78,9 +78,7 @@ compat_40_fini(void)
return error;
}
-#define REQD_40 "compat_80,compat_70,compat_60,compat_50"
-
-MODULE(MODULE_CLASS_EXEC, compat_40, REQD_40);
+MODULE(MODULE_CLASS_EXEC, compat_40, "compat_50");
static int
compat_40_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_30_mod.c
diff -u src/sys/compat/common/compat_30_mod.c:1.1.2.6 src/sys/compat/common/compat_30_mod.c:1.1.2.7
--- src/sys/compat/common/compat_30_mod.c:1.1.2.6 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_30_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_30_mod.c,v 1.1.2.6 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_30_mod.c,v 1.1.2.7 2018/09/15 02:14:39 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.6 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.1.2.7 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -98,9 +98,7 @@ compat_30_fini(void)
return error;
}
-#define REQD_30 "compat_util,compat_80,compat_70,compat_60,compat_50,compat_40"
-
-MODULE(MODULE_CLASS_EXEC, compat_30, REQD_30);
+MODULE(MODULE_CLASS_EXEC, compat_30, "compat_40");
static int
compat_30_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.10 src/sys/compat/common/compat_50_mod.c:1.1.2.11
--- src/sys/compat/common/compat_50_mod.c:1.1.2.10 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_50_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_50_mod.c,v 1.1.2.10 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_50_mod.c,v 1.1.2.11 2018/09/15 02:14:39 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.10 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.11 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -153,9 +153,7 @@ compat_50_fini(void)
return error;
}
-#define REQD_50 "compat_80,compat_70,compat_60"
-
-MODULE(MODULE_CLASS_EXEC, compat_50, REQD_50);
+MODULE(MODULE_CLASS_EXEC, compat_50, "compat_60");
static int
compat_50_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.17 src/sys/compat/common/compat_60_mod.c:1.1.2.18
--- src/sys/compat/common/compat_60_mod.c:1.1.2.17 Thu Sep 13 22:53:52 2018
+++ src/sys/compat/common/compat_60_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_60_mod.c,v 1.1.2.17 2018/09/13 22:53:52 pgoyette Exp $ */
+/* $NetBSD: compat_60_mod.c,v 1.1.2.18 2018/09/15 02:14:39 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.17 2018/09/13 22:53:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.18 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -109,8 +109,7 @@ compat_60_fini(void)
return error;
}
-#define REQUIRED_60 "compat_70,compat_80"
-MODULE(MODULE_CLASS_EXEC, compat_60, REQUIRED_60);
+MODULE(MODULE_CLASS_EXEC, compat_60, "compat_70");
static int
compat_60_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.1.2.8 src/sys/compat/common/compat_70_mod.c:1.1.2.9
--- src/sys/compat/common/compat_70_mod.c:1.1.2.8 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_70_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_70_mod.c,v 1.1.2.8 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_70_mod.c,v 1.1.2.9 2018/09/15 02:14:39 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.8 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.9 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -67,8 +67,7 @@ int compat_70_fini(void)
return 0;
}
-#define REQD_70 "compat_80"
-MODULE(MODULE_CLASS_EXEC, compat_70, REQD_70);
+MODULE(MODULE_CLASS_EXEC, compat_70, "compat_80");
static int
compat_70_modcmd(modcmd_t cmd, void *arg)
Index: src/sys/compat/common/compat_80_mod.c
diff -u src/sys/compat/common/compat_80_mod.c:1.1.2.8 src/sys/compat/common/compat_80_mod.c:1.1.2.9
--- src/sys/compat/common/compat_80_mod.c:1.1.2.8 Mon Sep 10 08:41:47 2018
+++ src/sys/compat/common/compat_80_mod.c Sat Sep 15 02:14:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_80_mod.c,v 1.1.2.8 2018/09/10 08:41:47 pgoyette Exp $ */
+/* $NetBSD: compat_80_mod.c,v 1.1.2.9 2018/09/15 02:14:39 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.8 2018/09/10 08:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.9 2018/09/15 02:14:39 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -61,8 +61,7 @@ int compat_80_fini(void)
return 0;
}
-#define REQD_80 NULL
-MODULE(MODULE_CLASS_EXEC, compat_80, REQD_80);
+MODULE(MODULE_CLASS_EXEC, compat_80, NULL);
static int
compat_80_modcmd(modcmd_t cmd, void *arg)
