Module Name: src Committed By: pgoyette Date: Sat Sep 29 07:34:12 UTC 2018
Modified Files: src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c netbsd32_machdep_16.c Log Message: Allocate the netbsd32_sendsig_hook in the main compat_netbsd32 code (where it call be called) and not in a subsidiary module which may not even exist. To generate a diff of this commit: cvs rdiff -u -r1.115.2.9 -r1.115.2.10 \ src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.1.2.8 -r1.1.2.9 \ src/sys/arch/amd64/amd64/netbsd32_machdep_16.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/arch/amd64/amd64/netbsd32_machdep.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.9 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.10 --- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.9 Sat Sep 29 06:19:42 2018 +++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sat Sep 29 07:34:12 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep.c,v 1.115.2.9 2018/09/29 06:19:42 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep.c,v 1.115.2.10 2018/09/29 07:34:12 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.9 2018/09/29 06:19:42 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.10 2018/09/29 07:34:12 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -273,6 +273,8 @@ netbsd32_sendsig_siginfo(const ksiginfo_ return 0; } +struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook; + MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f, (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask), netbsd32_sendsig_siginfo(ksi, mask)); Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.8 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.9 --- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.1.2.8 Sat Sep 29 07:13:01 2018 +++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c Sat Sep 29 07:34:12 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.8 2018/09/29 07:13:01 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2018/09/29 07:34:12 pgoyette Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.8 2018/09/29 07:13:01 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2018/09/29 07:34:12 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -86,7 +86,7 @@ int check_sigcontext32(struct lwp *, con int netbsd32_sendsig_16(const ksiginfo_t *, const sigset_t *); -struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook; +extern struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook; static void netbsd32_sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)