From owner-p4-projects@FreeBSD.ORG  Wed Nov 26 10:49:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CCF94106567A; Wed, 26 Nov 2008 10:49:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9030D1065673
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 10:49:24 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 76D6A8FC0A
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 10:49:24 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQAnO64024757
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 10:49:24 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQAnOfn024754
	for perforce@freebsd.org; Wed, 26 Nov 2008 10:49:24 GMT
	(envelope-from zec@tel.fer.hr)
Date: Wed, 26 Nov 2008 10:49:24 GMT
Message-Id: <200811261049.mAQAnOfn024754@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153594 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Nov 2008 10:49:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=153594

Change 153594 by zec@zec_tpx32 on 2008/11/26 10:49:00

	Unbreak kernel build.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#8 edit
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/net/bpf.c#8 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#8 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>			/* for IFF_* flags		*/
 #include <net/netisr.h>			/* for NETISR_POLL		*/
@@ -44,7 +45,6 @@
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/kthread.h>
-#include <sys/vimage.h>
 
 static void netisr_poll(void);		/* the two netisr handlers      */
 static void netisr_pollmore(void);
@@ -521,7 +521,7 @@
 static int
 poll_switch(SYSCTL_HANDLER_ARGS)
 {
-	INIT_VNET_INET(curvnet);
+	INIT_VNET_NET(curvnet);
 	struct ifnet *ifp;
 	int error;
 	int val = polling;

==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#3 (text+ko) ====

@@ -52,6 +52,7 @@
 #include <sys/mutex.h>
 #include <sys/sx.h>
 #include <sys/sysproto.h>
+#include <sys/vimage.h>
 
 #include <security/mac/mac_framework.h>
 

==== //depot/projects/vimage-commit2/src/sys/net/bpf.c#8 (text+ko) ====

@@ -56,6 +56,7 @@
 #include <sys/sockio.h>
 #include <sys/ttycom.h>
 #include <sys/uio.h>
+#include <sys/vimage.h>
 
 #include <sys/event.h>
 #include <sys/file.h>