From owner-svn-src-user@FreeBSD.ORG  Tue Jan  5 05:43:21 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55393106566C;
	Tue,  5 Jan 2010 05:43:21 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AFE88FC12;
	Tue,  5 Jan 2010 05:43:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o055hLHK002674;
	Tue, 5 Jan 2010 05:43:21 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o055hLXP002672;
	Tue, 5 Jan 2010 05:43:21 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001050543.o055hLXP002672@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Tue, 5 Jan 2010 05:43:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201551 - user/kmacy/releng_8_rump/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jan 2010 05:43:21 -0000

Author: kmacy
Date: Tue Jan  5 05:43:20 2010
New Revision: 201551
URL: http://svn.freebsd.org/changeset/base/201551

Log:
  simplify first cut by hiding references to kqueue

Modified:
  user/kmacy/releng_8_rump/sys/kern/uipc_socket.c

Modified: user/kmacy/releng_8_rump/sys/kern/uipc_socket.c
==============================================================================
--- user/kmacy/releng_8_rump/sys/kern/uipc_socket.c	Tue Jan  5 05:40:07 2010	(r201550)
+++ user/kmacy/releng_8_rump/sys/kern/uipc_socket.c	Tue Jan  5 05:43:20 2010	(r201551)
@@ -145,6 +145,7 @@ __FBSDID("$FreeBSD$");
 static int	soreceive_rcvoob(struct socket *so, struct uio *uio,
 		    int flags);
 
+#ifndef UNET
 static void	filt_sordetach(struct knote *kn);
 static int	filt_soread(struct knote *kn, long hint);
 static void	filt_sowdetach(struct knote *kn);
@@ -157,7 +158,7 @@ static struct filterops soread_filtops =
 	{ 1, NULL, filt_sordetach, filt_soread };
 static struct filterops sowrite_filtops =
 	{ 1, NULL, filt_sowdetach, filt_sowrite };
-
+#endif
 uma_zone_t socket_zone;
 so_gen_t	so_gencnt;	/* generation count for sockets */
 
@@ -2920,9 +2921,11 @@ sopoll_generic(struct socket *so, int ev
 	return (revents);
 }
 
+
 int
 soo_kqfilter(struct file *fp, struct knote *kn)
 {
+#ifndef UNET
 	struct socket *so = kn->kn_fp->f_data;
 	struct sockbuf *sb;
 
@@ -2946,9 +2949,13 @@ soo_kqfilter(struct file *fp, struct kno
 	knlist_add(&sb->sb_sel.si_note, kn, 1);
 	sb->sb_flags |= SB_KNOTE;
 	SOCKBUF_UNLOCK(sb);
+#else
+	panic("soo_kqfilter not supported");
+#endif
 	return (0);
 }
 
+
 /*
  * Some routines that return EOPNOTSUPP for entry points that are not
  * supported by a protocol.  Fill in as needed.
@@ -3089,6 +3096,7 @@ pru_sopoll_notsupp(struct socket *so, in
 	return EOPNOTSUPP;
 }
 
+#ifndef UNET
 static void
 filt_sordetach(struct knote *kn)
 {
@@ -3168,7 +3176,7 @@ filt_solisten(struct knote *kn, long hin
 	kn->kn_data = so->so_qlen;
 	return (! TAILQ_EMPTY(&so->so_comp));
 }
-
+#endif
 int
 socheckuid(struct socket *so, uid_t uid)
 {