From owner-svn-src-stable@FreeBSD.ORG  Thu Jan 22 23:34:55 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C32381065672;
	Thu, 22 Jan 2009 23:34:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB8278FC17;
	Thu, 22 Jan 2009 23:34:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0MNYtvB025399;
	Thu, 22 Jan 2009 23:34:55 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0MNYt7r025398;
	Thu, 22 Jan 2009 23:34:55 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200901222334.n0MNYt7r025398@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 22 Jan 2009 23:34:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187605 - in stable/7/sys: . compat/freebsd32
	contrib/pf dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jan 2009 23:34:56 -0000

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_ */