Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename si_sigval -> si_value to match POSIX RTS.

Browse Source
This commit is contained in:
christos 2007-05-21 15:35:47 +00:00
parent c6262d2d8d
commit c61eed39a8
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/darwin/darwin_signal.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: darwin_signal.c,v 1.24 2007/03/04 06:01:14 christos Exp $ */
/* $NetBSD: darwin_signal.c,v 1.25 2007/05/21 15:35:47 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.24 2007/03/04 06:01:14 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.25 2007/05/21 15:35:47 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -236,7 +236,7 @@ native_to_darwin_siginfo(ksi, dsi)
dsi->darwin_si_status = ksi->ksi_status;
dsi->darwin_si_addr = ksi->ksi_addr;
(void)memcpy(&dsi->darwin_si_value,
&ksi->ksi_sigval, sizeof(dsi->darwin_si_value));
&ksi->ksi_value, sizeof(dsi->darwin_si_value));
dsi->darwin_si_band = ksi->ksi_band;
return;

6
sys/compat/linux/arch/amd64/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.21 2007/03/14 21:52:17 manu Exp $ */
/* $NetBSD: linux_machdep.c,v 1.22 2007/05/21 15:35:47 christos Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.21 2007/03/14 21:52:17 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.22 2007/05/21 15:35:47 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@ -272,7 +272,7 @@ linux_sendsig(ksi, mask)
if ((sigframe.info.lsi_signo == LINUX_SIGALRM) ||
(sigframe.info.lsi_signo >= LINUX_SIGRTMIN))
sigframe.info._sifields._timer._sigval.sival_ptr =
ksi->ksi_sigval.sival_ptr;
ksi->ksi_value.sival_ptr;
break;
}

6
sys/compat/linux/arch/i386/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.125 2007/05/10 21:30:14 christos Exp $ */
/* $NetBSD: linux_machdep.c,v 1.126 2007/05/21 15:35:47 christos Exp $ */
/*-
* Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.125 2007/05/10 21:30:14 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.126 2007/05/21 15:35:47 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vm86.h"
@ -338,7 +338,7 @@ linux_rt_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
lsi->lsi_pid = ksi->ksi_pid;
if (lsi->lsi_signo == LINUX_SIGALRM ||
lsi->lsi_signo >= LINUX_SIGRTMIN)
lsi->lsi_value.sival_ptr = ksi->ksi_sigval.sival_ptr;
lsi->lsi_value.sival_ptr = ksi->ksi_value.sival_ptr;
break;
}

6
sys/compat/linux32/arch/amd64/linux32_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux32_machdep.c,v 1.10 2007/03/18 21:38:32 dsl Exp $ */
/* $NetBSD: linux32_machdep.c,v 1.11 2007/05/21 15:35:48 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@ -31,7 +31,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.10 2007/03/18 21:38:32 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.11 2007/05/21 15:35:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -241,7 +241,7 @@ linux32_rt_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
if (lsi->lsi_signo == LINUX32_SIGALRM ||
lsi->lsi_signo >= LINUX32_SIGRTMIN)
NETBSD32PTR32(lsi->lsi_value.sival_ptr,
ksi->ksi_sigval.sival_ptr);
ksi->ksi_value.sival_ptr);
break;
}

10
sys/compat/netbsd32/netbsd32_signal.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_signal.c,v 1.23 2007/03/18 21:38:34 dsl Exp $ */
/* $NetBSD: netbsd32_signal.c,v 1.24 2007/05/21 15:35:48 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.23 2007/03/18 21:38:34 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.24 2007/05/21 15:35:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -248,7 +248,7 @@ netbsd32_si32_to_si(siginfo_t *si, const siginfo32_t *si32)
/*
* XXX sival_ptr is currently unused.
*/
si->si_sigval.sival_int = si32->si_sigval.sival_int;
si->si_value.sival_int = si32->si_value.sival_int;
break;
case SIGCHLD:
si->si_pid = si32->si_pid;
@ -275,7 +275,7 @@ netbsd32_si_to_si32(siginfo32_t *si32, const siginfo_t *si)
switch (si32->si_signo) {
case 0: /* SA */
si32->si_sigval.sival_int = si->si_sigval.sival_int;
si32->si_value.sival_int = si->si_value.sival_int;
break;
case SIGILL:
case SIGBUS:
@ -293,7 +293,7 @@ netbsd32_si_to_si32(siginfo32_t *si32, const siginfo_t *si)
/*
* XXX sival_ptr is currently unused.
*/
si32->si_sigval.sival_int = si->si_sigval.sival_int;
si32->si_value.sival_int = si->si_value.sival_int;
break;
case SIGCHLD:
si32->si_pid = si->si_pid;

8
sys/kern/kern_time.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_time.c,v 1.123 2007/05/13 19:51:35 dsl Exp $ */
/* $NetBSD: kern_time.c,v 1.124 2007/05/21 15:35:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.123 2007/05/13 19:51:35 dsl Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.124 2007/05/21 15:35:48 christos Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@ -676,7 +676,7 @@ timer_create1(timer_t *tid, clockid_t id, struct sigevent *evp,
pt->pt_info.ksi_code = 0;
pt->pt_info.ksi_pid = p->p_pid;
pt->pt_info.ksi_uid = kauth_cred_getuid(l->l_cred);
pt->pt_info.ksi_sigval = pt->pt_ev.sigev_value;
pt->pt_info.ksi_value = pt->pt_ev.sigev_value;
pt->pt_type = id;
pt->pt_proc = p;
@ -1391,7 +1391,7 @@ itimerfire(struct ptimer *pt)
KSI_INIT(&ksi);
ksi.ksi_signo = pt->pt_ev.sigev_signo;
ksi.ksi_code = SI_TIMER;
ksi.ksi_sigval = pt->pt_ev.sigev_value;
ksi.ksi_value = pt->pt_ev.sigev_value;
pt->pt_poverruns = pt->pt_overruns;
pt->pt_overruns = 0;
mutex_enter(&proclist_mutex);

6
sys/kern/sys_aio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_aio.c,v 1.2 2007/05/17 14:51:41 yamt Exp $ */
/* $NetBSD: sys_aio.c,v 1.3 2007/05/21 15:35:48 christos Exp $ */
/*
* Copyright (c) 2007, Mindaugas Rasiukevicius <rmind at NetBSD org>
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.2 2007/05/17 14:51:41 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: sys_aio.c,v 1.3 2007/05/21 15:35:48 christos Exp $");
#include <sys/param.h>
@ -401,7 +401,7 @@ aio_sendsig(struct proc *p, struct sigevent *sig)
KSI_INIT(&ksi);
ksi.ksi_signo = sig->sigev_signo;
ksi.ksi_code = SI_ASYNCIO;
ksi.ksi_sigval = sig->sigev_value;
ksi.ksi_value = sig->sigev_value;
mutex_enter(&proclist_mutex);
kpsignal(p, &ksi, NULL);
mutex_exit(&proclist_mutex);

8
sys/sys/siginfo.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: siginfo.h,v 1.15 2007/02/09 21:55:37 ad Exp $ */
/* $NetBSD: siginfo.h,v 1.16 2007/05/21 15:35:48 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -61,7 +61,7 @@ struct _ksiginfo {
struct {
pid_t _pid;
uid_t _uid;
sigval_t _sigval;
sigval_t _value;
} _rt;
struct {
@ -144,7 +144,7 @@ typedef union siginfo {
#define si_code _info._code
#define si_errno _info._errno
#define si_sigval _info._reason._rt._sigval
#define si_value _info._reason._rt._value
#define si_pid _info._reason._child._pid
#define si_uid _info._reason._child._uid
#define si_status _info._reason._child._status
@ -163,7 +163,7 @@ typedef union siginfo {
#define ksi_code ksi_info._code
#define ksi_errno ksi_info._errno
#define ksi_sigval ksi_info._reason._rt._sigval
#define ksi_value ksi_info._reason._rt._value
#define ksi_pid ksi_info._reason._child._pid
#define ksi_uid ksi_info._reason._child._uid
#define ksi_status ksi_info._reason._child._status