Module Name: src
Committed By: pgoyette
Date: Mon Sep 10 08:41:47 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_43_mod.c compat_50_mod.c compat_60_mod.c compat_70_mod.c
compat_80_mod.c compat_sysctl_09_43.c compat_util.c files.common
Log Message:
Remove the monolithic compat and compat_sysv modules. Now that we
don't have aliases, we need to use only the version-specific module
names when resolving dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 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 \
src/sys/compat/common/compat_43_mod.c \
src/sys/compat/common/compat_sysctl_09_43.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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.4 -r1.1.2.5 src/sys/compat/common/compat_30_mod.c
cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/sys/compat/common/compat_50_mod.c
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/sys/compat/common/compat_70_mod.c \
src/sys/compat/common/compat_80_mod.c
cvs rdiff -u -r1.46.18.2 -r1.46.18.3 src/sys/compat/common/compat_util.c
cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/sys/compat/common/files.common
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.1 src/sys/compat/common/compat_09_mod.c:1.1.2.2
--- src/sys/compat/common/compat_09_mod.c:1.1.2.1 Tue Apr 17 08:07:13 2018
+++ src/sys/compat/common/compat_09_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_09_mod.c,v 1.1.2.1 2018/04/17 08:07:13 pgoyette Exp $ */
+/* $NetBSD: compat_09_mod.c,v 1.1.2.2 2018/09/10 08:41:47 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.1 2018/04/17 08:07:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_09_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -69,8 +69,6 @@ compat_09_fini(void)
return 0;
}
-#ifdef _MODULE
-
#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,"
@@ -91,4 +89,3 @@ compat_09_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_10_mod.c
diff -u src/sys/compat/common/compat_10_mod.c:1.1.2.1 src/sys/compat/common/compat_10_mod.c:1.1.2.2
--- src/sys/compat/common/compat_10_mod.c:1.1.2.1 Tue Apr 17 08:07:13 2018
+++ src/sys/compat/common/compat_10_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_10_mod.c,v 1.1.2.1 2018/04/17 08:07:13 pgoyette Exp $ */
+/* $NetBSD: compat_10_mod.c,v 1.1.2.2 2018/09/10 08:41:47 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.1 2018/04/17 08:07:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_10_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -62,8 +62,6 @@ compat_10_fini(void)
return 0;
}
-#ifdef _MODULE
-
#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"
@@ -83,4 +81,3 @@ compat_10_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_14_mod.c
diff -u src/sys/compat/common/compat_14_mod.c:1.1.2.1 src/sys/compat/common/compat_14_mod.c:1.1.2.2
--- src/sys/compat/common/compat_14_mod.c:1.1.2.1 Fri Mar 30 10:09:07 2018
+++ src/sys/compat/common/compat_14_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_14_mod.c,v 1.1.2.1 2018/03/30 10:09:07 pgoyette Exp $ */
+/* $NetBSD: compat_14_mod.c,v 1.1.2.2 2018/09/10 08:41:47 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.1 2018/03/30 10:09:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_14_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -62,8 +62,6 @@ compat_14_fini(void)
return 0;
}
-#ifdef _MODULE
-
#define REQD_14_1 "compat_80,compat_70,compat_60,compat_50,"
#define REQD_14_2 "compat_40,compat_30,compat_20,compat_16"
@@ -82,4 +80,3 @@ compat_14_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_16_mod.c
diff -u src/sys/compat/common/compat_16_mod.c:1.1.2.1 src/sys/compat/common/compat_16_mod.c:1.1.2.2
--- src/sys/compat/common/compat_16_mod.c:1.1.2.1 Fri Mar 30 05:35:47 2018
+++ src/sys/compat/common/compat_16_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_mod.c,v 1.1.2.1 2018/03/30 05:35:47 pgoyette Exp $ */
+/* $NetBSD: compat_16_mod.c,v 1.1.2.2 2018/09/10 08:41:47 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.1 2018/03/30 05:35:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -71,8 +71,6 @@ compat_16_fini(void)
return error;
}
-#ifdef _MODULE
-
#define REQD_16_1 "compat_80,compat_70,compat_60,compat_50,"
#define REQD_16_2 "compat_40,compat_30,compat_20"
@@ -91,4 +89,3 @@ compat_16_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_20_mod.c
diff -u src/sys/compat/common/compat_20_mod.c:1.1.2.1 src/sys/compat/common/compat_20_mod.c:1.1.2.2
--- src/sys/compat/common/compat_20_mod.c:1.1.2.1 Fri Mar 30 02:28:49 2018
+++ src/sys/compat/common/compat_20_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_20_mod.c,v 1.1.2.1 2018/03/30 02:28:49 pgoyette Exp $ */
+/* $NetBSD: compat_20_mod.c,v 1.1.2.2 2018/09/10 08:41:47 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.1 2018/03/30 02:28:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_20_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -78,8 +78,6 @@ compat_20_fini(void)
return error;
}
-#ifdef _MODULE
-
#define REQD_20 "compat_80,compat_70,compat_60,compat_50,compat_40,compat_30"
MODULE(MODULE_CLASS_EXEC, compat_20, REQD_20);
@@ -97,4 +95,3 @@ compat_20_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_43_mod.c
diff -u src/sys/compat/common/compat_43_mod.c:1.1.2.1 src/sys/compat/common/compat_43_mod.c:1.1.2.2
--- src/sys/compat/common/compat_43_mod.c:1.1.2.1 Tue Apr 17 08:07:13 2018
+++ src/sys/compat/common/compat_43_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_43_mod.c,v 1.1.2.1 2018/04/17 08:07:13 pgoyette Exp $ */
+/* $NetBSD: compat_43_mod.c,v 1.1.2.2 2018/09/10 08:41:47 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.1 2018/04/17 08:07:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_43_mod.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -168,8 +168,6 @@ compat_43_fini(void)
return error;
}
-#ifdef _MODULE
-
/*
* XXX We "require" the compat_60 module to ensure proper ordering of
* XXX vectoring the ttcompatvec replacement routine!
@@ -190,5 +188,3 @@ compat_43_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
-
Index: src/sys/compat/common/compat_sysctl_09_43.c
diff -u src/sys/compat/common/compat_sysctl_09_43.c:1.1.2.1 src/sys/compat/common/compat_sysctl_09_43.c:1.1.2.2
--- src/sys/compat/common/compat_sysctl_09_43.c:1.1.2.1 Tue Apr 17 07:24:55 2018
+++ src/sys/compat/common/compat_sysctl_09_43.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sysctl_09_43.c,v 1.1.2.1 2018/04/17 07:24:55 pgoyette Exp $ */
+/* $NetBSD: compat_sysctl_09_43.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_sysctl_09_43.c,v 1.1.2.1 2018/04/17 07:24:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_sysctl_09_43.c,v 1.1.2.2 2018/09/10 08:41:47 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -146,8 +146,6 @@ compat_sysctl_09_43_fini(void)
return 0;
}
-#ifdef _MODULE
-
MODULE (MODULE_CLASS_EXEC, compat_sysctl_09_43, NULL);
static int
@@ -163,4 +161,3 @@ compat_sysctl_09_43_modcmd(modcmd_t cmd,
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_12_mod.c
diff -u src/sys/compat/common/compat_12_mod.c:1.1.2.2 src/sys/compat/common/compat_12_mod.c:1.1.2.3
--- src/sys/compat/common/compat_12_mod.c:1.1.2.2 Sun Apr 1 23:07:57 2018
+++ src/sys/compat/common/compat_12_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_12_mod.c,v 1.1.2.2 2018/04/01 23:07:57 pgoyette Exp $ */
+/* $NetBSD: compat_12_mod.c,v 1.1.2.3 2018/09/10 08:41:47 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.2 2018/04/01 23:07:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_12_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -96,8 +96,6 @@ compat_12_fini(void)
return 0;
}
-#ifdef _MODULE
-
#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"
@@ -117,4 +115,3 @@ compat_12_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_13_mod.c
diff -u src/sys/compat/common/compat_13_mod.c:1.1.2.2 src/sys/compat/common/compat_13_mod.c:1.1.2.3
--- src/sys/compat/common/compat_13_mod.c:1.1.2.2 Sun Apr 1 23:07:57 2018
+++ src/sys/compat/common/compat_13_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_13_mod.c,v 1.1.2.2 2018/04/01 23:07:57 pgoyette Exp $ */
+/* $NetBSD: compat_13_mod.c,v 1.1.2.3 2018/09/10 08:41:47 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.2 2018/04/01 23:07:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_13_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -74,8 +74,6 @@ compat_13_fini(void)
return 0;
}
-#ifdef _MODULE
-
#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"
@@ -95,4 +93,3 @@ compat_13_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_40_mod.c
diff -u src/sys/compat/common/compat_40_mod.c:1.1.2.2 src/sys/compat/common/compat_40_mod.c:1.1.2.3
--- src/sys/compat/common/compat_40_mod.c:1.1.2.2 Mon Apr 16 03:41:34 2018
+++ src/sys/compat/common/compat_40_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_40_mod.c,v 1.1.2.2 2018/04/16 03:41:34 pgoyette Exp $ */
+/* $NetBSD: compat_40_mod.c,v 1.1.2.3 2018/09/10 08:41:47 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.2 2018/04/16 03:41:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_40_mod.c,v 1.1.2.3 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -78,8 +78,6 @@ compat_40_fini(void)
return error;
}
-#ifdef _MODULE
-
#define REQD_40 "compat_80,compat_70,compat_60,compat_50"
MODULE(MODULE_CLASS_EXEC, compat_40, REQD_40);
@@ -97,4 +95,3 @@ compat_40_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_30_mod.c
diff -u src/sys/compat/common/compat_30_mod.c:1.1.2.4 src/sys/compat/common/compat_30_mod.c:1.1.2.5
--- src/sys/compat/common/compat_30_mod.c:1.1.2.4 Fri Mar 30 23:57:59 2018
+++ src/sys/compat/common/compat_30_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_30_mod.c,v 1.1.2.4 2018/03/30 23:57:59 pgoyette Exp $ */
+/* $NetBSD: compat_30_mod.c,v 1.1.2.5 2018/09/10 08:41:47 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.4 2018/03/30 23:57:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_30_mod.c,v 1.1.2.5 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -98,8 +98,6 @@ compat_30_fini(void)
return error;
}
-#ifdef _MODULE
-
#define REQD_30 "compat_util,compat_80,compat_70,compat_60,compat_50,compat_40"
MODULE(MODULE_CLASS_EXEC, compat_30, REQD_30);
@@ -117,4 +115,3 @@ compat_30_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_50_mod.c
diff -u src/sys/compat/common/compat_50_mod.c:1.1.2.8 src/sys/compat/common/compat_50_mod.c:1.1.2.9
--- src/sys/compat/common/compat_50_mod.c:1.1.2.8 Mon Apr 16 03:41:34 2018
+++ src/sys/compat/common/compat_50_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_50_mod.c,v 1.1.2.8 2018/04/16 03:41:34 pgoyette Exp $ */
+/* $NetBSD: compat_50_mod.c,v 1.1.2.9 2018/09/10 08:41:47 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.8 2018/04/16 03:41:34 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_50_mod.c,v 1.1.2.9 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -153,8 +153,6 @@ compat_50_fini(void)
return error;
}
-#ifdef _MODULE
-
#define REQD_50 "compat_80,compat_70,compat_60"
MODULE(MODULE_CLASS_EXEC, compat_50, REQD_50);
@@ -172,4 +170,3 @@ compat_50_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.15 src/sys/compat/common/compat_60_mod.c:1.1.2.16
--- src/sys/compat/common/compat_60_mod.c:1.1.2.15 Sat Mar 31 01:20:44 2018
+++ src/sys/compat/common/compat_60_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_60_mod.c,v 1.1.2.15 2018/03/31 01:20:44 pgoyette Exp $ */
+/* $NetBSD: compat_60_mod.c,v 1.1.2.16 2018/09/10 08:41:47 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.15 2018/03/31 01:20:44 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.16 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -109,8 +109,6 @@ compat_60_fini(void)
return error;
}
-#ifdef _MODULE
-
#define REQUIRED_60 "compat_70,compat_80"
MODULE(MODULE_CLASS_EXEC, compat_60, REQUIRED_60);
@@ -127,4 +125,3 @@ compat_60_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif
Index: src/sys/compat/common/compat_70_mod.c
diff -u src/sys/compat/common/compat_70_mod.c:1.1.2.7 src/sys/compat/common/compat_70_mod.c:1.1.2.8
--- src/sys/compat/common/compat_70_mod.c:1.1.2.7 Sat Mar 24 08:11:12 2018
+++ src/sys/compat/common/compat_70_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_70_mod.c,v 1.1.2.7 2018/03/24 08:11:12 pgoyette Exp $ */
+/* $NetBSD: compat_70_mod.c,v 1.1.2.8 2018/09/10 08:41:47 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.7 2018/03/24 08:11:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_70_mod.c,v 1.1.2.8 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -67,8 +67,6 @@ int compat_70_fini(void)
return 0;
}
-#ifdef _MODULE
-
#define REQD_70 "compat_80"
MODULE(MODULE_CLASS_EXEC, compat_70, REQD_70);
@@ -87,4 +85,3 @@ compat_70_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif /* _MODULE */
Index: src/sys/compat/common/compat_80_mod.c
diff -u src/sys/compat/common/compat_80_mod.c:1.1.2.7 src/sys/compat/common/compat_80_mod.c:1.1.2.8
--- src/sys/compat/common/compat_80_mod.c:1.1.2.7 Tue Apr 3 08:29:44 2018
+++ src/sys/compat/common/compat_80_mod.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_80_mod.c,v 1.1.2.7 2018/04/03 08:29:44 pgoyette Exp $ */
+/* $NetBSD: compat_80_mod.c,v 1.1.2.8 2018/09/10 08:41:47 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.7 2018/04/03 08:29:44 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_80_mod.c,v 1.1.2.8 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/systm.h>
#include <sys/module.h>
@@ -61,8 +61,6 @@ int compat_80_fini(void)
return 0;
}
-#ifdef _MODULE
-
#define REQD_80 NULL
MODULE(MODULE_CLASS_EXEC, compat_80, REQD_80);
@@ -81,4 +79,3 @@ compat_80_modcmd(modcmd_t cmd, void *arg
return ENOTTY;
}
}
-#endif /* _MODULE */
Index: src/sys/compat/common/compat_util.c
diff -u src/sys/compat/common/compat_util.c:1.46.18.2 src/sys/compat/common/compat_util.c:1.46.18.3
--- src/sys/compat/common/compat_util.c:1.46.18.2 Fri Mar 30 23:57:59 2018
+++ src/sys/compat/common/compat_util.c Mon Sep 10 08:41:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_util.c,v 1.46.18.2 2018/03/30 23:57:59 pgoyette Exp $ */
+/* $NetBSD: compat_util.c,v 1.46.18.3 2018/09/10 08:41:47 pgoyette Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.46.18.2 2018/03/30 23:57:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.46.18.3 2018/09/10 08:41:47 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,8 +157,6 @@ compat_elf_check_interp(struct exec_pack
return error;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_MISC, compat_util, NULL);
int
@@ -173,4 +171,3 @@ compat_util_modcmd(modcmd_t cmd, void *a
return ENOTTY;
}
}
-#endif /* _MODULE */
Index: src/sys/compat/common/files.common
diff -u src/sys/compat/common/files.common:1.1.2.33 src/sys/compat/common/files.common:1.1.2.34
--- src/sys/compat/common/files.common:1.1.2.33 Tue Apr 17 21:59:27 2018
+++ src/sys/compat/common/files.common Mon Sep 10 08:41:47 2018
@@ -1,9 +1,9 @@
-# $NetBSD: files.common,v 1.1.2.33 2018/04/17 21:59:27 pgoyette Exp $
+# $NetBSD: files.common,v 1.1.2.34 2018/09/10 08:41:47 pgoyette Exp $
#
# Generic files, used by all compat options.
#
-file compat/common/compat_mod.c compat_netbsd
+#file compat/common/compat_mod.c compat_netbsd
file compat/common/compat_exec.c compat_netbsd
file compat/common/compat_util.c compat_netbsd
