Module Name:    src
Committed By:   pgoyette
Date:           Wed Sep 12 07:45:56 UTC 2018

Modified Files:
        src/sys/compat/linux/common [pgoyette-compat]: linux_mod.c
        src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c

Log Message:
Adjust module requirements to reflect the new more granular modules


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 \
    src/sys/compat/linux32/common/linux32_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/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.10 src/sys/compat/linux/common/linux_mod.c:1.10.2.1
--- src/sys/compat/linux/common/linux_mod.c:1.10	Sun Dec 10 00:43:05 2017
+++ src/sys/compat/linux/common/linux_mod.c	Wed Sep 12 07:45:56 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_mod.c,v 1.10 2017/12/10 00:43:05 kre Exp $	*/
+/*	$NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10 2017/12/10 00:43:05 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.10.2.1 2018/09/12 07:45:56 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -66,8 +66,10 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
 # define	MD3	""
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,sysv_ipc"
-	MD1 MD2 MD3);
+#define REQ1    ",compat_ossaudio,sysv_ipc"
+#define REQ2    ",compat_12,compat_30,compat_50,compat_43,compat_sysv_50"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux, REQ1 REQ2 MD1 MD2 MD3);
 
 static struct execsw linux_execsw[] = {
 #if defined(EXEC_ELF32) && ELFSIZE == 32

Index: src/sys/compat/linux32/common/linux32_mod.c
diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.2
--- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.1	Sun Mar 11 23:50:18 2018
+++ src/sys/compat/linux32/common/linux32_mod.c	Wed Sep 12 07:45:56 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $	*/
+/*	$NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.1 2018/03/11 23:50:18 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.2 2018/09/12 07:45:56 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -57,7 +57,12 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod.
 # define	MD1	""
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux32, "compat_linux,compat_sysv" MD1);
+#define	REQ1	"compat_linux,compat_sysv_50"
+#define	REQ2	",compat_netbsd32_43,compat_netbsd32_50,compat_netbsd32_12"
+#define	REQ3	",compat_netbsd32_30,compat_netbsd32_16
+#define REQ4    ",compat_ossaudio,sysv_ipc,compat_netbsd32_sysvipc"
+
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3 REQ4 MD1);
 
 static struct execsw linux32_execsw[] = {
 #if defined(EXEC_ELF32)

Reply via email to