PERFORCE change 143862 for review

[Julian Elischer]

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

Change 143862 by julian at julian_trafmon1 on 2008/06/21 05:40:22

	More missing opt_vimage includes

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#4 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#3 (text+ko) ====

@@ -29,6 +29,8 @@
  *
  */
 
+#include "opt_vimage.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $");
 

==== //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 (text+ko) ====

@@ -26,6 +26,8 @@
 POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
+#include "opt_vimage.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c,v 1.1 2008/05/05 18:46:18 kmacy Exp $");
 

==== //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#3 (text+ko) ====

@@ -24,6 +24,8 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_vimage.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.27 2008/03/18 08:48:51 lulf Exp $");
 
@@ -63,7 +65,7 @@
 	vhdr->magic = GV_MAGIC;
 	vhdr->config_length = GV_CFG_LEN;
 
-	bcopy(V_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN);
+	bcopy(G_hostname, vhdr->label.sysname, GV_HOSTNAME_LEN);
 	strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME);
 	microtime(&vhdr->label.date_of_birth);
 

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

@@ -38,6 +38,8 @@
  * Author: Dave Chapeskie <dchapeskie at sandvine.com>
  */
 
+#include "opt_vimage.h"
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netgraph/ng_source.c,v 1.30 2007/03/02 14:36:19 emaste Exp $");
 

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#4 (text+ko) ====

@@ -30,11 +30,11 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.133 2008/04/21 12:03:59 rwatson Exp $");
 
+#include "opt_vimage.h"
 #if !defined(KLD_MODULE)
 #include "opt_inet.h"
 #include "opt_ipfw.h"
 #include "opt_mac.h"
-#include "opt_vimage.h"
 #ifndef INET
 #error "IPDIVERT requires INET."
 #endif