Module Name: src Committed By: pgoyette Date: Thu Jan 24 06:48:27 UTC 2019
Modified Files: src/sys/compat/linux32/common [pgoyette-compat]: linux32_mod.c Log Message: Restore the MD-vs-REQ requirements structure, just in case To generate a diff of this commit: cvs rdiff -u -r1.11.2.4 -r1.11.2.5 \ 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/linux32/common/linux32_mod.c diff -u src/sys/compat/linux32/common/linux32_mod.c:1.11.2.4 src/sys/compat/linux32/common/linux32_mod.c:1.11.2.5 --- src/sys/compat/linux32/common/linux32_mod.c:1.11.2.4 Thu Jan 24 06:23:26 2019 +++ src/sys/compat/linux32/common/linux32_mod.c Thu Jan 24 06:48:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_mod.c,v 1.11.2.4 2019/01/24 06:23:26 pgoyette Exp $ */ +/* $NetBSD: linux32_mod.c,v 1.11.2.5 2019/01/24 06:48:27 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.4 2019/01/24 06:23:26 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_mod.c,v 1.11.2.5 2019/01/24 06:48:27 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -51,11 +51,16 @@ __KERNEL_RCSID(0, "$NetBSD: linux32_mod. #include <compat/linux32/common/linux32_sysctl.h> #include <compat/linux32/common/linux32_exec.h> -#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" +#if defined(EXEC_ELF32) +# define MD1 ",exec_elf32,compat_netbsd32,compat_netbsd32_sysvipc" +#else +# define MD1 "" +#endif + +#define REQ1 "compat_linux,sysv_ipc,compat_sysv_50" +#define REQ2 ",compat_netbsd32_50,compat_netbsd32_43" -MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 REQ3); +MODULE(MODULE_CLASS_EXEC, compat_linux32, REQ1 REQ2 MD1); static struct execsw linux32_execsw[] = { #if defined(EXEC_ELF32)