From owner-p4-projects@FreeBSD.ORG Sun Nov 18 01:00:42 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 085F016A421; Sun, 18 Nov 2007 01:00:42 +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 A9E8D16A417 for ; Sun, 18 Nov 2007 01:00:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B81413C468 for ; Sun, 18 Nov 2007 01:00:41 +0000 (UTC) (envelope-from jb@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 lAI10fGl060552 for ; Sun, 18 Nov 2007 01:00:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAI10eSD060549 for perforce@freebsd.org; Sun, 18 Nov 2007 01:00:40 GMT (envelope-from jb@freebsd.org) Date: Sun, 18 Nov 2007 01:00:40 GMT Message-Id: <200711180100.lAI10eSD060549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129190 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: Sun, 18 Nov 2007 01:00:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=129190 Change 129190 by jb@jb_freebsd1 on 2007/11/18 01:00:16 IFC Loopback my changes. Affected files ... .. //depot/projects/dtrace/src/contrib/csup/mux.c#4 integrate .. //depot/projects/dtrace/src/sbin/spppcontrol/spppcontrol.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_linker.c#24 integrate .. //depot/projects/dtrace/src/sys/kern/linker_if.m#6 integrate .. //depot/projects/dtrace/src/sys/sys/linker.h#16 integrate .. //depot/projects/dtrace/src/usr.bin/tip/tip/Makefile#6 integrate .. //depot/projects/dtrace/src/usr.sbin/arp/Makefile#5 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/csup/mux.c#4 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/csup/mux.c,v 1.1.1.1 2006/03/03 04:11:28 mux Exp $ + * $FreeBSD: src/contrib/csup/mux.c,v 1.2 2007/11/18 00:25:18 jb Exp $ */ #include ==== //depot/projects/dtrace/src/sbin/spppcontrol/spppcontrol.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.13 2003/05/03 18:41:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/sbin/spppcontrol/spppcontrol.c,v 1.14 2007/11/18 00:33:23 jb Exp $"); #include #include @@ -88,7 +88,7 @@ argc--; argv++; - spr.cmd = (int)(uintptr_t) SPPPIOGDEFS; + spr.cmd = (uintptr_t) SPPPIOGDEFS; ifr.ifr_data = (caddr_t)&spr; if (ioctl(s, SIOCGIFGENERIC, &ifr) == -1) @@ -186,7 +186,7 @@ argc--; } - spr.cmd = (int)(uintptr_t)SPPPIOSDEFS; + spr.cmd = (uintptr_t)SPPPIOSDEFS; if (ioctl(s, SIOCSIFGENERIC, &ifr) == -1) err(EX_OSERR, "SIOCSIFGENERIC(SPPPIOSDEFS)"); ==== //depot/projects/dtrace/src/sys/kern/kern_linker.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.151 2007/10/24 19:03:54 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.152 2007/11/18 00:23:31 jb Exp $"); #include "opt_ddb.h" #include "opt_hwpmc_hooks.h" ==== //depot/projects/dtrace/src/sys/kern/linker_if.m#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/kern/linker_if.m,v 1.6 2005/01/06 23:35:39 imp Exp $ +# $FreeBSD: src/sys/kern/linker_if.m,v 1.7 2007/11/18 00:23:31 jb Exp $ # #include ==== //depot/projects/dtrace/src/sys/sys/linker.h#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/linker.h,v 1.47 2007/10/22 04:12:57 jb Exp $ + * $FreeBSD: src/sys/sys/linker.h,v 1.48 2007/11/18 00:23:31 jb Exp $ */ #ifndef _SYS_LINKER_H_ ==== //depot/projects/dtrace/src/usr.bin/tip/tip/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $OpenBSD: Makefile,v 1.11 2006/05/25 08:41:52 jmc Exp $ -# $FreeBSD: src/usr.bin/tip/tip/Makefile,v 1.20 2006/09/01 17:09:09 ru Exp $ +# $FreeBSD: src/usr.bin/tip/tip/Makefile,v 1.21 2007/11/18 00:29:36 jb Exp $ # # Files are: # /etc/remote remote host description file ==== //depot/projects/dtrace/src/usr.sbin/arp/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/18/94 -# $FreeBSD: src/usr.sbin/arp/Makefile,v 1.12 2004/04/13 11:45:28 luigi Exp $ +# $FreeBSD: src/usr.sbin/arp/Makefile,v 1.13 2007/11/18 00:29:36 jb Exp $ PROG= arp MAN= arp.4 arp.8