[src/pgoyette-compat]: src/sys/compat/linux32/common Clean up and reorganize ...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7b414722241a
branches:  pgoyette-compat
changeset: 447801:7b414722241a
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Jan 24 06:23:26 2019 +0000

description:
Clean up and reorganize the requirements for compat_linux32 module

diffstat:

 sys/compat/linux32/common/linux32_mod.c |  19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diffs (41 lines):

diff -r 563d9fbf860b -r 7b414722241a sys/compat/linux32/common/linux32_mod.c
--- a/sys/compat/linux32/common/linux32_mod.c   Thu Jan 24 05:06:43 2019 +0000
+++ b/sys/compat/linux32/common/linux32_mod.c   Thu Jan 24 06:23:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux32_mod.c,v 1.11.2.3 2018/09/12 08:09:23 pgoyette Exp $    */
+/*     $NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 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.3 2018/09/12 08:09:23 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -51,18 +51,11 @@
 #include <compat/linux32/common/linux32_sysctl.h>
 #include <compat/linux32/common/linux32_exec.h>
 
-#if defined(EXEC_ELF32)
-# define       MD1     ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc"
-#else
-# define       MD1     ""
-#endif
+#define        REQ1    "exec_elf32,compat_netbsd32,compat_linux"
+#define        REQ2    ",sysv_ipc,compat_netbsd32_sysvipc,compat_sysv_50"
+#define        REQ3    ",compat_netbsd32_50,compat_netbsd32_43"
 
-#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);
+MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3);
 
 static struct execsw linux32_execsw[] = {
 #if defined(EXEC_ELF32)