PERFORCE change 153594 for review

[Marko Zec]

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

Change 153594 by zec at 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>