PERFORCE change 129190 for review
John Birrell
jb at FreeBSD.org
Sat Nov 17 17:00:42 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129190
Change 129190 by jb at 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 <sys/param.h>
==== //depot/projects/dtrace/src/sbin/spppcontrol/spppcontrol.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__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 <sys/types.h>
#include <sys/ioctl.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/linker.h>
==== //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
More information about the p4-projects
mailing list