From owner-p4-projects@FreeBSD.ORG Sat Aug 16 11:26:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ECF91065691; Sat, 16 Aug 2008 11:26:58 +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 48BBF1065687 for ; Sat, 16 Aug 2008 11:26:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33D688FC13 for ; Sat, 16 Aug 2008 11:26:58 +0000 (UTC) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7GBQwK2092941 for ; Sat, 16 Aug 2008 11:26:58 GMT (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7GBQwqm092939 for perforce@freebsd.org; Sat, 16 Aug 2008 11:26:58 GMT (envelope-from des@freebsd.org) Date: Sat, 16 Aug 2008 11:26:58 GMT Message-Id: <200808161126.m7GBQwqm092939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Cc: Subject: PERFORCE change 147520 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, 16 Aug 2008 11:26:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147520 Change 147520 by des@des.at.des.no on 2008/08/16 11:26:26 Reduce diffs against head (mostly whitespace). Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#9 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#5 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#6 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#5 edit .. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#5 edit .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#4 edit .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#6 edit .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#6 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#6 edit .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#7 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#6 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#5 edit .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#7 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#10 edit .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#9 edit .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#7 edit .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#9 (text) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -39,8 +39,6 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ -#include "opt_compat.h" - #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); @@ -91,6 +89,7 @@ #include #endif /* __i386__ || __amd64__ */ +#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#6 (text+ko) ==== @@ -29,8 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $"); -#include "opt_compat.h" - #include #include #include @@ -59,11 +57,12 @@ #include #include #include - #include #include #include +#include "opt_compat.h" + #ifdef COMPAT_LINUX32 #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ #include __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/pf/netinet/in4_cksum.c#5 (text+ko) ==== @@ -63,7 +63,6 @@ * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * */ - #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#5 (text+ko) ==== @@ -26,7 +26,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ - #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/dev/firewire/firewire.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ * */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ - #include __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.31 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#6 (text+ko) ==== @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_drive.c,v 1.28 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#7 (text+ko) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#7 (text) ==== @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#6 (text+ko) ==== @@ -23,7 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_socksys.c,v 1.23 2008/07/05 13:10:10 rwatson Exp $"); ==== //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#7 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include - #include #include ==== //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#5 (text+ko) ==== @@ -27,7 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#5 (text+ko) ==== @@ -34,7 +34,6 @@ * ISO/IEC 802.1D-2004, June 9, 2004. */ - #include __FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.40 2007/12/09 20:47:12 thompsa Exp $"); ==== //depot/projects/vimage-commit2/src/sys/net/if_enc.c#6 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD$ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#5 (text+ko) ==== @@ -29,7 +29,6 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.39 2008/07/09 18:41:31 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.46 2008/07/09 15:48:16 rwatson Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ */ #include "opt_wlan.h" - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ * This file implements the base netgraph code. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_bridge.c#6 (text+ko) ==== @@ -58,7 +58,6 @@ * from one port to the other only rarely. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#5 (text+ko) ==== @@ -46,7 +46,6 @@ * ng_ether(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#5 (text+ko) ==== @@ -69,7 +69,6 @@ * ng_gif(4) netgraph node type */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_ipfw.c,v 1.9 2006/02/14 15:22:24 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_nat.c#5 (text+ko) ==== @@ -26,7 +26,6 @@ * $FreeBSD: src/sys/netgraph/ng_nat.c,v 1.12 2008/06/01 15:13:32 mav Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_source.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ * Author: Dave Chapeskie */ - #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/in_mcast.c#5 (text+ko) ==== @@ -39,7 +39,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#5 (text+ko) ==== @@ -43,7 +43,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_gre.c#6 (text+ko) ==== @@ -44,7 +44,6 @@ * This currently handles IPPROTO_GRE, IPPROTO_MOBILE */ - #include __FBSDID("$FreeBSD$"); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#5 (text+ko) ==== @@ -74,7 +74,6 @@ * enabled. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/frag6.c,v 1.36 2008/07/03 10:55:13 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#6 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.43 2008/07/05 13:10:10 rwatson Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#6 (text+ko) ==== @@ -75,7 +75,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/in6_rmx.c,v 1.23 2008/06/29 04:33:45 kan Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/netinet6/scope6.c,v 1.18 2007/12/10 16:03:39 obrien Exp $"); - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#7 (text+ko) ==== @@ -43,8 +43,6 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ - - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#10 (text+ko) ==== @@ -44,7 +44,6 @@ * Biba fixed label mandatory integrity policy. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#9 (text+ko) ==== @@ -45,7 +45,6 @@ * policy entry points. */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sparc64/sparc64/dump_machdep.c,v 1.9 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include ==== //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#7 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/sun4v/sun4v/dump_machdep.c,v 1.2 2008/01/28 19:04:07 ru Exp $ */ - #include #include #include