PERFORCE change 142283 for review
John Birrell
jb at FreeBSD.org
Sun May 25 23:01:08 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142283
Change 142283 by jb at freebsd3 on 2008/05/25 23:00:57
IFC
Affected files ...
.. //depot/projects/dtrace/src/Makefile#24 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#11 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#16 integrate
.. //depot/projects/dtrace/src/include/Makefile#15 integrate
.. //depot/projects/dtrace/src/lib/Makefile#22 integrate
.. //depot/projects/dtrace/src/lib/libatm/Makefile#5 delete
.. //depot/projects/dtrace/src/lib/libatm/atm_addr.c#4 delete
.. //depot/projects/dtrace/src/lib/libatm/cache_key.c#5 delete
.. //depot/projects/dtrace/src/lib/libatm/ioctl_subr.c#4 delete
.. //depot/projects/dtrace/src/lib/libatm/ip_addr.c#4 delete
.. //depot/projects/dtrace/src/lib/libatm/ip_checksum.c#4 delete
.. //depot/projects/dtrace/src/lib/libatm/libatm.h#4 delete
.. //depot/projects/dtrace/src/lib/libatm/timer.c#4 delete
.. //depot/projects/dtrace/src/rescue/rescue/Makefile#12 integrate
.. //depot/projects/dtrace/src/sbin/atm/Makefile#5 integrate
.. //depot/projects/dtrace/src/sbin/atm/atm/Makefile#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm.8#5 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm.h#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm_fore200.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm_inet.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm_print.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm_set.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm_show.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/atm/atm_subr.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/fore_dnld/COPYRIGHT#4 delete
.. //depot/projects/dtrace/src/sbin/atm/fore_dnld/Makefile#4 delete
.. //depot/projects/dtrace/src/sbin/atm/fore_dnld/fore_dnld.8#4 delete
.. //depot/projects/dtrace/src/sbin/atm/fore_dnld/fore_dnld.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/fore_dnld/pca200e.c#4 delete
.. //depot/projects/dtrace/src/sbin/atm/ilmid/Makefile#4 delete
.. //depot/projects/dtrace/src/sbin/atm/ilmid/ilmid.8#4 delete
.. //depot/projects/dtrace/src/sbin/atm/ilmid/ilmid.c#4 delete
.. //depot/projects/dtrace/src/share/examples/Makefile#5 integrate
.. //depot/projects/dtrace/src/share/examples/atm/NOTES#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/README#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/Startup#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/atm-config.sh#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/atm-sockets.txt#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/cpcs-design.txt#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/fore-microcode.txt#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/sscf-design.txt#4 delete
.. //depot/projects/dtrace/src/share/examples/atm/sscop-design.txt#4 delete
.. //depot/projects/dtrace/src/share/man/man4/Makefile#37 integrate
.. //depot/projects/dtrace/src/share/man/man4/ng_atmpif.4#4 delete
.. //depot/projects/dtrace/src/share/man/man7/hier.7#12 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate
.. //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#15 integrate
.. //depot/projects/dtrace/src/usr.bin/kdump/mkioctls#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#26 integrate
.. //depot/projects/dtrace/src/usr.sbin/atm/Makefile#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/Makefile.inc#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/Makefile#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarp_config.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarp_log.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarp_scsp.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarp_subr.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarp_timer.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarp_var.h#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarpd.8#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/atmarpd/atmarpd.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/Makefile#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_cafsm.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_config.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_config_lex.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_config_parse.y#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_hfsm.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_if.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_if.h#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_input.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_log.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_msg.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_msg.h#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_output.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_print.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_socket.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_subr.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_timer.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scsp_var.h#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scspd.8#4 delete
.. //depot/projects/dtrace/src/usr.sbin/atm/scspd/scspd.c#4 delete
Differences ...
==== //depot/projects/dtrace/src/Makefile#24 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.350 2008/05/25 02:48:57 jb Exp $
+# $FreeBSD: src/Makefile,v 1.351 2008/05/25 22:13:17 jb Exp $
#
# The user-driven targets are:
#
@@ -275,7 +275,7 @@
# existing system is.
#
.if make(universe)
-TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64
+TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
universe: universe_prologue
universe_prologue:
==== //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#11 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.121 2008/05/07 04:11:21 jhb Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.122 2008/05/25 22:11:23 rwatson Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -211,17 +211,6 @@
..
netatalk
..
-# Disabled in 7.0 as netatm is not MPSAFE.
-# netatm
-# ipatm
-# ..
-# sigpvc
-# ..
-# spans
-# ..
-# uni
-# ..
-# ..
netgraph
atm
..
==== //depot/projects/dtrace/src/etc/mtree/BSD.usr.dist#16 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.332 2007/11/10 22:47:46 sam Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.333 2008/05/25 22:11:23 rwatson Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -189,9 +189,6 @@
..
IPv6
..
-# Disabled in 7.0 as netatm is not MPSAFE.
-# atm
-# ..
bc
..
bootforth
==== //depot/projects/dtrace/src/include/Makefile#15 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.277 2008/05/07 04:11:21 jhb Exp $
+# $FreeBSD: src/include/Makefile,v 1.278 2008/05/25 22:11:23 rwatson Exp $
#
# Doing a "make install" builds /usr/include.
@@ -40,7 +40,6 @@
netipsec ${_netipx} netnatm ${_netncp} netsmb \
nfs nfsclient nfsserver \
pccard sys vm
-#LDIRS+= netatm
LSUBDIRS= cam/scsi \
dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
@@ -57,7 +56,6 @@
security/mac_biba security/mac_bsdextended security/mac_lomac \
security/mac_mls security/mac_partition \
ufs/ffs ufs/ufs
-#LSUBDIRS+= netatm/ipatm netatm/sigpvc netatm/spans netatm/uni
LSUBSUBDIRS= dev/mpt/mpilib
==== //depot/projects/dtrace/src/lib/Makefile#22 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.230 2008/05/22 04:22:43 jb Exp $
+# $FreeBSD: src/lib/Makefile,v 1.231 2008/05/25 22:11:23 rwatson Exp $
.include <bsd.own.mk>
@@ -48,8 +48,6 @@
.endif
.if ${MK_ATM} != "no"
-# Disabled in 7.0 as netatm is not MPSAFE.
-#_libatm= libatm
_libngatm= libngatm
.endif
==== //depot/projects/dtrace/src/rescue/rescue/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.60 2008/03/29 13:15:33 ru Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.61 2008/05/25 22:11:24 rwatson Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
NO_MAN=
@@ -124,9 +124,6 @@
.if ${MK_ATM} != "no"
CRUNCH_PROGS_sbin+= atmconfig
-# Disabled in 7.0 as netatm is not MPSAFE.
-#CRUNCH_PROGS_sbin+= atm fore_dnld ilmid
-#CRUNCH_LIBS+= -latm
.endif
.if ${MK_INET6_SUPPORT} != "no"
==== //depot/projects/dtrace/src/sbin/atm/Makefile#5 (text+ko) ====
@@ -21,13 +21,8 @@
# notice must be reproduced on all copies.
#
# @(#) $Id: Makefile,v 1.5 1998/07/10 16:01:58 jpt Exp $
-# $FreeBSD: src/sbin/atm/Makefile,v 1.6 2007/07/14 21:49:22 rwatson Exp $
+# $FreeBSD: src/sbin/atm/Makefile,v 1.7 2008/05/25 22:11:24 rwatson Exp $
SUBDIR= atmconfig
-# Disabled in 7.0 as netatm is not MPSAFE.
-# atm \
-# fore_dnld \
-# ilmid
-
.include <bsd.subdir.mk>
==== //depot/projects/dtrace/src/share/examples/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/Makefile,v 1.51 2007/07/14 21:49:22 rwatson Exp $
+# $FreeBSD: src/share/examples/Makefile,v 1.52 2008/05/25 22:11:26 rwatson Exp $
#
# Doing a make install builds /usr/share/examples
@@ -34,9 +34,6 @@
startslip \
sunrpc
-# Disabled in 7.0 as netatm is not MPSAFE.
-#LDIRS+= atm
-
XFILES= BSD_daemon/FreeBSD.pfa \
BSD_daemon/README \
BSD_daemon/beastie.eps \
@@ -239,17 +236,6 @@
sunrpc/sort/sort.x \
sunrpc/sort/sort_proc.c
-# Disabled in 7.0 as netatm is not MPSAFE.
-#XFILES+= atm/NOTES \
-# atm/README \
-# atm/Startup \
-# atm/atm-config.sh \
-# atm/atm-sockets.txt \
-# atm/cpcs-design.txt \
-# atm/fore-microcode.txt \
-# atm/sscf-design.txt \
-# atm/sscop-design.txt
-
BINDIR= ${SHAREDIR}/examples
NO_OBJ=
==== //depot/projects/dtrace/src/share/man/man4/Makefile#37 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.417 2008/05/19 02:21:00 yongari Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.418 2008/05/25 22:11:26 rwatson Exp $
MAN= aac.4 \
acpi.4 \
@@ -197,7 +197,6 @@
ng_atm.4 \
ngatmbase.4 \
ng_atmllc.4 \
- ng_atmpif.4 \
ng_bluetooth.4 \
ng_bpf.4 \
ng_bridge.4 \
==== //depot/projects/dtrace/src/share/man/man7/hier.7#12 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: src/share/man/man7/hier.7,v 1.129 2007/07/01 12:08:07 gnn Exp $
+.\" $FreeBSD: src/share/man/man7/hier.7,v 1.130 2008/05/25 22:11:27 rwatson Exp $
.\"
.Dd June 28, 2007
.Dt HIER 7
@@ -306,10 +306,6 @@
miscellaneous network C include files
.It Pa netatalk/
Appletalk protocol
-.It Pa netatm/
-ATM include files;
-see
-.Xr atm 8
.It Pa netinet/
C include files for Internet standard protocols;
see
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
static kmem_cache_t *reference_history_cache;
void
-refcount_init(void)
+refcount_sysinit(void)
{
reference_cache = kmem_cache_create("reference_cache",
sizeof (reference_t), 0, NULL, NULL, NULL, NULL, NULL, 0);
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 (text+ko) ====
@@ -1103,7 +1103,7 @@
spa_mode = mode;
- refcount_init();
+ refcount_sysinit();
unique_init();
zio_init();
dmu_init();
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 (text+ko) ====
@@ -28,6 +28,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include_next <sys/refcount.h>
#include <sys/list.h>
#include <sys/zfs_context.h>
@@ -70,7 +71,7 @@
int64_t refcount_add_many(refcount_t *rc, uint64_t number, void *holder_tag);
int64_t refcount_remove_many(refcount_t *rc, uint64_t number, void *holder_tag);
-void refcount_init(void);
+void refcount_sysinit(void);
void refcount_fini(void);
#else /* DEBUG */
@@ -91,7 +92,7 @@
#define refcount_remove_many(rc, number, holder) \
atomic_add_64_nv(&(rc)->rc_count, -number)
-#define refcount_init()
+#define refcount_sysinit()
#define refcount_fini()
#endif /* DEBUG */
==== //depot/projects/dtrace/src/usr.bin/kdump/kdump.c#15 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.42 2008/04/02 09:41:29 ru Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.43 2008/05/25 22:11:38 rwatson Exp $");
#define _KERNEL
extern int errno;
@@ -1155,8 +1155,6 @@
{
/*
TODO: Support additional address families
- #include <netatm/atm.h>
- struct sockaddr_atm *atm;
#include <netnatm/natm.h>
struct sockaddr_natm *natm;
#include <netsmb/netbios.h>
==== //depot/projects/dtrace/src/usr.bin/kdump/mkioctls#6 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/usr.bin/kdump/mkioctls,v 1.40 2008/02/03 11:33:27 des Exp $
+# $FreeBSD: src/usr.bin/kdump/mkioctls,v 1.41 2008/05/25 22:11:38 rwatson Exp $
set -e
@@ -46,11 +46,6 @@
print "#include <net/if_var.h>"
print "#include <net/pfvar.h>"
print "#include <net/route.h>"
-# Disabled in 7.0 as netatm is not MPSAFE.
-# print "#include <netatm/atm.h>"
-# print "#include <netatm/atm_if.h>"
-# print "#include <netatm/atm_sap.h>"
-# print "#include <netatm/atm_sys.h>"
print "#include <netinet/in.h>"
print "#include <netinet/ip_mroute.h>"
print "#include <netinet6/in6_var.h>"
==== //depot/projects/dtrace/src/usr.sbin/Makefile#26 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.385 2008/05/10 00:43:13 julian Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.386 2008/05/25 22:11:38 rwatson Exp $
.include <bsd.own.mk>
@@ -201,11 +201,6 @@
_sysinstall= sysinstall
.endif
-# Disabled in 7.0 as netatm is not MPSAFE.
-#.if ${MK_ATM} != "no"
-#_atm= atm
-#.endif
-
.if ${MK_AUDIT} != "no"
_audit= audit
_auditd= auditd
More information about the p4-projects
mailing list