From owner-p4-projects@FreeBSD.ORG Sat Jun 21 05:41:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 096091065670; Sat, 21 Jun 2008 05:41:04 +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 C0114106564A for ; Sat, 21 Jun 2008 05:41:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1AB88FC12 for ; Sat, 21 Jun 2008 05:41:03 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5L5f3mH071621 for ; Sat, 21 Jun 2008 05:41:03 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5L5f3op071619 for perforce@freebsd.org; Sat, 21 Jun 2008 05:41:03 GMT (envelope-from julian@freebsd.org) Date: Sat, 21 Jun 2008 05:41:03 GMT Message-Id: <200806210541.m5L5f3op071619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143862 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jun 2008 05:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=143862 Change 143862 by julian@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 __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 __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 __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 */ +#include "opt_vimage.h" + #include __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 __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