From b601ca6ba8a02a953c9b80469b22e74a8c2a4af6 Mon Sep 17 00:00:00 2001 From: christos Date: Tue, 23 Sep 2003 14:34:07 +0000 Subject: [PATCH] __sigaction14 should have been COMPAT_16 a while ago. GC it now. --- sys/kern/kern_sig.c | 9 ++++++--- sys/kern/syscalls.master | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index cdb3ff4c2a0b..c3e4957a716a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sig.c,v 1.157 2003/09/19 22:51:31 christos Exp $ */ +/* $NetBSD: kern_sig.c,v 1.158 2003/09/23 14:34:07 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1991, 1993 @@ -37,10 +37,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.157 2003/09/19 22:51:31 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.158 2003/09/23 14:34:07 christos Exp $"); #include "opt_ktrace.h" #include "opt_compat_sunos.h" +#include "opt_compat_netbsd.h" #include "opt_compat_netbsd32.h" #define SIGPROP /* include signal properties table */ @@ -353,9 +354,10 @@ sigaction1(struct proc *p, int signum, const struct sigaction *nsa, return (0); } +#ifdef COMPAT_16 /* ARGSUSED */ int -sys___sigaction14(struct lwp *l, void *v, register_t *retval) +compat_16_sys___sigaction14(struct lwp *l, void *v, register_t *retval) { struct sys___sigaction14_args /* { syscallarg(int) signum; @@ -384,6 +386,7 @@ sys___sigaction14(struct lwp *l, void *v, register_t *retval) } return (0); } +#endif /* ARGSUSED */ int diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 2f9c282e37bc..65048f95bb8e 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.130 2003/09/16 13:46:25 cl Exp $ + $NetBSD: syscalls.master,v 1.131 2003/09/23 14:34:07 christos Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -598,7 +598,7 @@ 290 STD { ssize_t sys_pwritev(int fd, \ const struct iovec *iovp, int iovcnt, \ int pad, off_t offset); } -291 STD { int sys___sigaction14(int signum, \ +291 COMPAT_16 { int sys___sigaction14(int signum, \ const struct sigaction *nsa, \ struct sigaction *osa); } 292 STD { int sys___sigpending14(sigset_t *set); }