Date: Thu, 22 Jan 2009 23:34:55 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r187605 - in stable/7/sys: . compat/freebsd32 contrib/pf dev/cxgb Message-ID: <200901222334.n0MNYt7r025398@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Thu Jan 22 23:34:55 2009 New Revision: 187605 URL: http://svn.freebsd.org/changeset/base/187605 Log: MFC: r185898 Add 32-bit compat support for AIO. As I had comitted this as a fix for r185878 in HEAD, it seems this was missed with the MFC at r187559. Unbreak the build. Modified: stable/7/sys/ (props changed) stable/7/sys/compat/freebsd32/freebsd32_signal.h stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/compat/freebsd32/freebsd32_signal.h ============================================================================== --- stable/7/sys/compat/freebsd32/freebsd32_signal.h Thu Jan 22 23:25:28 2009 (r187604) +++ stable/7/sys/compat/freebsd32/freebsd32_signal.h Thu Jan 22 23:34:55 2009 (r187605) @@ -36,6 +36,9 @@ struct sigaltstack32 { }; union sigval32 { + int sival_int; + u_int32_t sival_ptr; + /* 6.0 compatibility */ int sigval_int; u_int32_t sigval_ptr; }; @@ -70,6 +73,29 @@ struct siginfo32 { } _reason; }; +struct osigevent32 { + int sigev_notify; /* Notification type */ + union { + int __sigev_signo; /* Signal number */ + int __sigev_notify_kqueue; + } __sigev_u; + union sigval32 sigev_value; /* Signal value */ +}; + +struct sigevent32 { + int sigev_notify; /* Notification type */ + int sigev_signo; /* Signal number */ + union sigval32 sigev_value; /* Signal value */ + union { + __lwpid_t _threadid; + struct { + uint32_t _function; + uint32_t _attribute; + } _sigev_thread; + uint32_t __spare__[8]; + } _sigev_un; +}; + void siginfo_to_siginfo32(siginfo_t *src, struct siginfo32 *dst); #endif /* !_COMPAT_FREEBSD32_SIGNAL_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901222334.n0MNYt7r025398>