Module Name: src Committed By: pgoyette Date: Thu Sep 13 02:03:49 UTC 2018
Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_mod.c Log Message: Now that compat_netbsd32 is no longer monolithic, it no longer requires compat_09 (and all higher) compat code. Adjust the requirements list accordingly. To generate a diff of this commit: cvs rdiff -u -r1.13.16.6 -r1.13.16.7 src/sys/compat/netbsd32/netbsd32_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/netbsd32/netbsd32_mod.c diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.7 --- src/sys/compat/netbsd32/netbsd32_mod.c:1.13.16.6 Tue Sep 11 23:26:21 2018 +++ src/sys/compat/netbsd32/netbsd32_mod.c Thu Sep 13 02:03:49 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $ */ +/* $NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.6 2018/09/11 23:26:21 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.13.16.7 2018/09/13 02:03:49 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_execfmt.h" @@ -48,14 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mod #include <compat/netbsd32/netbsd32_sysctl.h> #include <compat/netbsd32/netbsd32_exec.h> -# define DEPS1 "compat_09,ksem" - -#if defined(EXEC_ELF32) -# define DEPS2 ",exec_elf32" -#else -# define DEPS2 "" -#endif - #define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \ sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1)) @@ -65,6 +57,14 @@ int compat32_80_modctl_compat_stub(struc int (*vec_compat32_80_modctl)(struct lwp *, const struct netbsd32_modctl_args *, register_t *); +# define DEPS1 "ksem" + +#if defined(EXEC_ELF32) +# define DEPS2 ",exec_elf32" +#else +# define DEPS2 "" +#endif + MODULE(MODULE_CLASS_EXEC, compat_netbsd32, DEPS1 DEPS2); static struct execsw netbsd32_execsw[] = {