From owner-p4-projects@FreeBSD.ORG Sun Oct 31 02:25:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C51816A4D0; Sun, 31 Oct 2004 02:25:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB36916A4CE for ; Sun, 31 Oct 2004 02:25:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AFFE643D5A for ; Sun, 31 Oct 2004 02:25:52 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9V2Pq2j000238 for ; Sun, 31 Oct 2004 02:25:52 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9V2Pqj8000234 for perforce@freebsd.org; Sun, 31 Oct 2004 02:25:52 GMT (envelope-from marcel@freebsd.org) Date: Sun, 31 Oct 2004 02:25:52 GMT Message-Id: <200410310225.i9V2Pqj8000234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Oct 2004 02:25:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=64005 Change 64005 by marcel@marcel_nfs on 2004/10/31 02:25:29 Have the bus frontends call scc_bfe_probe() for further probe related processing. Affected files ... .. //depot/projects/uart/dev/scc/scc_bfe.h#4 edit .. //depot/projects/uart/dev/scc/scc_bfe_ebus.c#2 edit .. //depot/projects/uart/dev/scc/scc_bfe_sbus.c#2 edit .. //depot/projects/uart/dev/scc/scc_core.c#2 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bfe.h#4 (text+ko) ==== @@ -78,6 +78,7 @@ int scc_bfe_attach(device_t dev); int scc_bfe_detach(device_t dev); +int scc_bfe_probe(device_t dev); struct resource *scc_bus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); ==== //depot/projects/uart/dev/scc/scc_bfe_ebus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * @@ -53,7 +53,7 @@ if (!strcmp(nm, "se")) { device_set_desc(dev, "Siemens SAB 82532 dual channel SCC"); sc->sc_class = &scc_sab82532_class; - return (0); + return (scc_bfe_probe(dev)); } return (ENXIO); } ==== //depot/projects/uart/dev/scc/scc_bfe_sbus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 2004 Marcel Moolenaar * All rights reserved. * @@ -53,7 +53,7 @@ if (!strcmp(nm, "zs")) { device_set_desc(dev, "Zilog Z8530 dual channel SCC"); sc->sc_class = &scc_z8530_class; - return (0); + return (scc_bfe_probe(dev)); } return (ENXIO); } ==== //depot/projects/uart/dev/scc/scc_core.c#2 (text+ko) ==== @@ -47,6 +47,13 @@ int scc_bfe_attach(device_t dev) { + struct scc_softc *sc; + + sc = device_get_softc(dev); + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, sc->sc_class->sc_range, RF_ACTIVE); + if (sc->sc_rres == NULL) + return (ENXIO); return (ENXIO); } @@ -58,6 +65,48 @@ return (ENXIO); } +int +scc_bfe_probe(device_t dev) +{ + struct scc_softc *sc; + + /* + * Initialize the instance. Note that the instance (=softc) does + * not necessarily match the hardware specific softc. We can't do + * anything about it now, because we may not attach to the device. + * Hardware drivers cannot use any of the class specific fields + * while probing. + */ + sc = device_get_softc(dev); + kobj_init((kobj_t)sc, (kobj_class_t)sc->sc_class); + sc->sc_dev = dev; + if (device_get_desc(dev) == NULL) + device_set_desc(dev, sc->sc_class->name); + + /* + * Allocate the register resource. We assume that all SCCs have a + * single register window in either I/O port space or memory mapped + * I/O space. Any SCC that needs multiple windows will consequently + * not be supported by this driver as-is. We try I/O port space + * first to satisfy the EBus code. + */ + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_IOPORT; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, &sc->sc_rrid, + 0, ~0, sc->sc_class->sc_range, RF_ACTIVE); + if (sc->sc_rres == NULL) { + sc->sc_rrid = 0; + sc->sc_rtype = SYS_RES_MEMORY; + sc->sc_rres = bus_alloc_resource(dev, sc->sc_rtype, + &sc->sc_rrid, 0, ~0, sc->sc_class->sc_range, RF_ACTIVE); + if (sc->sc_rres == NULL) + return (ENXIO); + } + + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, sc->sc_rres); + return (0); +} + struct resource * scc_bus_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) From owner-p4-projects@FreeBSD.ORG Sun Oct 31 17:16:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFB7116A4D1; Sun, 31 Oct 2004 17:16:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AA2916A4CE for ; Sun, 31 Oct 2004 17:16:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0848643D53 for ; Sun, 31 Oct 2004 17:16:02 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9VHG1C1053968 for ; Sun, 31 Oct 2004 17:16:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9VHG0We053965 for perforce@freebsd.org; Sun, 31 Oct 2004 17:16:00 GMT (envelope-from peter@freebsd.org) Date: Sun, 31 Oct 2004 17:16:00 GMT Message-Id: <200410311716.i9VHG0We053965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Oct 2004 17:16:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64019 Change 64019 by peter@peter_overcee on 2004/10/31 17:15:50 IFC @64018 Affected files ... .. //depot/projects/hammer/Makefile.inc1#67 integrate .. //depot/projects/hammer/bin/rm/rm.1#7 integrate .. //depot/projects/hammer/bin/rm/rm.c#9 integrate .. //depot/projects/hammer/crypto/openssh/.cvsignore#2 delete .. //depot/projects/hammer/crypto/openssh/CREDITS#5 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#7 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/hammer/crypto/openssh/INSTALL#5 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/hammer/crypto/openssh/README#5 integrate .. //depot/projects/hammer/crypto/openssh/README.platform#2 integrate .. //depot/projects/hammer/crypto/openssh/README.privsep#5 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/auth-rsa.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#6 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#7 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#8 integrate .. //depot/projects/hammer/crypto/openssh/auth2-chall.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/hammer/crypto/openssh/auth2-none.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#8 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/authfile.c#6 integrate .. //depot/projects/hammer/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/hammer/crypto/openssh/canohost.c#8 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#8 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#5 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#7 integrate .. //depot/projects/hammer/crypto/openssh/cipher.h#3 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#6 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.h#3 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#7 integrate .. //depot/projects/hammer/crypto/openssh/config.guess#5 integrate .. //depot/projects/hammer/crypto/openssh/config.h#7 integrate .. //depot/projects/hammer/crypto/openssh/config.sub#5 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#7 integrate .. //depot/projects/hammer/crypto/openssh/contrib/Makefile#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/buildbff.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/inventory.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/aix/pam.conf#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/openssh.spec#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/ssh-host-keygen#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/sshd.init#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/caldera/sshd.pam#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/Makefile#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/ssh-host-config#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/cygwin/ssh-user-config#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/findssl.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/gnome-ssh-askpass1.c#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/gnome-ssh-askpass2.c#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/egd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/egd.rc#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/sshd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/hpux/sshd.rc#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/openssh.spec#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/sshd.init#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/redhat/sshd.pam#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/solaris/README#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/solaris/buildpkg.sh#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/solaris/opensshd.in#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/ssh-copy-id#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/ssh-copy-id.1#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/sshd.pam.freebsd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/sshd.pam.generic#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/suse/openssh.spec#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/suse/rc.config.sshd#2 delete .. //depot/projects/hammer/crypto/openssh/contrib/suse/rc.sshd#2 delete .. //depot/projects/hammer/crypto/openssh/defines.h#7 integrate .. //depot/projects/hammer/crypto/openssh/dh.c#7 integrate .. //depot/projects/hammer/crypto/openssh/dh.h#2 integrate .. //depot/projects/hammer/crypto/openssh/dns.c#3 integrate .. //depot/projects/hammer/crypto/openssh/envpass.sh#1 branch .. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#6 integrate .. //depot/projects/hammer/crypto/openssh/kex.c#4 integrate .. //depot/projects/hammer/crypto/openssh/kex.h#4 integrate .. //depot/projects/hammer/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/hammer/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/hammer/crypto/openssh/key.c#7 integrate .. //depot/projects/hammer/crypto/openssh/log.c#6 integrate .. //depot/projects/hammer/crypto/openssh/log.h#7 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#7 integrate .. //depot/projects/hammer/crypto/openssh/logintest.c#3 integrate .. //depot/projects/hammer/crypto/openssh/mdoc2man.awk#3 integrate .. //depot/projects/hammer/crypto/openssh/misc.c#6 integrate .. //depot/projects/hammer/crypto/openssh/misc.h#3 integrate .. //depot/projects/hammer/crypto/openssh/moduli.c#3 integrate .. //depot/projects/hammer/crypto/openssh/moduli.h#2 delete .. //depot/projects/hammer/crypto/openssh/monitor.c#9 integrate .. //depot/projects/hammer/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.c#4 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#7 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#6 integrate .. //depot/projects/hammer/crypto/openssh/myproposal.h#3 integrate .. //depot/projects/hammer/crypto/openssh/nchan.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/.cvsignore#2 delete .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/hammer/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/hammer/crypto/openssh/packet.c#7 integrate .. //depot/projects/hammer/crypto/openssh/packet.h#4 integrate .. //depot/projects/hammer/crypto/openssh/pathnames.h#3 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#5 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#7 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#6 integrate .. //depot/projects/hammer/crypto/openssh/readpass.c#3 integrate .. //depot/projects/hammer/crypto/openssh/readpass.h#2 delete .. //depot/projects/hammer/crypto/openssh/regress/Makefile#6 integrate .. //depot/projects/hammer/crypto/openssh/regress/README.regress#4 integrate .. //depot/projects/hammer/crypto/openssh/regress/dynamic-forward.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/login-timeout.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#5 integrate .. //depot/projects/hammer/crypto/openssh/regress/try-ciphers.sh#4 integrate .. //depot/projects/hammer/crypto/openssh/rijndael.c#5 integrate .. //depot/projects/hammer/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/hammer/crypto/openssh/scard.c#3 integrate .. //depot/projects/hammer/crypto/openssh/scard/.cvsignore#2 delete .. //depot/projects/hammer/crypto/openssh/scp.1#6 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#7 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#7 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#5 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#7 integrate .. //depot/projects/hammer/crypto/openssh/session.c#10 integrate .. //depot/projects/hammer/crypto/openssh/session.h#6 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#6 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#7 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#5 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#4 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#7 integrate .. //depot/projects/hammer/crypto/openssh/ssh1.h#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#9 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#5 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#8 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#7 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#9 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#10 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#11 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.c#4 integrate .. //depot/projects/hammer/crypto/openssh/sshtty.h#3 delete .. //depot/projects/hammer/crypto/openssh/tildexpand.c#2 integrate .. //depot/projects/hammer/crypto/openssh/tildexpand.h#2 delete .. //depot/projects/hammer/crypto/openssh/ttymodes.h#2 integrate .. //depot/projects/hammer/crypto/openssh/version.c#3 integrate .. //depot/projects/hammer/crypto/openssh/version.h#10 integrate .. //depot/projects/hammer/etc/defaults/Makefile#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#39 integrate .. //depot/projects/hammer/etc/mtree/Makefile#3 integrate .. //depot/projects/hammer/etc/namedb/Makefile#2 integrate .. //depot/projects/hammer/etc/network.subr#8 integrate .. //depot/projects/hammer/etc/pam.d/Makefile#5 integrate .. //depot/projects/hammer/etc/rc.d/netif#10 integrate .. //depot/projects/hammer/etc/rc.d/pf#6 integrate .. //depot/projects/hammer/etc/rc.d/savecore#8 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#30 integrate .. //depot/projects/hammer/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/hammer/games/ppt/Makefile#3 integrate .. //depot/projects/hammer/games/primes/Makefile#2 integrate .. //depot/projects/hammer/gnu/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/hammer/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#8 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#10 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdbreplay/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#11 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#7 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libopcodes/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1obj/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc1plus/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#12 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/lib/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/libdiff/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/TESTS/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/devices/grohtml/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libbib/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libdriver/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/libs/libgroff/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/html/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/man/lib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/rcs/lib/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/texinfo/libtxi/Makefile#3 integrate .. //depot/projects/hammer/include/arpa/Makefile#2 integrate .. //depot/projects/hammer/include/protocols/Makefile#2 integrate .. //depot/projects/hammer/lib/bind/config.mk#4 integrate .. //depot/projects/hammer/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/hammer/lib/libalias/Makefile#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#17 integrate .. //depot/projects/hammer/lib/libbsnmp/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/Makefile#18 integrate .. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/amd64/sys/brk.S#8 integrate .. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sys/mlock.2#7 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#8 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#7 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#8 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#5 integrate .. //depot/projects/hammer/lib/libdisk/Makefile#8 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#11 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#7 integrate .. //depot/projects/hammer/lib/libio/Makefile#2 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#14 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#13 integrate .. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#16 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#14 integrate .. //depot/projects/hammer/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/hammer/lib/libsm/Makefile#5 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#4 integrate .. //depot/projects/hammer/lib/libsmdb/Makefile#3 integrate .. //depot/projects/hammer/lib/libsmutil/Makefile#3 integrate .. //depot/projects/hammer/lib/libstand/Makefile#10 integrate .. //depot/projects/hammer/lib/libtelnet/Makefile#5 integrate .. //depot/projects/hammer/lib/libthr/Makefile#7 integrate .. //depot/projects/hammer/lib/libxpg4/Makefile#3 integrate .. //depot/projects/hammer/lib/liby/Makefile#4 integrate .. //depot/projects/hammer/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#18 integrate .. //depot/projects/hammer/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#13 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#4 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch .. //depot/projects/hammer/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/hammer/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#4 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#17 integrate .. //depot/projects/hammer/sbin/Makefile#29 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.8#7 integrate .. //depot/projects/hammer/sbin/dhclient/common/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/dst/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/minires/Makefile#2 integrate .. //depot/projects/hammer/sbin/dhclient/omapip/Makefile#2 integrate .. //depot/projects/hammer/sbin/fdisk_pc98/fdisk.c#8 integrate .. //depot/projects/hammer/sbin/gpt/add.c#7 integrate .. //depot/projects/hammer/sbin/gpt/create.c#5 integrate .. //depot/projects/hammer/sbin/gpt/destroy.c#4 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#5 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#6 integrate .. //depot/projects/hammer/sbin/gpt/gpt.h#5 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#7 integrate .. //depot/projects/hammer/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/hammer/sbin/gpt/recover.c#6 integrate .. //depot/projects/hammer/sbin/gpt/remove.c#2 integrate .. //depot/projects/hammer/sbin/gpt/show.c#7 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#6 integrate .. //depot/projects/hammer/sbin/gvinum/Makefile#2 integrate .. //depot/projects/hammer/sbin/mca/Makefile#3 integrate .. //depot/projects/hammer/sbin/pflogd/Makefile#3 integrate .. //depot/projects/hammer/sbin/rtsol/Makefile#5 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#13 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#8 integrate .. //depot/projects/hammer/secure/lib/libssl/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#9 integrate .. //depot/projects/hammer/share/dict/Makefile#2 integrate .. //depot/projects/hammer/share/doc/IPv6/Makefile#2 integrate .. //depot/projects/hammer/share/doc/bind9/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/bufbio/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/devfs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/diskperf/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/jail/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/kernmalloc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/kerntune/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/nqnfs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/px/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/relengr/Makefile#3 integrate .. //depot/projects/hammer/share/doc/papers/sysperf/Makefile#4 integrate .. //depot/projects/hammer/share/doc/papers/timecounter/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/01.cacm/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/02.implement/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/05.sysman/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/06.Clang/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/13.rcs/rcs/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/15.yacc/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/16.lex/Makefile#4 integrate .. //depot/projects/hammer/share/doc/psd/18.gprof/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/20.ipctut/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/21.ipc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/22.rpcgen/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/23.rpc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/24.xdr/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/25.xdrrfc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/26.rpcrfc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/27.nfsrpc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/28.cvs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/01.setup/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/02.config/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/05.fastfs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/smm/08.sendmailop/Makefile#4 integrate .. //depot/projects/hammer/share/doc/smm/12.timed/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/04.csh/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/07.mail/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/10.exref/summary/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/11.vitut/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/summary/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/vi/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/13.viref/Makefile#4 integrate .. //depot/projects/hammer/share/doc/usd/21.troff/Makefile#3 integrate .. //depot/projects/hammer/share/examples/Makefile#7 integrate .. //depot/projects/hammer/share/examples/autofs/driver/Makefile#3 integrate .. //depot/projects/hammer/share/examples/cvsup/stable-supfile#4 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#28 integrate .. //depot/projects/hammer/share/examples/ipfilter/Makefile#2 integrate .. //depot/projects/hammer/share/examples/isdn/v21/Makefile#3 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/hammer/share/examples/libvgl/Makefile#3 integrate .. //depot/projects/hammer/share/examples/pf/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ppi/Makefile#2 integrate .. //depot/projects/hammer/share/examples/smbfs/Makefile#2 integrate .. //depot/projects/hammer/share/examples/smbfs/print/Makefile#2 integrate .. //depot/projects/hammer/share/info/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/fd.4#2 integrate .. //depot/projects/hammer/share/man/man4/mem.4#6 integrate .. //depot/projects/hammer/share/man/man4/uftdi.4#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#40 integrate .. //depot/projects/hammer/share/man/man9/taskqueue.9#7 integrate .. //depot/projects/hammer/share/misc/Makefile#3 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#19 integrate .. //depot/projects/hammer/share/mk/Makefile#4 integrate .. //depot/projects/hammer/share/mk/sys.mk#16 integrate .. //depot/projects/hammer/share/security/Makefile#3 integrate .. //depot/projects/hammer/share/sendmail/Makefile#4 integrate .. //depot/projects/hammer/share/skel/Makefile#3 integrate .. //depot/projects/hammer/share/snmp/mibs/Makefile#2 integrate .. //depot/projects/hammer/share/syscons/fonts/Makefile#5 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#104 integrate .. //depot/projects/hammer/sys/amd64/include/vmparam.h#22 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#25 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/arc/lib/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/common/Makefile.inc#10 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/Makefile#5 integrate .. //depot/projects/hammer/sys/boot/ficl/Makefile#10 integrate .. //depot/projects/hammer/sys/boot/forth/beastie.4th#7 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#14 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/hammer/sys/boot/pc98/libpc98/Makefile#7 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#4 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/hammer/sys/conf/NOTES#70 integrate .. //depot/projects/hammer/sys/conf/files#89 integrate .. //depot/projects/hammer/sys/conf/files.i386#42 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#23 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#33 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#37 integrate .. //depot/projects/hammer/sys/conf/options#61 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#14 integrate .. //depot/projects/hammer/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#15 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#6 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#37 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#19 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#22 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd.c#11 integrate .. //depot/projects/hammer/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/hammer/sys/dev/scd/scd.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/hammer/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#15 integrate .. //depot/projects/hammer/sys/dev/usb/uhci.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#51 integrate .. //depot/projects/hammer/sys/dev/usb/uscanner.c#18 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs.h#4 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#11 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_denode.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#23 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#15 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#8 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#7 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#13 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#16 integrate .. //depot/projects/hammer/sys/geom/geom.h#30 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#28 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#11 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#32 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#1 branch .. //depot/projects/hammer/sys/geom/geom_vfs.h#1 branch .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_bmap.c#6 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_inode.c#9 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_subr.c#4 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#20 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#56 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#41 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#60 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#19 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_bmap.c#4 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.c#9 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_node.h#6 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#19 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vnops.c#15 integrate .. //depot/projects/hammer/sys/isofs/cd9660/iso.h#5 integrate .. //depot/projects/hammer/sys/kern/imgact_shell.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#25 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#19 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#51 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#2 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#28 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#43 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#20 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#59 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#23 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#10 integrate .. //depot/projects/hammer/sys/modules/Makefile#57 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/smbfs/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#34 integrate .. //depot/projects/hammer/sys/net/if_var.h#23 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#12 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#16 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#13 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#10 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#23 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_node.c#11 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/hammer/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#9 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#35 integrate .. //depot/projects/hammer/sys/pc98/pc98/wd_cd.c#9 integrate .. //depot/projects/hammer/sys/pci/agp.c#16 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#16 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#27 integrate .. //depot/projects/hammer/sys/sparc64/conf/NOTES#10 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/hammer/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/hammer/sys/sys/buf.h#17 integrate .. //depot/projects/hammer/sys/sys/bufobj.h#2 integrate .. //depot/projects/hammer/sys/sys/conf.h#25 integrate .. //depot/projects/hammer/sys/sys/kernel.h#11 integrate .. //depot/projects/hammer/sys/sys/mount.h#24 integrate .. //depot/projects/hammer/sys/sys/systm.h#26 integrate .. //depot/projects/hammer/sys/sys/vnode.h#33 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#16 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#11 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#26 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#30 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#26 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#9 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_bmap.c#7 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#21 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufsmount.h#5 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#32 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#32 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#34 integrate .. //depot/projects/hammer/sys/vm/vm_kern.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#37 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#31 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#14 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#15 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#22 integrate .. //depot/projects/hammer/tools/diag/dumpvfscache/Makefile#3 integrate .. //depot/projects/hammer/tools/diag/localeck/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/geom/ConfCmp/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/geom/MdLoad/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/ttls1/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/tls/ttls2/Makefile#3 integrate .. //depot/projects/hammer/tools/test/malloc/Makefile#2 integrate .. //depot/projects/hammer/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/aac/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/gdb_regofs/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/ministat/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/nanobsd/localfiles#2 integrate .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#6 integrate .. //depot/projects/hammer/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/netrate/netsend/Makefile#3 integrate .. //depot/projects/hammer/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/raidtest/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#27 integrate .. //depot/projects/hammer/usr.bin/dirname/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/elf2aout/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/newgrp/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/truss/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/unexpand/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/uudecode/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/amd/libamu/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/config/config.y#8 integrate .. //depot/projects/hammer/usr.sbin/config/lang.l#8 integrate .. //depot/projects/hammer/usr.sbin/cron/lib/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/mkCTM/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/fwcontrol/fwcontrol.c#11 integrate .. //depot/projects/hammer/usr.sbin/lpr/SMM.doc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/lpr/common_source/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/mrouted/common/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/libntp/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/libparse/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/Misc/Doc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/Misc/Etc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/Misc/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#9 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#67 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -565,7 +565,7 @@ .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} -KERNWARN= yes +KERNWARN= .else KERNCONF?= GENERIC .endif ==== //depot/projects/hammer/bin/rm/rm.1#7 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.32 2004/10/28 08:25:30 delphij Exp $ .\" -.Dd October 4, 2004 +.Dd October 28, 2004 .Dt RM 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd remove directory entries .Sh SYNOPSIS .Nm -.Op Fl dfiPRrvW +.Op Fl dfiIPRrvW .Ar .Nm unlink .Ar file @@ -76,6 +76,12 @@ option overrides any previous .Fl f options. +.It Fl I +Request confirmation once if more then three files are being removed or if a +directory is being recursively removed. This is a far less intrusive option +than +.Fl i +yet provides almost the same level of protection against mistakes. .It Fl P Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, ==== //depot/projects/hammer/bin/rm/rm.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); #include #include @@ -58,9 +58,11 @@ #include int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +int rflag, Iflag; uid_t uid; int check(char *, char *, struct stat *); +int check2(char **); void checkdot(char **); void checkslash(char **); void rm_file(char **); @@ -78,7 +80,7 @@ int main(int argc, char *argv[]) { - int ch, rflag; + int ch; char *p; /* @@ -102,7 +104,7 @@ } Pflag = rflag = 0; - while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) + while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) switch(ch) { case 'd': dflag = 1; @@ -115,6 +117,9 @@ fflag = 0; iflag = 1; break; + case 'I': + Iflag = 1; + break; case 'P': Pflag = 1; break; @@ -148,6 +153,10 @@ if (*argv) { stdin_ok = isatty(STDIN_FILENO); + if (Iflag) { + if (check2(argv) == 0) + exit (1); + } if (rflag) rm_tree(argv); else @@ -489,6 +498,56 @@ } } +int +check2(char **argv) +{ + struct stat st; + int first; + int ch; + int fcount = 0; + int dcount = 0; + int i; + const char *dname = NULL; + + for (i = 0; argv[i]; ++i) { + if (lstat(argv[i], &st) == 0) { + if (S_ISDIR(st.st_mode)) { + ++dcount; + dname = argv[i]; /* only used if 1 dir */ + } else { + ++fcount; + } + } + } + first = 0; + while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { + if (dcount && rflag) { + fprintf(stderr, "recursively remove"); + if (dcount == 1) + fprintf(stderr, " %s", dname); + else + fprintf(stderr, " %d dirs", dcount); + if (fcount == 1) + fprintf(stderr, " and 1 file"); + else if (fcount > 1) + fprintf(stderr, " and %d files", fcount); + } else if (dcount + fcount > 3) { + fprintf(stderr, "remove %d files", dcount + fcount); + } else { + return(1); + } + fprintf(stderr, "? "); + fflush(stderr); + + first = ch = getchar(); + while (ch != '\n' && ch != EOF) + ch = getchar(); + if (ch == EOF) + break; + } + return (first == 'y' || first == 'Y'); +} + #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) void checkdot(char **argv) @@ -519,7 +578,7 @@ { (void)fprintf(stderr, "%s\n%s\n", - "usage: rm [-f | -i] [-dPRrvW] file ...", + "usage: rm [-f | -i] [-dIPRrvW] file ...", " unlink file"); exit(EX_USAGE); } ==== //depot/projects/hammer/crypto/openssh/CREDITS#5 (text+ko) ==== @@ -31,6 +31,7 @@ David Del Piero - bug fixes David Hesprich - Configure fixes David Rankin - libwrap, AIX, NetBSD fixes +Dag-Erling Smørgrav - Challenge-Response PAM code. Ed Eden - configure fixes Garrick James - configure fixes Gary E. Miller - SCO support @@ -43,7 +44,7 @@ IWAMURO Motonori - bugfixes Jani Hakala - Patches Jarno Huuskonen - Bugfixes -Jim Knoble - Many patches +Jim Knoble - Many patches Jonchen (email unknown) - the original author of PAM support of SSH Juergen Keil - scp bugfixing KAMAHARA Junzo - Configure fixes @@ -61,6 +62,7 @@ Mark D. Roth - Features, bug fixes Mark Miller - Bugfixes Matt Richards - AIX patches +Michael Steffens - HP-UX fixes Michael Stone - Irix enhancements Nakaji Hiroyuki - Sony News-OS patch Nalin Dahyabhai - PAM environment patch @@ -76,6 +78,7 @@ Philippe WILLEM - Bugfixes Phill Camp - login code fix Rip Loomis - Solaris package support, fixes +Robert Dahlem - Reliant Unix fixes Roumen Petrov - Compile & configure fixes SAKAI Kiyotaka - Multiple bugfixes Simon Wilkinson - PAM fixes, Compat with MIT KrbV @@ -95,5 +98,5 @@ Damien Miller -$Id: CREDITS,v 1.77 2004/01/30 04:00:50 dtucker Exp $ +$Id: CREDITS,v 1.79 2004/05/26 23:59:31 dtucker Exp $ ==== //depot/projects/hammer/crypto/openssh/ChangeLog#7 (text+ko) ==== @@ -1,10 +1,681 @@ +20040817 + - (dtucker) [regress/README.regress] Note compatibility issues with GNU head. + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/08/16 08:17:01 + [version.h] + 3.9 + - (djm) Crank RPM spec version numbers + - (djm) Release 3.9p1 + +20040816 + - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root + to convince Solaris PAM to honour password complexity rules. ok djm@ + +20040815 + - (dtucker) [Makefile.in ssh-keysign.c ssh.c] Use permanently_set_uid() since + it does the right thing on all platforms. ok djm@ + - (djm) [acconfig.h configure.ac openbsd-compat/Makefile.in + openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-misc.c + openbsd-compat/bsd-misc.h openbsd-compat/openbsd-compat.h] Use smarter + closefrom() replacement from sudo; ok dtucker@ + - (djm) [loginrec.c] Check that seek succeeded here too; ok dtucker + - (dtucker) [Makefile.in] Fix typo. + +20040814 + - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c] + Explicitly set umask for mkstemp; ok djm@ + - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise + prot.h and shadow.h provide conflicting declarations of getspnam. ok djm@ + - (dtucker) [loginrec.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] + Plug AIX login recording into login_write so logins will be recorded for + all auth types. + +20040813 + - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at + redhat.com +- (dtucker) OpenBSD CVS Sync + - avsm@cvs.openbsd.org 2004/08/11 21:43:05 + [channels.c channels.h clientloop.c misc.c misc.h serverloop.c ssh-agent.c] + some signed/unsigned int comparison cleanups; markus@ ok + - avsm@cvs.openbsd.org 2004/08/11 21:44:32 + [authfd.c scp.c ssh-keyscan.c] + use atomicio instead of homegrown equivalents or read/write. + markus@ ok + - djm@cvs.openbsd.org 2004/08/12 09:18:24 + [sshlogin.c] + typo in error message, spotted by moritz AT jodeit.org (Id sync only) + - jakob@cvs.openbsd.org 2004/08/12 21:41:13 + [ssh-keygen.1 ssh.1] + improve SSHFP documentation; ok deraadt@ + - jmc@cvs.openbsd.org 2004/08/13 00:01:43 + [ssh-keygen.1] + kill whitespace at eol; + - djm@cvs.openbsd.org 2004/08/13 02:51:48 + [monitor_fdpass.c] + extra check for no message case; ok markus, deraadt, hshoexer, henning + - dtucker@cvs.openbsd.org 2004/08/13 11:09:24 + [servconf.c] + Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr + ok markus@, djm@ + +20040812 + - (dtucker) [sshd.c] Remove duplicate variable imported during sync. + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/07/28 08:56:22 + [sshd.c] + call setsid() _before_ re-exec + - markus@cvs.openbsd.org 2004/07/28 09:40:29 + [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c + sshconnect1.c] + more s/illegal/invalid/ + - djm@cvs.openbsd.org 2004/08/04 10:37:52 + [dh.c] + return group14 when no primes found - fixes hang on empty /etc/moduli; + ok markus@ + - dtucker@cvs.openbsd.org 2004/08/11 11:09:54 + [servconf.c] + Fix minor leak; "looks right" deraadt@ + - dtucker@cvs.openbsd.org 2004/08/11 11:50:09 + [sshd.c] + Don't try to close startup_pipe if it's not open; ok djm@ + - djm@cvs.openbsd.org 2004/08/11 11:59:22 + [sshlogin.c] + check that lseek went were we told it to; ok markus@ + (Id sync only, but similar changes are needed in loginrec.c) + - djm@cvs.openbsd.org 2004/08/11 12:01:16 + [sshlogin.c] + make store_lastlog_message() static to appease -Wall; ok markus + - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling + messages generated before the postauth privsep split. + +20040720 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/07/21 08:56:12 + [auth.c] + s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas, + miod, ... + - djm@cvs.openbsd.org 2004/07/21 10:33:31 + [auth1.c auth2.c] + bz#899: Don't display invalid usernames in setproctitle + from peak AT argo.troja.mff.cuni.cz; ok markus@ + - djm@cvs.openbsd.org 2004/07/21 10:36:23 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 31 21:47:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C971A16A4D0; Sun, 31 Oct 2004 21:47:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 827A316A4CE for ; Sun, 31 Oct 2004 21:47:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B67443D5F for ; Sun, 31 Oct 2004 21:47:38 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9VLlcOS068657 for ; Sun, 31 Oct 2004 21:47:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9VLlb4x068654 for perforce@freebsd.org; Sun, 31 Oct 2004 21:47:37 GMT (envelope-from peter@freebsd.org) Date: Sun, 31 Oct 2004 21:47:37 GMT Message-Id: <200410312147.i9VLlb4x068654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Oct 2004 21:47:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=64027 Change 64027 by peter@peter_overcee on 2004/10/31 21:46:38 IFC @64024 Affected files ... .. //depot/projects/hammer/sys/net/if_tap.c#18 integrate .. //depot/projects/hammer/sys/net/if_tun.c#21 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#13 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#16 integrate Differences ... ==== //depot/projects/hammer/sys/net/if_tap.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ */ /* - * $FreeBSD: src/sys/net/if_tap.c,v 1.47 2004/09/17 03:55:50 rwatson Exp $ + * $FreeBSD: src/sys/net/if_tap.c,v 1.48 2004/10/31 17:39:46 glebius Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -800,8 +800,8 @@ { struct tap_softc *tp = dev->si_drv1; struct ifnet *ifp = &tp->tap_if; - struct mbuf *top = NULL, **mp = NULL, *m = NULL; - int error = 0, tlen, mlen; + struct mbuf *m; + int error = 0; TAPDEBUG("%s writting, minor = %#x\n", ifp->if_xname, minor(dev)); @@ -815,42 +815,16 @@ return (EIO); } - tlen = uio->uio_resid; - /* get a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) - return (ENOBUFS); - mlen = MHLEN; - - top = 0; - mp = ⊤ - while ((error == 0) && (uio->uio_resid > 0)) { - m->m_len = min(mlen, uio->uio_resid); - error = uiomove(mtod(m, void *), m->m_len, uio); - *mp = m; - mp = &m->m_next; - if (uio->uio_resid > 0) { - MGET(m, M_DONTWAIT, MT_DATA); - if (m == NULL) { - error = ENOBUFS; - break; - } - mlen = MLEN; - } - } - if (error) { + if ((m = m_uiotombuf(uio, M_DONTWAIT, 0)) == NULL) { ifp->if_ierrors ++; - if (top) - m_freem(top); return (error); } - top->m_pkthdr.len = tlen; - top->m_pkthdr.rcvif = ifp; + m->m_pkthdr.rcvif = ifp; /* Pass packet up to parent. */ - (*ifp->if_input)(ifp, top); + (*ifp->if_input)(ifp, m); ifp->if_ipackets ++; /* ibytes are counted in parent */ return (0); ==== //depot/projects/hammer/sys/net/if_tun.c#21 (text+ko) ==== @@ -13,7 +13,7 @@ * UCL. This driver is based much more on read/write/poll mode of * operation though. * - * $FreeBSD: src/sys/net/if_tun.c,v 1.145 2004/10/11 07:28:36 glebius Exp $ + * $FreeBSD: src/sys/net/if_tun.c,v 1.146 2004/10/31 17:39:46 glebius Exp $ */ #include "opt_atalk.h" @@ -739,8 +739,8 @@ { struct tun_softc *tp = dev->si_drv1; struct ifnet *ifp = &tp->tun_if; - struct mbuf *top, **mp, *m; - int error=0, tlen, mlen; + struct mbuf *m; + int error = 0; uint32_t family; int isr; @@ -757,58 +757,32 @@ TUNDEBUG(ifp, "len=%d!\n", uio->uio_resid); return (EIO); } - tlen = uio->uio_resid; - /* get a header mbuf */ - MGETHDR(m, M_DONTWAIT, MT_DATA); - if (m == NULL) - return (ENOBUFS); - mlen = MHLEN; - - top = NULL; - mp = ⊤ - while (error == 0 && uio->uio_resid > 0) { - m->m_len = min(mlen, uio->uio_resid); - error = uiomove(mtod(m, void *), m->m_len, uio); - *mp = m; - mp = &m->m_next; - if (uio->uio_resid > 0) { - MGET (m, M_DONTWAIT, MT_DATA); - if (m == 0) { - error = ENOBUFS; - break; - } - mlen = MLEN; - } - } - if (error) { - if (top) - m_freem (top); + if ((m = m_uiotombuf(uio, M_DONTWAIT, 0)) == NULL) { ifp->if_ierrors++; return (error); } - top->m_pkthdr.len = tlen; - top->m_pkthdr.rcvif = ifp; + m->m_pkthdr.rcvif = ifp; #ifdef MAC - mac_create_mbuf_from_ifnet(ifp, top); + mac_create_mbuf_from_ifnet(ifp, m); #endif /* Could be unlocked read? */ mtx_lock(&tp->tun_mtx); if (tp->tun_flags & TUN_IFHEAD) { mtx_unlock(&tp->tun_mtx); - if (top->m_len < sizeof(family) && - (top = m_pullup(top, sizeof(family))) == NULL) + if (m->m_len < sizeof(family) && + (m = m_pullup(m, sizeof(family))) == NULL) return (ENOBUFS); - family = ntohl(*mtod(top, u_int32_t *)); - m_adj(top, sizeof(family)); + family = ntohl(*mtod(m, u_int32_t *)); + m_adj(m, sizeof(family)); } else { mtx_unlock(&tp->tun_mtx); family = AF_INET; } - BPF_MTAP2(ifp, &family, sizeof(family), top); + BPF_MTAP2(ifp, &family, sizeof(family), m); switch (family) { #ifdef INET @@ -838,9 +812,9 @@ /* First chunk of an mbuf contains good junk */ if (harvest.point_to_point) random_harvest(m, 16, 3, 0, RANDOM_NET); - ifp->if_ibytes += top->m_pkthdr.len; + ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; - netisr_dispatch(isr, top); + netisr_dispatch(isr, m); return (0); } ==== //depot/projects/hammer/sys/netgraph/ng_device.c#11 (text+ko) ==== @@ -26,14 +26,14 @@ * This node presents a /dev/ngd%d device that interfaces to an other * netgraph node. * - * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.13 2004/10/28 18:23:44 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_device.c,v 1.14 2004/10/31 17:32:51 glebius Exp $ * */ #if 0 -#define DBG printf("ng_device: %s\n", __func__ ) +#define DBG do { printf("ng_device: %s\n", __func__ ); } while (0) #else -#define DBG +#define DBG do {} while (0) #endif #include ==== //depot/projects/hammer/sys/netgraph/ng_pppoe.c#13 (text+ko) ==== @@ -36,13 +36,13 @@ * * Author: Julian Elischer * - * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.68 2004/10/28 18:23:44 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.69 2004/10/31 17:32:51 glebius Exp $ * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $ */ #if 0 -#define DBG printf("pppoe: %s\n", __func__ ) +#define DBG do { printf("ng_device: %s\n", __func__ ); } while (0) #else -#define DBG +#define DBG do {} while (0) #endif #include ==== //depot/projects/hammer/sys/vm/vm_zeroidle.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.30 2004/10/30 20:11:23 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.31 2004/10/31 19:32:57 alc Exp $"); #include @@ -76,6 +76,7 @@ #define ZIDLE_LO(v) ((v) * 2 / 3) #define ZIDLE_HI(v) ((v) * 4 / 5) +static boolean_t wakeup_needed = FALSE; static int zero_state; static int @@ -130,8 +131,11 @@ vm_page_zero_idle_wakeup(void) { - if (idlezero_enable && vm_page_zero_check()) + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + if (wakeup_needed && vm_page_zero_check()) { + wakeup_needed = FALSE; wakeup(&zero_state); + } } static void @@ -163,7 +167,10 @@ } #endif } else { - tsleep(&zero_state, pri, "pgzero", hz * 300); + vm_page_lock_queues(); + wakeup_needed = TRUE; + msleep(&zero_state, &vm_page_queue_mtx, PDROP | pri, + "pgzero", hz * 300); pages = 0; } } From owner-p4-projects@FreeBSD.ORG Mon Nov 1 06:29:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 617BA16A4D0; Mon, 1 Nov 2004 06:29:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2083516A4CE for ; Mon, 1 Nov 2004 06:29:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1CB443D48 for ; Mon, 1 Nov 2004 06:29:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA16TIsq097608 for ; Mon, 1 Nov 2004 06:29:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA16TIWK097605 for perforce@freebsd.org; Mon, 1 Nov 2004 06:29:18 GMT (envelope-from peter@freebsd.org) Date: Mon, 1 Nov 2004 06:29:18 GMT Message-Id: <200411010629.iA16TIWK097605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 06:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=64032 Change 64032 by peter@peter_overcee on 2004/11/01 06:28:42 actually get around to submitting this missing include fix. Affected files ... .. //depot/projects/hammer/sys/kern/kern_shutdown.c#28 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_shutdown.c#28 (text+ko) ==== @@ -59,6 +59,7 @@ #include #include #include +#include #include /* smp_active */ #include #include From owner-p4-projects@FreeBSD.ORG Mon Nov 1 22:36:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C564A16A4D0; Mon, 1 Nov 2004 22:36:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E12816A4CE for ; Mon, 1 Nov 2004 22:36:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D74343D2F for ; Mon, 1 Nov 2004 22:36:21 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1MaLU1065626 for ; Mon, 1 Nov 2004 22:36:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1MaLWA065623 for perforce@freebsd.org; Mon, 1 Nov 2004 22:36:21 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Nov 2004 22:36:21 GMT Message-Id: <200411012236.iA1MaLWA065623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 22:36:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=64066 Change 64066 by sam@sam_ebb on 2004/11/01 22:35:57 checkpoint new ifconfig Affected files ... .. //depot/projects/wifi/sbin/ifconfig/Makefile#2 edit .. //depot/projects/wifi/sbin/ifconfig/af_atalk.c#1 add .. //depot/projects/wifi/sbin/ifconfig/af_inet.c#1 add .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#1 add .. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#1 add .. //depot/projects/wifi/sbin/ifconfig/af_link.c#1 add .. //depot/projects/wifi/sbin/ifconfig/ifclone.c#1 add .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifmac.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#2 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/Makefile#2 (text+ko) ==== @@ -2,35 +2,36 @@ # $FreeBSD: src/sbin/ifconfig/Makefile,v 1.25 2004/02/23 20:13:52 johan Exp $ PROG= ifconfig -SRCS= ifconfig.c -#comment out to exclude SIOC[GS]IFMEDIA support -SRCS+= ifmedia.c -CFLAGS+=-DUSE_IF_MEDIA -CFLAGS+=-DINET6 +SRCS= ifconfig.c # base support -#comment out to exclude SIOC[GS]ETVLAN support -SRCS+= ifvlan.c -CFLAGS+=-DUSE_VLANS +# +# NB: The order here defines the order in which the constructors +# are called. This in turn defines the default order in which +# status is displayed. Probably should add a priority mechanism +# to the registration process so we don't depend on this aspect +# of the toolchain. +# +SRCS+= af_link.c # LLC support +SRCS+= af_inet.c # IPv4 support +SRCS+= af_inet6.c # IPv6 support +SRCS+= af_atalk.c # AppleTalk support -#comment out to exclude SIOC[GS]IEEE80211 support -SRCS+= ifieee80211.c -CFLAGS+=-DUSE_IEEE80211 +SRCS+= ifclone.c # clone device support +SRCS+= ifmac.c # MAC support +SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support +SRCS+= ifvlan.c # SIOC[GS]ETVLAN support +SRCS+= ifieee80211.c # SIOC[GS]IEEE80211 support -#comment out to exclude MAC support -SRCS+= ifmac.c -CFLAGS+=-DUSE_MAC - -MAN= ifconfig.8 - -.if defined(RELEASE_CRUNCH) -CFLAGS+=-DNO_IPX -.else +.if !defined(RELEASE_CRUNCH) +SRCS+= af_ipx.c # IPX support DPADD= ${LIBIPX} LDADD= -lipx .endif -CFLAGS+=-DNS -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ +MAN= ifconfig.8 + +CFLAGS+= -g -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \ -Wnested-externs -I.. WARNS?= 0 ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#2 (text+ko) ==== @@ -62,21 +62,6 @@ #include #include -#ifdef INET6 -#include /* Define ND6_INFINITE_LIFETIME */ -#endif - -#ifndef NO_IPX -/* IPX */ -#define IPXIP -#define IPTUNNEL -#include -#include -#endif - -/* Appletalk */ -#include - #include #include #include @@ -85,34 +70,18 @@ #include #include #include -#include #include "ifconfig.h" -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - /* * Since "struct ifreq" is composed of various union members, callers * should pay special attention to interprete the value. * (.e.g. little/big endian difference in the structure.) */ -struct ifreq ifr, ridreq; -struct ifaliasreq addreq; -#ifdef INET6 -struct in6_ifreq in6_ridreq; -struct in6_aliasreq in6_addreq = - { { 0 }, - { 0 }, - { 0 }, - { 0 }, - 0, - { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } }; -#endif -struct sockaddr_in netmask; -struct netrange at_nr; /* AppleTalk net range */ +struct ifreq ifr; +struct ifreq ridreq; +struct ifaliasreq addreq; +struct sockaddr_in netmask; char name[IFNAMSIZ]; int flags; @@ -122,27 +91,13 @@ int doalias; int clearaddr; int newaddr = 1; -#ifdef INET6 -static int ip6lifetime; -#endif - -struct afswtch; +int verbose; int supmedia = 0; int listcloners = 0; int printname = 0; /* Print the name of the created interface. */ -#ifdef INET6 -char addr_buf[MAXHOSTNAMELEN *2 + 1]; /*for getnameinfo()*/ -#endif - -void Perror(const char *cmd); -void checkatrange(struct sockaddr_at *); int ifconfig(int argc, char *const *argv, const struct afswtch *afp); -void notealias(const char *, int, int, const struct afswtch *afp); -void list_cloners(void); -void printb(const char *s, unsigned value, const char *bits); -void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); void status(const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, struct ifa_msghdr *ifam); @@ -150,252 +105,10 @@ void usage(void); void ifmaybeload(char *name); -#ifdef INET6 -void in6_fillscopeid(struct sockaddr_in6 *sin6); -int prefix(void *, int); -static char *sec2str(time_t); -int explicit_prefix = 0; -#endif +static struct afswtch *af_getbyname(const char *name); +static struct afswtch *af_getbyfamily(int af); +static void af_all_status(int, const struct rt_addrinfo *sdl); -typedef void c_func(const char *cmd, int arg, int s, const struct afswtch *afp); -typedef void c_func2(const char *arg, const char *arg2, int s, const struct afswtch *afp); -c_func setatphase, setatrange; -c_func setifaddr, setifbroadaddr, setifdstaddr, setifnetmask; -c_func2 settunnel; -c_func deletetunnel; -#ifdef INET6 -c_func setifprefixlen; -c_func setip6flags; -c_func setip6pltime; -c_func setip6vltime; -c_func2 setip6lifetime; -c_func setip6eui64; -#endif -c_func setifipdst; -c_func setifflags, setifmetric, setifmtu, setifcap; -c_func clone_destroy; -c_func setifname; - - -void clone_create(void); - - -#define NEXTARG 0xffffff -#define NEXTARG2 0xfffffe - -const -struct cmd { - const char *c_name; - int c_parameter; /* NEXTARG means next argv */ - void (*c_func)(const char *, int, int, const struct afswtch *afp); - void (*c_func2)(const char *, const char *, int, const struct afswtch *afp); -} cmds[] = { - { "up", IFF_UP, setifflags } , - { "down", -IFF_UP, setifflags }, - { "arp", -IFF_NOARP, setifflags }, - { "-arp", IFF_NOARP, setifflags }, - { "debug", IFF_DEBUG, setifflags }, - { "-debug", -IFF_DEBUG, setifflags }, - { "promisc", IFF_PPROMISC, setifflags }, - { "-promisc", -IFF_PPROMISC, setifflags }, - { "add", IFF_UP, notealias }, - { "alias", IFF_UP, notealias }, - { "-alias", -IFF_UP, notealias }, - { "delete", -IFF_UP, notealias }, - { "remove", -IFF_UP, notealias }, -#ifdef notdef -#define EN_SWABIPS 0x1000 - { "swabips", EN_SWABIPS, setifflags }, - { "-swabips", -EN_SWABIPS, setifflags }, -#endif - { "netmask", NEXTARG, setifnetmask }, -#ifdef INET6 - { "prefixlen", NEXTARG, setifprefixlen }, - { "anycast", IN6_IFF_ANYCAST, setip6flags }, - { "tentative", IN6_IFF_TENTATIVE, setip6flags }, - { "-tentative", -IN6_IFF_TENTATIVE, setip6flags }, - { "deprecated", IN6_IFF_DEPRECATED, setip6flags }, - { "-deprecated", -IN6_IFF_DEPRECATED, setip6flags }, - { "autoconf", IN6_IFF_AUTOCONF, setip6flags }, - { "-autoconf", -IN6_IFF_AUTOCONF, setip6flags }, - { "pltime", NEXTARG, setip6pltime }, - { "vltime", NEXTARG, setip6vltime }, - { "eui64", 0, setip6eui64 }, -#endif - { "range", NEXTARG, setatrange }, - { "phase", NEXTARG, setatphase }, - { "metric", NEXTARG, setifmetric }, - { "broadcast", NEXTARG, setifbroadaddr }, - { "ipdst", NEXTARG, setifipdst }, - { "tunnel", NEXTARG2, NULL, settunnel }, - { "deletetunnel", 0, deletetunnel }, - { "link0", IFF_LINK0, setifflags }, - { "-link0", -IFF_LINK0, setifflags }, - { "link1", IFF_LINK1, setifflags }, - { "-link1", -IFF_LINK1, setifflags }, - { "link2", IFF_LINK2, setifflags }, - { "-link2", -IFF_LINK2, setifflags }, - { "monitor", IFF_MONITOR, setifflags }, - { "-monitor", -IFF_MONITOR, setifflags }, - { "staticarp", IFF_STATICARP, setifflags }, - { "-staticarp", -IFF_STATICARP, setifflags }, -#ifdef USE_IF_MEDIA - { "media", NEXTARG, setmedia }, - { "mode", NEXTARG, setmediamode }, - { "mediaopt", NEXTARG, setmediaopt }, - { "-mediaopt", NEXTARG, unsetmediaopt }, -#endif -#ifdef USE_VLANS - { "vlan", NEXTARG, setvlantag }, - { "vlandev", NEXTARG, setvlandev }, - { "-vlandev", NEXTARG, unsetvlandev }, -#endif -#if 0 - /* XXX `create' special-cased below */ - {"create", 0, clone_create }, - {"plumb", 0, clone_create }, -#endif - {"destroy", 0, clone_destroy }, - {"unplumb", 0, clone_destroy }, -#ifdef USE_IEEE80211 - { "ssid", NEXTARG, set80211ssid }, - { "nwid", NEXTARG, set80211ssid }, - { "stationname", NEXTARG, set80211stationname }, - { "station", NEXTARG, set80211stationname }, /* BSD/OS */ - { "channel", NEXTARG, set80211channel }, - { "authmode", NEXTARG, set80211authmode }, - { "powersavemode", NEXTARG, set80211powersavemode }, - { "powersave", 1, set80211powersave }, - { "-powersave", 0, set80211powersave }, - { "powersavesleep", NEXTARG, set80211powersavesleep }, - { "wepmode", NEXTARG, set80211wepmode }, - { "wep", 1, set80211wep }, - { "-wep", 0, set80211wep }, - { "weptxkey", NEXTARG, set80211weptxkey }, - { "wepkey", NEXTARG, set80211wepkey }, - { "nwkey", NEXTARG, set80211nwkey }, /* NetBSD */ - { "-nwkey", 0, set80211wep }, /* NetBSD */ - { "rtsthreshold",NEXTARG, set80211rtsthreshold }, - { "protmode", NEXTARG, set80211protmode }, - { "txpower", NEXTARG, set80211txpower }, -#endif -#ifdef USE_MAC - { "maclabel", NEXTARG, setifmaclabel }, -#endif - { "rxcsum", IFCAP_RXCSUM, setifcap }, - { "-rxcsum", -IFCAP_RXCSUM, setifcap }, - { "txcsum", IFCAP_TXCSUM, setifcap }, - { "-txcsum", -IFCAP_TXCSUM, setifcap }, - { "netcons", IFCAP_NETCONS, setifcap }, - { "-netcons", -IFCAP_NETCONS, setifcap }, - { "polling", IFCAP_POLLING, setifcap }, - { "-polling", -IFCAP_POLLING, setifcap }, - { "vlanmtu", IFCAP_VLAN_MTU, setifcap }, - { "-vlanmtu", -IFCAP_VLAN_MTU, setifcap }, - { "vlanhwtag", IFCAP_VLAN_HWTAGGING, setifcap }, - { "-vlanhwtag", -IFCAP_VLAN_HWTAGGING, setifcap }, - { "normal", -IFF_LINK0, setifflags }, - { "compress", IFF_LINK0, setifflags }, - { "noicmp", IFF_LINK1, setifflags }, - { "mtu", NEXTARG, setifmtu }, - { "name", NEXTARG, setifname }, - { 0, 0, setifaddr }, - { 0, 0, setifdstaddr }, -}; - -/* - * XNS support liberally adapted from code written at the University of - * Maryland principally by James O'Toole and Chris Torek. - */ -typedef void af_status(int, struct rt_addrinfo *); -typedef void af_getaddr(const char *, int); -typedef void af_getprefix(const char *, int); - -af_status in_status, at_status, link_status; -af_getaddr in_getaddr, at_getaddr, link_getaddr; - -#ifndef NO_IPX -af_status ipx_status; -af_getaddr ipx_getaddr; -#endif - -#ifdef INET6 -af_status in6_status; -af_getaddr in6_getaddr; -af_getprefix in6_getprefix; -#endif /*INET6*/ - -/* Known address families */ -const -struct afswtch { - const char *af_name; - short af_af; - af_status *af_status; - af_getaddr *af_getaddr; - af_getprefix *af_getprefix; - u_long af_difaddr; - u_long af_aifaddr; - caddr_t af_ridreq; - caddr_t af_addreq; -} afs[] = { -#define C(x) ((caddr_t) &x) - { "inet", AF_INET, in_status, in_getaddr, NULL, - SIOCDIFADDR, SIOCAIFADDR, C(ridreq), C(addreq) }, -#ifdef INET6 - { "inet6", AF_INET6, in6_status, in6_getaddr, in6_getprefix, - SIOCDIFADDR_IN6, SIOCAIFADDR_IN6, - C(in6_ridreq), C(in6_addreq) }, -#endif /*INET6*/ -#ifndef NO_IPX - { "ipx", AF_IPX, ipx_status, ipx_getaddr, NULL, - SIOCDIFADDR, SIOCAIFADDR, C(ridreq), C(addreq) }, -#endif - { "atalk", AF_APPLETALK, at_status, at_getaddr, NULL, - SIOCDIFADDR, SIOCAIFADDR, C(addreq), C(addreq) }, - { "link", AF_LINK, link_status, link_getaddr, NULL, - 0, SIOCSIFLLADDR, NULL, C(ridreq) }, - { "ether", AF_LINK, link_status, link_getaddr, NULL, - 0, SIOCSIFLLADDR, NULL, C(ridreq) }, - { "lladdr", AF_LINK, link_status, link_getaddr, NULL, - 0, SIOCSIFLLADDR, NULL, C(ridreq) }, -#if 0 /* XXX conflicts with the media command */ -#ifdef USE_IF_MEDIA - { "media", AF_UNSPEC, media_status, NULL, NULL, }, /* XXX not real!! */ -#endif -#ifdef USE_VLANS - { "vlan", AF_UNSPEC, vlan_status, NULL, NULL, }, /* XXX not real!! */ -#endif -#ifdef USE_IEEE80211 - { "ieee80211", AF_UNSPEC, ieee80211_status, NULL, NULL, }, /* XXX not real!! */ -#endif -#ifdef USE_MAC - { "maclabel", AF_UNSPEC, maclabel_status, NULL, NULL, }, -#endif -#endif - { 0, 0, 0, 0 } -}; - -/* - * Expand the compacted form of addresses as returned via the - * configuration read via sysctl(). - */ - -void -rt_xaddrs(caddr_t cp, caddr_t cplim, struct rt_addrinfo *rtinfo) -{ - struct sockaddr *sa; - int i; - - memset(rtinfo->rti_info, 0, sizeof(rtinfo->rti_info)); - for (i = 0; (i < RTAX_MAX) && (cp < cplim); i++) { - if ((rtinfo->rti_addrs & (1 << i)) == 0) - continue; - rtinfo->rti_info[i] = sa = (struct sockaddr *)cp; - cp += SA_SIZE(sa); - } -} - - void usage(void) { @@ -437,8 +150,8 @@ int mib[6]; /* Parse leading line options */ - all = downonly = uponly = namesonly = 0; - while ((c = getopt(argc, argv, "adlmuC" + all = downonly = uponly = namesonly = verbose = 0; + while ((c = getopt(argc, argv, "adlmuvC" #ifdef INET6 "L" #endif @@ -467,6 +180,9 @@ ip6lifetime++; /* print IPv6 address lifetime */ break; #endif + case 'v': + verbose++; + break; default: usage(); break; @@ -504,13 +220,11 @@ ifindex = 0; if (argc == 1) { - for (afp = afs; afp->af_name; afp++) - if (strcmp(afp->af_name, *argv) == 0) { - argc--, argv++; - break; - } - if (afp->af_name == NULL) + afp = af_getbyname(*argv); + if (afp == NULL) usage(); + if (afp->af_name != NULL) + argc--, argv++; /* leave with afp non-zero */ } } else { @@ -543,13 +257,9 @@ /* Check for address family */ if (argc > 0) { - for (afp = afs; afp->af_name; afp++) - if (strcmp(afp->af_name, *argv) == 0) { - argc--, argv++; - break; - } - if (afp->af_name == NULL) - afp = NULL; /* not a family, NULL */ + afp = af_getbyname(*argv); + if (afp != NULL) + argc--, argv++; } retry: @@ -630,9 +340,8 @@ if (flags & IFF_UP) continue; /* not down */ if (namesonly) { - if (afp == NULL || - afp->af_status != link_status || - sdl->sdl_type == IFT_ETHER) { + if (afp == NULL || afp->af_af != AF_LINK || + sdl->sdl_type == IFT_ETHER) { if (need_nl) putchar(' '); fputs(name, stdout); @@ -658,69 +367,155 @@ exit (0); } +static struct afswtch *afs = NULL; + +void +af_register(struct afswtch *p) +{ + p->af_next = afs; + afs = p; +} + +static struct afswtch * +af_getbyname(const char *name) +{ + struct afswtch *afp; + + for (afp = afs; afp != NULL; afp = afp->af_next) + if (strcmp(afp->af_name, name) == 0) + return afp; + return NULL; +} + +static struct afswtch * +af_getbyfamily(int af) +{ + struct afswtch *afp; + + for (afp = afs; afp != NULL; afp = afp->af_next) + if (afp->af_af == af) + return afp; + return NULL; +} + +static void +af_all_status(int s, const struct rt_addrinfo *sdl) +{ + struct afswtch *afp; + uint8_t afmask[howmany(AF_MAX, NBBY)]; + + memset(afmask, 0, sizeof(afmask)); + for (afp = afs; afp != NULL; afp = afp->af_next) { + if (afp->af_status == NULL) + continue; + if (afp->af_af != AF_UNSPEC && isset(afmask, afp->af_af)) + continue; + afp->af_status(s, sdl); + setbit(afmask, afp->af_af); + } +} + +static void +af_all_tunnel_status(int s) +{ + struct afswtch *afp; + uint8_t afmask[howmany(AF_MAX, NBBY)]; + + memset(afmask, 0, sizeof(afmask)); + for (afp = afs; afp != NULL; afp = afp->af_next) { + if (afp->af_status_tunnel == NULL) + continue; + if (afp->af_af != AF_UNSPEC && isset(afmask, afp->af_af)) + continue; + afp->af_status_tunnel(s); + setbit(afmask, afp->af_af); + } +} + +static struct cmd *cmds = NULL; + +void +cmd_register(struct cmd *p) +{ + p->next = cmds; + cmds = p; +} + +static const struct cmd * +cmd_lookup(const char *name) +{ +#define N(a) (sizeof(a)/sizeof(a[0])) + const struct cmd *p; + + for (p = cmds; p != NULL; p = p->next) + if (strcmp(name, p->c_name) == 0) + return p; + return NULL; +#undef N +} + +/* specially-handled comamnds */ +static void setifaddr(const char *, int, int, const struct afswtch *); +static const struct cmd setifaddr_cmd = { "ifaddr", 0, setifaddr }; + +static void setifdstaddr(const char *, int, int, const struct afswtch *); +static const struct cmd setifdstaddr_cmd = { "ifdstaddr", 0, setifdstaddr }; + int ifconfig(int argc, char *const *argv, const struct afswtch *afp) { - int af, s; + int s; if (afp == NULL) - afp = &afs[0]; - af = afp->af_af == AF_LINK ? AF_INET : afp->af_af; - ifr.ifr_addr.sa_family = af; + afp = af_getbyname("inet"); + ifr.ifr_addr.sa_family = afp->af_af == AF_LINK ? AF_INET : afp->af_af; strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name); - if ((s = socket(af, SOCK_DGRAM, 0)) < 0) + if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0) err(1, "socket"); while (argc > 0) { const struct cmd *p; - for (p = cmds; p->c_name; p++) - if (strcmp(*argv, p->c_name) == 0) - break; - if (p->c_name == 0 && setaddr) - p++; /* got src, do dst */ + p = cmd_lookup(*argv); + if (p == NULL) { + /* + * Not a recognized command, choose between setting + * the interface address and the dst address. + */ + p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd); + } if (p->c_func || p->c_func2) { if (p->c_parameter == NEXTARG) { if (argv[1] == NULL) errx(1, "'%s' requires argument", p->c_name); - (*p->c_func)(argv[1], 0, s, afp); + p->c_func(argv[1], 0, s, afp); argc--, argv++; + } else if (p->c_parameter == OPTARG) { + p->c_func(argv[1], 0, s, afp); + if (argv[1] != NULL) + argc--, argv++; } else if (p->c_parameter == NEXTARG2) { if (argc < 3) errx(1, "'%s' requires 2 arguments", p->c_name); - (*p->c_func2)(argv[1], argv[2], s, afp); + p->c_func2(argv[1], argv[2], s, afp); argc -= 2, argv += 2; } else - (*p->c_func)(*argv, p->c_parameter, s, afp); + p->c_func(*argv, p->c_parameter, s, afp); } argc--, argv++; } -#ifdef INET6 - if (af == AF_INET6 && explicit_prefix == 0) { - /* Aggregatable address architecture defines all prefixes - are 64. So, it is convenient to set prefixlen to 64 if - it is not specified. */ - setifprefixlen("64", 0, s, afp); - /* in6_getprefix("64", MASK) if MASK is available here... */ - } -#endif -#ifndef NO_IPX - if (setipdst && af == AF_IPX) { - struct ipxip_req rq; - int size = sizeof(rq); - rq.rq_ipx = addreq.ifra_addr; - rq.rq_ip = addreq.ifra_dstaddr; - - if (setsockopt(s, 0, SO_IPXIP_ROUTE, &rq, size) < 0) - Perror("Encapsulation Routing"); - } -#endif - if (af == AF_APPLETALK) - checkatrange((struct sockaddr_at *) &addreq.ifra_addr); + /* + * Do any post argument processing required by the address family. + */ + if (afp->af_postproc != NULL) + afp->af_postproc(s, afp); + /* + * Do deferred operations. + */ if (clearaddr) { if (afp->af_ridreq == NULL || afp->af_difaddr == 0) { warnx("interface %s cannot change %s addresses!", @@ -731,7 +526,8 @@ if (clearaddr) { int ret; strncpy(afp->af_ridreq, name, sizeof ifr.ifr_name); - if ((ret = ioctl(s, afp->af_difaddr, afp->af_ridreq)) < 0) { + ret = ioctl(s, afp->af_difaddr, afp->af_ridreq); + if (ret < 0) { if (errno == EADDRNOTAVAIL && (doalias >= 0)) { /* means no previous address for interface */ } else @@ -753,16 +549,12 @@ close(s); return(0); } -#define RIDADDR 0 -#define ADDR 1 -#define MASK 2 -#define DSTADDR 3 /*ARGSUSED*/ -void +static void setifaddr(const char *addr, int param, int s, const struct afswtch *afp) { - if (*afp->af_getaddr == NULL) + if (afp->af_getaddr == NULL) return; /* * Delay the ioctl to set the interface addr until flags are all set. @@ -772,21 +564,20 @@ setaddr++; if (doalias == 0 && afp->af_af != AF_LINK) clearaddr = 1; - (*afp->af_getaddr)(addr, (doalias >= 0 ? ADDR : RIDADDR)); + afp->af_getaddr(addr, (doalias >= 0 ? ADDR : RIDADDR)); } -void +static void settunnel(const char *src, const char *dst, int s, const struct afswtch *afp) { - struct addrinfo hints, *srcres, *dstres; - struct ifaliasreq addreq; + struct addrinfo *srcres, *dstres; int ecode; -#ifdef INET6 - struct in6_aliasreq in6_addreq; -#endif - memset(&hints, 0, sizeof(hints)); - hints.ai_family = afp->af_af; + if (afp->af_settunnel == NULL) { + warn("address family %s does not support tunnel setup", + afp->af_name); + return; + } if ((ecode = getaddrinfo(src, NULL, NULL, &srcres)) != 0) errx(1, "error in parsing address string: %s", @@ -800,43 +591,14 @@ errx(1, "source and destination address families do not match"); - switch (srcres->ai_addr->sa_family) { - case AF_INET: - memset(&addreq, 0, sizeof(addreq)); - strncpy(addreq.ifra_name, name, IFNAMSIZ); - memcpy(&addreq.ifra_addr, srcres->ai_addr, - srcres->ai_addr->sa_len); - memcpy(&addreq.ifra_dstaddr, dstres->ai_addr, - dstres->ai_addr->sa_len); + afp->af_settunnel(s, srcres, dstres); - if (ioctl(s, SIOCSIFPHYADDR, &addreq) < 0) - warn("SIOCSIFPHYADDR"); - break; - -#ifdef INET6 - case AF_INET6: - memset(&in6_addreq, 0, sizeof(in6_addreq)); - strncpy(in6_addreq.ifra_name, name, IFNAMSIZ); - memcpy(&in6_addreq.ifra_addr, srcres->ai_addr, - srcres->ai_addr->sa_len); - memcpy(&in6_addreq.ifra_dstaddr, dstres->ai_addr, - dstres->ai_addr->sa_len); - - if (ioctl(s, SIOCSIFPHYADDR_IN6, &in6_addreq) < 0) - warn("SIOCSIFPHYADDR_IN6"); - break; -#endif /* INET6 */ - - default: - warn("address family not supported"); - } - freeaddrinfo(srcres); freeaddrinfo(dstres); } /* ARGSUSED */ -void +static void deletetunnel(const char *vname, int param, int s, const struct afswtch *afp) { @@ -844,133 +606,43 @@ err(1, "SIOCDIFPHYADDR"); } -void +static void setifnetmask(const char *addr, int dummy __unused, int s, const struct afswtch *afp) { - if (*afp->af_getaddr == NULL) - return; - setmask++; - (*afp->af_getaddr)(addr, MASK); -} - -#ifdef INET6 -void -setifprefixlen(const char *addr, int dummy __unused, int s, - const struct afswtch *afp) -{ - if (*afp->af_getprefix) - (*afp->af_getprefix)(addr, MASK); - explicit_prefix = 1; -} - -void -setip6flags(const char *dummyaddr __unused, int flag, int dummysoc __unused, - const struct afswtch *afp) -{ - if (afp->af_af != AF_INET6) - err(1, "address flags can be set only for inet6 addresses"); - - if (flag < 0) - in6_addreq.ifra_flags &= ~(-flag); - else - in6_addreq.ifra_flags |= flag; -} - -void -setip6pltime(const char *seconds, int dummy __unused, int s, - const struct afswtch *afp) -{ - setip6lifetime("pltime", seconds, s, afp); -} - -void -setip6vltime(const char *seconds, int dummy __unused, int s, - const struct afswtch *afp) -{ - setip6lifetime("vltime", seconds, s, afp); -} - -void -setip6lifetime(const char *cmd, const char *val, int s, - const struct afswtch *afp) -{ - time_t newval, t; - char *ep; - - t = time(NULL); - newval = (time_t)strtoul(val, &ep, 0); - if (val == ep) - errx(1, "invalid %s", cmd); - if (afp->af_af != AF_INET6) - errx(1, "%s not allowed for the AF", cmd); - if (strcmp(cmd, "vltime") == 0) { - in6_addreq.ifra_lifetime.ia6t_expire = t + newval; - in6_addreq.ifra_lifetime.ia6t_vltime = newval; - } else if (strcmp(cmd, "pltime") == 0) { - in6_addreq.ifra_lifetime.ia6t_preferred = t + newval; - in6_addreq.ifra_lifetime.ia6t_pltime = newval; + if (afp->af_getaddr != NULL) { + setmask++; + afp->af_getaddr(addr, MASK); } } -void -setip6eui64(const char *cmd, int dummy __unused, int s, - const struct afswtch *afp) -{ - struct ifaddrs *ifap, *ifa; - const struct sockaddr_in6 *sin6 = NULL; - const struct in6_addr *lladdr = NULL; - struct in6_addr *in6; - - if (afp->af_af != AF_INET6) - errx(EXIT_FAILURE, "%s not allowed for the AF", cmd); - in6 = (struct in6_addr *)&in6_addreq.ifra_addr.sin6_addr; - if (memcmp(&in6addr_any.s6_addr[8], &in6->s6_addr[8], 8) != 0) - errx(EXIT_FAILURE, "interface index is already filled"); - if (getifaddrs(&ifap) != 0) - err(EXIT_FAILURE, "getifaddrs"); - for (ifa = ifap; ifa; ifa = ifa->ifa_next) { - if (ifa->ifa_addr->sa_family == AF_INET6 && - strcmp(ifa->ifa_name, name) == 0) { - sin6 = (const struct sockaddr_in6 *)ifa->ifa_addr; - if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) { - lladdr = &sin6->sin6_addr; - break; - } - } - } - if (!lladdr) - errx(EXIT_FAILURE, "could not determine link local address"); - - memcpy(&in6->s6_addr[8], &lladdr->s6_addr[8], 8); - - freeifaddrs(ifap); -} -#endif - -void +static void setifbroadaddr(const char *addr, int dummy __unused, int s, const struct afswtch *afp) { - if (*afp->af_getaddr == NULL) - return; - (*afp->af_getaddr)(addr, DSTADDR); + if (afp->af_getaddr != NULL) + afp->af_getaddr(addr, DSTADDR); } -void +static void setifipdst(const char *addr, int dummy __unused, int s, const struct afswtch *afp) { - in_getaddr(addr, DSTADDR); + const struct afswtch *inet; + + inet = af_getbyname("inet"); + if (inet == NULL) + return; + inet->af_getaddr(addr, DSTADDR); setipdst++; clearaddr = 0; newaddr = 0; } -#define rqtosa(x) (&(((struct ifreq *)(afp->x))->ifr_addr)) -void +static void notealias(const char *addr, int param, int s, const struct afswtch *afp) { +#define rqtosa(x) (&(((struct ifreq *)(afp->x))->ifr_addr)) if (setaddr && doalias == 0 && param < 0) if (afp->af_addreq != NULL && afp->af_ridreq != NULL) bcopy((caddr_t)rqtosa(af_addreq), @@ -982,16 +654,16 @@ newaddr = 0; } else clearaddr = 0; +#undef rqtosa } /*ARGSUSED*/ -void +static void setifdstaddr(const char *addr, int param __unused, int s, const struct afswtch *afp) { - if (*afp->af_getaddr == NULL) - return; - (*afp->af_getaddr)(addr, DSTADDR); + if (afp->af_getaddr != NULL) + afp->af_getaddr(addr, DSTADDR); } /* @@ -999,7 +671,7 @@ * of the ifreq structure, which may confuse other parts of ifconfig. * Make a private copy so we can avoid that. */ -void +static void setifflags(const char *vname, int value, int s, const struct afswtch *afp) { struct ifreq my_ifr; @@ -1043,7 +715,7 @@ Perror(vname); } -void +static void setifmetric(const char *val, int dummy __unused, int s, const struct afswtch *afp) { @@ -1053,7 +725,7 @@ warn("ioctl (set metric)"); } -void +static void setifmtu(const char *val, int dummy __unused, int s, const struct afswtch *afp) { @@ -1063,14 +735,17 @@ warn("ioctl (set mtu)"); } -void +static void setifname(const char *val, int dummy __unused, int s, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 1 22:42:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B0716A4D0; Mon, 1 Nov 2004 22:42:29 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74A4D16A4CE for ; Mon, 1 Nov 2004 22:42:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69D1443D41 for ; Mon, 1 Nov 2004 22:42:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1MgTio065819 for ; Mon, 1 Nov 2004 22:42:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1MgTYt065816 for perforce@freebsd.org; Mon, 1 Nov 2004 22:42:29 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Nov 2004 22:42:29 GMT Message-Id: <200411012242.iA1MgTYt065816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 22:42:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=64067 Change 64067 by sam@sam_ebb on 2004/11/01 22:42:17 add support to set the mac address Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#6 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#6 (text+ko) ==== @@ -1497,6 +1497,17 @@ /* configure operational mode */ ath_hal_setopmode(ah); + /* + * Handle any link-level address change. Note that we only + * need to force ic_myaddr; any other addresses are handled + * as a byproduct of the ifnet code marking the interface + * down then up. + * + * XXX should get from lladdr instead of arpcom but that's more work + */ + IEEE80211_ADDR_COPY(ic->ic_myaddr, IFP2AC(ifp)->ac_enaddr); + ath_hal_setmac(ah, ic->ic_myaddr); + /* calculate and install multicast filter */ if ((ifp->if_flags & IFF_ALLMULTI) == 0) { mfilt[0] = mfilt[1] = 0; From owner-p4-projects@FreeBSD.ORG Mon Nov 1 22:44:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A68CE16A4D0; Mon, 1 Nov 2004 22:44:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8299716A4CE for ; Mon, 1 Nov 2004 22:44:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60A3843D49 for ; Mon, 1 Nov 2004 22:44:32 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1MiWK5065909 for ; Mon, 1 Nov 2004 22:44:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1MiWhF065906 for perforce@freebsd.org; Mon, 1 Nov 2004 22:44:32 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Nov 2004 22:44:32 GMT Message-Id: <200411012244.iA1MiWhF065906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 22:44:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=64068 Change 64068 by sam@sam_ebb on 2004/11/01 22:43:39 reset pointer to 802.11 header after crypto decap since the offset into the buffer may have changed Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#9 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#9 (text+ko) ==== @@ -403,6 +403,7 @@ IEEE80211_NODE_STAT(ni, rx_wepfail); goto out; } + wh = mtod(m, struct ieee80211_frame *); } else { key = NULL; } From owner-p4-projects@FreeBSD.ORG Mon Nov 1 22:48:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 533BE16A4D0; Mon, 1 Nov 2004 22:48:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1A3AC16A4CE for ; Mon, 1 Nov 2004 22:48:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC7E343D39 for ; Mon, 1 Nov 2004 22:48:37 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1Mmb8S066015 for ; Mon, 1 Nov 2004 22:48:37 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1Mmbb6066012 for perforce@freebsd.org; Mon, 1 Nov 2004 22:48:37 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Nov 2004 22:48:37 GMT Message-Id: <200411012248.iA1Mmbb6066012@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 22:48:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=64069 Change 64069 by sam@sam_ebb on 2004/11/01 22:47:41 add ieee80211_getrssi that calculates an rssi based on the operating mode; for station mode this just checks the ap, otherwise we calculate an average over the "neighbors" Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#6 (text+ko) ==== @@ -1231,3 +1231,43 @@ if (ic->ic_updateslot != NULL) ic->ic_updateslot(ic->ic_ifp); } + +u_int8_t +ieee80211_getrssi(struct ieee80211com *ic) +{ +#define NZ(x) ((x) == 0 ? 1 : (x)) + u_int8_t rssi; + + switch (ic->ic_opmode) { + case IEEE80211_M_IBSS: + case IEEE80211_M_AHDEMO: + case IEEE80211_M_HOSTAP: { + u_int32_t rssi_samples, rssi_total; + struct ieee80211_node *ni; + + /* average stats from all neighbors */ + rssi_samples = 0; + rssi_total = 0; + /* XXX locking */ + TAILQ_FOREACH(ni, &ic->ic_node, ni_list) + if (ic->ic_opmode != IEEE80211_M_HOSTAP || + IEEE80211_AID(ni->ni_associd) != 0) { + rssi_samples++; + rssi_total += ic->ic_node_getrssi(ic, ni); + } + rssi = rssi_total / NZ(rssi_samples); + break; + } + case IEEE80211_M_STA: + case IEEE80211_M_MONITOR: + default: + /* use stats from associated ap */ + if (ic->ic_bss != NULL) + rssi = ic->ic_node_getrssi(ic, ic->ic_bss); + else + rssi = 0; + break; + } + return rssi; +#undef NZ +} ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#5 (text+ko) ==== @@ -236,4 +236,5 @@ extern void ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *); extern void ieee80211_set_shortslottime(struct ieee80211com *, int onoff); +extern u_int8_t ieee80211_getrssi(struct ieee80211com *ic); #endif /* _NET80211_IEEE80211_NODE_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Nov 1 22:49:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B5BC16A4D0; Mon, 1 Nov 2004 22:49:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D356216A4CE for ; Mon, 1 Nov 2004 22:49:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB60F43D4C for ; Mon, 1 Nov 2004 22:49:39 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1Mnd7o066038 for ; Mon, 1 Nov 2004 22:49:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1MndrA066035 for perforce@freebsd.org; Mon, 1 Nov 2004 22:49:39 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Nov 2004 22:49:39 GMT Message-Id: <200411012249.iA1MndrA066035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 22:49:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=64070 Change 64070 by sam@sam_ebb on 2004/11/01 22:48:48 add ioctls to futz with the inactivity timers and to get to the mac acl support Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#9 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#4 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#9 (text+ko) ==== @@ -1186,6 +1186,15 @@ case IEEE80211_IOC_STA_STATS: error = ieee80211_ioctl_getstastats(ic, ireq); break; + case IEEE80211_IOC_INACT: + ireq->i_val = ic->ic_inact_run * IEEE80211_INACT_WAIT; + break; + case IEEE80211_IOC_INACT_AUTH: + ireq->i_val = ic->ic_inact_auth * IEEE80211_INACT_WAIT; + break; + case IEEE80211_IOC_INACT_INIT: + ireq->i_val = ic->ic_inact_init * IEEE80211_INACT_WAIT; + break; default: error = EINVAL; break; @@ -1397,6 +1406,40 @@ } static int +ieee80211_ioctl_maccmd(struct ieee80211com *ic, struct ieee80211req *ireq) +{ + const struct ieee80211_aclator *acl = ic->ic_acl; + + switch (ireq->i_val) { + case IEEE80211_MACCMD_POLICY_OPEN: + case IEEE80211_MACCMD_POLICY_ALLOW: + case IEEE80211_MACCMD_POLICY_DENY: + if (acl == NULL) { + acl = ieee80211_aclator_get("mac"); + if (acl == NULL || !acl->iac_attach(ic)) + return EINVAL; + ic->ic_acl = acl; + } + acl->iac_setpolicy(ic, ireq->i_val); + break; + case IEEE80211_MACCMD_FLUSH: + if (acl != NULL) + acl->iac_flush(ic); + /* NB: silently ignore when not in use */ + break; + case IEEE80211_MACCMD_DETACH: + if (acl != NULL) { + ic->ic_acl = NULL; + acl->iac_detach(ic); + } + break; + default: + return EINVAL; + } + return 0; +} + +static int ieee80211_ioctl_setchanlist(struct ieee80211com *ic, struct ieee80211req *ireq) { struct ieee80211req_chanlist list; @@ -1818,6 +1861,18 @@ if (error == 0) error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); break; + case IEEE80211_IOC_MACCMD: + error = ieee80211_ioctl_maccmd(ic, ireq); + break; + case IEEE80211_IOC_INACT: + ic->ic_inact_run = ireq->i_val / IEEE80211_INACT_WAIT; + break; + case IEEE80211_IOC_INACT_AUTH: + ic->ic_inact_auth = ireq->i_val / IEEE80211_INACT_WAIT; + break; + case IEEE80211_IOC_INACT_INIT: + ic->ic_inact_init = ireq->i_val / IEEE80211_INACT_WAIT; + break; default: error = EINVAL; break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#4 (text+ko) ==== @@ -332,6 +332,10 @@ #define IEEE80211_IOC_RSNCAPS 38 /* RSN capabilities */ #define IEEE80211_IOC_WPAIE 39 /* WPA information element */ #define IEEE80211_IOC_STA_STATS 40 /* per-station statistics */ +#define IEEE80211_IOC_MACCMD 41 /* MAC ACL operation */ +#define IEEE80211_IOC_INACT 42 /* station inactivity timeout */ +#define IEEE80211_IOC_INACT_AUTH 43 /* station auth inact timeout */ +#define IEEE80211_IOC_INACT_INIT 44 /* station init inact timeout */ #ifndef IEEE80211_CHAN_ANY #define IEEE80211_CHAN_ANY 0xffff /* token for ``any channel'' */ From owner-p4-projects@FreeBSD.ORG Mon Nov 1 22:54:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E56AE16A4D0; Mon, 1 Nov 2004 22:54:46 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9608B16A4CE for ; Mon, 1 Nov 2004 22:54:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7845843D39 for ; Mon, 1 Nov 2004 22:54:46 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1Mskhq066239 for ; Mon, 1 Nov 2004 22:54:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1MskAE066236 for perforce@freebsd.org; Mon, 1 Nov 2004 22:54:46 GMT (envelope-from sam@freebsd.org) Date: Mon, 1 Nov 2004 22:54:46 GMT Message-Id: <200411012254.iA1MskAE066236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 22:54:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=64071 Change 64071 by sam@sam_ebb on 2004/11/01 22:54:04 save refcnt debugging stuff; may not want to keep this longterm Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#7 (text+ko) ==== @@ -716,7 +716,12 @@ } static struct ieee80211_node * +#ifdef IEEE80211_DEBUG_REFCNT +_ieee80211_find_node_debug(struct ieee80211com *ic, u_int8_t *macaddr, + const char *func, int line) +#else _ieee80211_find_node(struct ieee80211com *ic, u_int8_t *macaddr) +#endif { struct ieee80211_node *ni; int hash; @@ -727,14 +732,31 @@ LIST_FOREACH(ni, &ic->ic_hash[hash], ni_hash) { if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) { ieee80211_ref_node(ni); /* mark referenced */ + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, +#ifdef IEEE80211_DEBUG_REFCNT + "%s (%s:%u) %s refcnt %d\n", __func__, func, line, +#else + "%s %s refcnt %d\n", __func__, +#endif + ether_sprintf(ni->ni_macaddr), + ieee80211_node_refcnt(ni)); return ni; } } return NULL; } +#ifdef IEEE80211_DEBUG_REFCNT +#define _ieee80211_find_node(ic, mac) \ + _ieee80211_find_node_debug(ic, mac, func, line) +#endif struct ieee80211_node * +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_find_node_debug(struct ieee80211com *ic, u_int8_t *macaddr, + const char *func, int line) +#else ieee80211_find_node(struct ieee80211com *ic, u_int8_t *macaddr) +#endif { struct ieee80211_node *ni; @@ -749,7 +771,12 @@ * a data frame. This handles node discovery in adhoc networks. */ struct ieee80211_node * +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_find_txnode_debug(struct ieee80211com *ic, u_int8_t *macaddr, + const char *func, int line) +#else ieee80211_find_txnode(struct ieee80211com *ic, u_int8_t *macaddr) +#endif { struct ieee80211_node *ni; @@ -794,8 +821,14 @@ * Like find but search based on the channel too. */ struct ieee80211_node * -ieee80211_find_node_with_channel(struct ieee80211com *ic, u_int8_t *macaddr, - struct ieee80211_channel *chan) +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_find_node_with_channel_debug(struct ieee80211com *ic, + u_int8_t *macaddr, struct ieee80211_channel *chan, + const char *func, int line) +#else +ieee80211_find_node_with_channel(struct ieee80211com *ic, + u_int8_t *macaddr, struct ieee80211_channel *chan) +#endif { struct ieee80211_node *ni; int hash; @@ -806,6 +839,14 @@ if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_chan == chan) { ieee80211_ref_node(ni); /* mark referenced */ + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, +#ifdef IEEE80211_DEBUG_REFCNT + "%s (%s:%u) %s refcnt %d\n", __func__, func, line, +#else + "%s %s refcnt %d\n", __func__, +#endif + ether_sprintf(ni->ni_macaddr), + ieee80211_node_refcnt(ni)); break; } } @@ -817,8 +858,13 @@ * Like find but search based on the ssid too. */ struct ieee80211_node * +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_find_node_with_ssid_debug(struct ieee80211com *ic, u_int8_t *macaddr, + u_int ssidlen, const u_int8_t *ssid, const char *func, int line) +#else ieee80211_find_node_with_ssid(struct ieee80211com *ic, u_int8_t *macaddr, u_int ssidlen, const u_int8_t *ssid) +#endif { struct ieee80211_node *ni; int hash; @@ -830,6 +876,14 @@ ni->ni_esslen == ic->ic_des_esslen && memcmp(ni->ni_essid, ic->ic_des_essid, ni->ni_esslen) == 0) { ieee80211_ref_node(ni); /* mark referenced */ + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, +#ifdef IEEE80211_DEBUG_REFCNT + "%s (%s:%u) %s refcnt %d\n", __func__, func, line, +#else + "%s %s refcnt %d\n", __func__, +#endif + ether_sprintf(ni->ni_macaddr), + ieee80211_node_refcnt(ni)); break; } } @@ -863,13 +917,22 @@ } void +#ifdef IEEE80211_DEBUG_REFCNT +ieee80211_free_node_debug(struct ieee80211com *ic, struct ieee80211_node *ni, + const char *func, int line) +#else ieee80211_free_node(struct ieee80211com *ic, struct ieee80211_node *ni) +#endif { KASSERT(ni != ic->ic_bss, ("freeing ic_bss")); IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, +#ifdef IEEE80211_DEBUG_REFCNT + "%s (%s:%u) %s refcnt %d\n", __func__, func, line, +#else "%s %s refcnt %d\n", __func__, - ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); +#endif + ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)-1); if (ieee80211_node_dectestref(ni)) { IEEE80211_NODE_LOCK(ic); _ieee80211_free_node(ic, ni); @@ -1185,6 +1248,10 @@ ieee80211_node_leave(struct ieee80211com *ic, struct ieee80211_node *ni) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC | IEEE80211_MSG_DEBUG, + "station %s with aid %d leaves\n", + ether_sprintf(ni->ni_macaddr), IEEE80211_NODE_AID(ni)); + KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP, ("not in ap mode, mode %u", ic->ic_opmode)); /* ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#6 (text+ko) ==== @@ -208,6 +208,30 @@ u_int8_t *); extern struct ieee80211_node *ieee80211_dup_bss(struct ieee80211com *, u_int8_t *); +#ifdef IEEE80211_DEBUG_REFCNT +extern void ieee80211_free_node_debug(struct ieee80211com *, + struct ieee80211_node *, const char *func, int line); +extern struct ieee80211_node *ieee80211_find_node_debug(struct ieee80211com *, + u_int8_t *, const char *func, int line); +extern struct ieee80211_node *ieee80211_find_txnode_debug( + struct ieee80211com *, u_int8_t *, const char *func, int line); +extern struct ieee80211_node *ieee80211_find_node_with_channel_debug( + struct ieee80211com *, u_int8_t *macaddr, + struct ieee80211_channel *, const char *func, int line); +extern struct ieee80211_node *ieee80211_find_node_with_ssid_debug( + struct ieee80211com *, u_int8_t *macaddr, u_int ssidlen, + const u_int8_t *ssid, const char *func, int line); +#define ieee80211_free_node(ic, ni) \ + ieee80211_free_node_debug(ic, ni, __func__, __LINE__) +#define ieee80211_find_node(ic, mac) \ + ieee80211_find_node_debug(ic, mac, __func__, __LINE__) +#define ieee80211_find_txnode(ic, mac) \ + ieee80211_find_txnode_debug(ic, mac, __func__, __LINE__) +#define ieee80211_find_node_with_channel(ic, mac, c) \ + ieee80211_find_node_with_channel_debug(ic, mac, c, __func__, __LINE__) +#define ieee80211_find_node_with_ssid(ic, mac, sl, ss) \ + ieee80211_find_node_with_ssid_debug(ic, mac, sl, ss, __func__, __LINE__) +#else extern struct ieee80211_node *ieee80211_find_node(struct ieee80211com *, u_int8_t *); extern struct ieee80211_node *ieee80211_find_txnode(struct ieee80211com *, @@ -220,6 +244,8 @@ const u_int8_t *ssid); extern void ieee80211_free_node(struct ieee80211com *, struct ieee80211_node *); +#endif + extern void ieee80211_free_allnodes(struct ieee80211com *); typedef void ieee80211_iter_func(void *, struct ieee80211_node *); ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#6 (text+ko) ==== @@ -776,8 +776,14 @@ * the xmit is complete all the way in the driver. On error we * will remove our reference. */ - if (ni != ic->ic_bss) + if (ni != ic->ic_bss) { + IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, + "ieee80211_ref_node (%s:%u) %s refcnt %d\n", + __func__, __LINE__, + ether_sprintf(ni->ni_macaddr), + ieee80211_node_refcnt(ni)+1); ieee80211_ref_node(ni); + } timer = 0; switch (type) { case IEEE80211_FC0_SUBTYPE_PROBE_REQ: ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#5 (text+ko) ==== @@ -38,6 +38,7 @@ * Definitions for IEEE 802.11 drivers. */ #define IEEE80211_DEBUG +#undef IEEE80211_DEBUG_REFCNT /* node refcnt stuff */ /* NB: portability glue must go first */ #ifdef __NetBSD__ From owner-p4-projects@FreeBSD.ORG Mon Nov 1 23:26:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62F0F16A4D1; Mon, 1 Nov 2004 23:26:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3593716A4CE for ; Mon, 1 Nov 2004 23:26:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14E4343D39 for ; Mon, 1 Nov 2004 23:26:26 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA1NQPus067201 for ; Mon, 1 Nov 2004 23:26:25 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA1NQP1j067198 for perforce@freebsd.org; Mon, 1 Nov 2004 23:26:25 GMT (envelope-from peter@freebsd.org) Date: Mon, 1 Nov 2004 23:26:25 GMT Message-Id: <200411012326.iA1NQP1j067198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Nov 2004 23:26:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=64073 Change 64073 by peter@peter_daintree on 2004/11/01 23:26:03 whoops. need sched_lock around this. Affected files ... .. //depot/projects/hammer/sys/kern/kern_shutdown.c#29 edit Differences ... ==== //depot/projects/hammer/sys/kern/kern_shutdown.c#29 (text+ko) ==== @@ -248,7 +248,9 @@ static int first_buf_printf = 1; /* Do all shutdown processing on cpu0 */ + mtx_lock_spin(&sched_lock); sched_bind(curthread, 0); + mtx_unlock_spin(&sched_lock); /* collect extra flags that shutdown_nice might have set */ howto |= shutdown_howto; From owner-p4-projects@FreeBSD.ORG Tue Nov 2 04:56:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D71916A4D0; Tue, 2 Nov 2004 04:56:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17BAA16A4CE for ; Tue, 2 Nov 2004 04:56:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E64AC43D39 for ; Tue, 2 Nov 2004 04:56:09 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA24u9cb093108 for ; Tue, 2 Nov 2004 04:56:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA24u9eV093105 for perforce@freebsd.org; Tue, 2 Nov 2004 04:56:09 GMT (envelope-from sam@freebsd.org) Date: Tue, 2 Nov 2004 04:56:09 GMT Message-Id: <200411020456.iA24u9eV093105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 04:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=64077 Change 64077 by sam@sam_ebb on 2004/11/02 04:55:18 o bssid - removes any specfied bssid o accept -, any, or off for removing previous specifications (the latter two for compatibility with linux) Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#3 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#3 (text+ko) ==== @@ -97,6 +97,13 @@ u_int8_t *buf, int *lenp); static void print_string(const u_int8_t *buf, int len); +static int +isanyarg(const char *arg) +{ + return (strcmp(arg, "-") == 0 || + strcasecmp(arg, "any") == 0 || strcasecmp(arg, "off") == 0); +} + static void set80211ssid(const char *val, int d, int s, const struct afswtch *rafp) { @@ -164,7 +171,7 @@ static void set80211channel(const char *val, int d, int s, const struct afswtch *rafp) { - if (strcmp(val, "-") != 0) { + if (!isanyarg(val)) { int v = atoi(val); if (v > 255) /* treat as frequency */ v = ieee80211_mhz2ieee(v); @@ -449,20 +456,29 @@ static void set80211bssid(const char *val, int d, int s, const struct afswtch *rafp) { - char *temp; - struct sockaddr_dl sdl; + + if (!isanyarg(val)) { + char *temp; + struct sockaddr_dl sdl; - temp = malloc(strlen(val) + 1); - if (temp == NULL) - errx(1, "malloc failed"); - temp[0] = ':'; - strcpy(temp + 1, val); - sdl.sdl_len = sizeof(sdl); - link_addr(temp, &sdl); - free(temp); - if (sdl.sdl_alen != IEEE80211_ADDR_LEN) - errx(1, "malformed link-level address"); - set80211(s, IEEE80211_IOC_BSSID, 0, IEEE80211_ADDR_LEN, LLADDR(&sdl)); + temp = malloc(strlen(val) + 1); + if (temp == NULL) + errx(1, "malloc failed"); + temp[0] = ':'; + strcpy(temp + 1, val); + sdl.sdl_len = sizeof(sdl); + link_addr(temp, &sdl); + free(temp); + if (sdl.sdl_alen != IEEE80211_ADDR_LEN) + errx(1, "malformed link-level address"); + set80211(s, IEEE80211_IOC_BSSID, 0, + IEEE80211_ADDR_LEN, LLADDR(&sdl)); + } else { + uint8_t zerobssid[IEEE80211_ADDR_LEN]; + memset(zerobssid, 0, sizeof(zerobssid)); + set80211(s, IEEE80211_IOC_BSSID, 0, + IEEE80211_ADDR_LEN, zerobssid); + } } static void From owner-p4-projects@FreeBSD.ORG Tue Nov 2 18:06:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAA3C16A4D0; Tue, 2 Nov 2004 18:06:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A63DB16A4CE for ; Tue, 2 Nov 2004 18:06:47 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AD3243D49 for ; Tue, 2 Nov 2004 18:06:47 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2I6l1R037139 for ; Tue, 2 Nov 2004 18:06:47 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2I6c29037136 for perforce@freebsd.org; Tue, 2 Nov 2004 18:06:38 GMT (envelope-from arr@freebsd.org) Date: Tue, 2 Nov 2004 18:06:38 GMT Message-Id: <200411021806.iA2I6c29037136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 64101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 18:06:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=64101 Change 64101 by arr@arr_tbsd_base_d400laptop on 2004/11/02 18:06:26 Integ of trustedbsd branch: - struct tcpcb has changed size - rm(1) now has a -I option - openssh update - various rc.d startup script changes - libphtread fixes - amd64 fixes by peter - placeholders for audit syscalls - some minor ddb beautification - bfe device locking fixes - usb ehci enhancements - many fs changes related to the vfs / geom changes by phk - HighPoint RocketRAID 182x support default in config - Adding tracing to bus dma - VM hacking by alc Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#55 integrate .. //depot/projects/trustedbsd/base/UPDATING#49 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#10 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/CREDITS#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/OVERVIEW#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-none.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.guess#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.sub#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dh.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/dns.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/envpass.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/gss-serv-krb5.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/logintest.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/mdoc2man.awk#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/myproposal.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/nchan.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/pathnames.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.h#4 delete .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/README.regress#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/dynamic-forward.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/try-ciphers.sh#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/rijndael.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#21 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect1.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshtty.h#4 delete .. //depot/projects/trustedbsd/base/crypto/openssh/tildexpand.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/tildexpand.h#3 delete .. //depot/projects/trustedbsd/base/crypto/openssh/ttymodes.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#16 integrate .. //depot/projects/trustedbsd/base/etc/defaults/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#41 integrate .. //depot/projects/trustedbsd/base/etc/mtree/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/namedb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#7 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/Makefile#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#22 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/moused#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/natd#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/savecore#7 integrate .. //depot/projects/trustedbsd/base/etc/usbd.conf#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#37 integrate .. //depot/projects/trustedbsd/base/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/trustedbsd/base/games/ppt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/primes/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libopcodes/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++filt/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1plus/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/libdiff/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libbib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libdriver/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/libs/libgroff/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/libtxi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/include/arpa/Makefile#2 integrate .. //depot/projects/trustedbsd/base/include/protocols/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libalias/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libbsnmp/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/sys/brk.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mlock.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/chunk.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/open_disk.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#25 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#25 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#22 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#17 integrate .. //depot/projects/trustedbsd/base/lib/librpcsvc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libsm/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libsmdb/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libsmutil/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libstand/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libtelnet/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libxpg4/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/liby/Makefile#4 integrate .. //depot/projects/trustedbsd/base/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#27 integrate .. //depot/projects/trustedbsd/base/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/Makefile#11 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/reloc.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#26 integrate .. //depot/projects/trustedbsd/base/release/Makefile#61 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/base/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#30 integrate .. //depot/projects/trustedbsd/base/rescue/librescue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#26 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/common/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dst/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/minires/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/omapip/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk_pc98/fdisk.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/create.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/destroy.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#6 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/migrate.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/recover.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/remove.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sbin/gvinum/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#33 integrate .. //depot/projects/trustedbsd/base/sbin/mca/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/pflogd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/rtsol/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#22 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#14 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/Makefile#9 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/dict/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/IPv6/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/bind9/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/bufbio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/devfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/diskperf/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/jail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/kernmalloc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/kerntune/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/nqnfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/px/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/relengr/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/sysperf/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/timecounter/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/01.cacm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/02.implement/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/05.sysman/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/06.Clang/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/13.rcs/rcs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/15.yacc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/16.lex/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/18.gprof/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/20.ipctut/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/21.ipc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/22.rpcgen/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/23.rpc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/24.xdr/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/25.xdrrfc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/26.rpcrfc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/27.nfsrpc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/28.cvs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/01.setup/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/02.config/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/05.fastfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/08.sendmailop/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/12.timed/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/04.csh/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/07.mail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/10.exref/summary/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/11.vitut/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/summary/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/vi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/13.viref/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/21.troff/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/examples/autofs/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/stable-supfile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#30 integrate .. //depot/projects/trustedbsd/base/share/examples/ipfilter/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/v21/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/libvgl/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/ppi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/smbfs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/smbfs/print/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/info/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#50 integrate .. //depot/projects/trustedbsd/base/share/man/man4/altq.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/divert.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/fd.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/inet.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man4/mem.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_device.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#42 integrate .. //depot/projects/trustedbsd/base/share/man/man7/firewall.7#10 integrate .. //depot/projects/trustedbsd/base/share/man/man9/taskqueue.9#8 integrate .. //depot/projects/trustedbsd/base/share/misc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#19 integrate .. //depot/projects/trustedbsd/base/share/mk/Makefile#11 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#17 integrate .. //depot/projects/trustedbsd/base/share/security/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/sendmail/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/skel/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/snmp/mibs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/db_trace.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/db_trace.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/arc/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/ficl/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/beastie.4th#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/biospci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.arm#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#54 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#78 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#45 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#36 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#32 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#54 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_output.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#23 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_variables.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfe.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwcrom.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/iec13213.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/global.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#36 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#31 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#20 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_denode.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfsmount.h#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#35 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#37 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_int.h#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#32 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.c#1 branch .. //depot/projects/trustedbsd/base/sys/geom/geom_vfs.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/trustedbsd/base/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_bmap.c#8 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_inode.c#13 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vfsops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_asus.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#45 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#50 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#45 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#36 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#51 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#27 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/db_trace.c#12 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/sscdisk.c#10 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_bmap.c#6 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_node.c#11 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_node.h#7 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/iso.h#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_shell.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_physio.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#49 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_unit.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_ipc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#37 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#45 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#47 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#22 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#58 integrate .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/modules/smbfs/Makefile#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#32 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#26 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_cisco.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#33 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#24 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#23 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#16 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#9 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC.hints#10 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#44 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/wd_cd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sk.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_skreg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powermac/ata_macio.c#12 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/db_trace.c#6 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#32 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/db_trace.c#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/buf.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/kernel.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/ktr.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#59 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#45 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#46 integrate .. //depot/projects/trustedbsd/base/sys/sys/systm.h#29 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#49 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#28 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#14 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_inode.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_rawread.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#30 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#39 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#32 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/inode.h#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_bmap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#38 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#33 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#33 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#22 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#39 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#30 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_mmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#28 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_zeroidle.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#36 integrate .. //depot/projects/trustedbsd/base/tools/diag/dumpvfscache/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/diag/localeck/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/MdLoad/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpconnect/tcpconnect.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#13 integrate .. //depot/projects/trustedbsd/base/tools/test/malloc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/aac/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/gdb_regofs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/ministat/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/localfiles#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/make.conf#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/netsend/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/raidtest/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#35 integrate .. //depot/projects/trustedbsd/base/usr.bin/dirname/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/du/du.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/elf2aout/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/compat.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.h#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#22 integrate .. //depot/projects/trustedbsd/base/usr.bin/mktemp/mktemp.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/newgrp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/unexpand/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/uudecode/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/libamu/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/bsnmpd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/lang.l#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ctm/mkCTM/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/SMM.doc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/common/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/libntp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/libparse/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpq/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/Misc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#55 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -502,7 +502,7 @@ .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} -KERNWARN= yes +KERNWARN= .else KERNCONF?= GENERIC .endif ==== //depot/projects/trustedbsd/base/UPDATING#49 (text+ko) ==== @@ -23,6 +23,11 @@ developers choose to disable these features on build machines to maximize performance. +20041022: + The size of struct tcpcb has changed. You have to recompile + userland programs that read kmem for tcp sockets directly + (netstat, sockstat, etc.) + 20041018: A major sweep over the tty drivers to elimnate approx 3100 lines of copy&pasted code have been performed. As a part of @@ -1951,4 +1956,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ +$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ ==== //depot/projects/trustedbsd/base/bin/rm/rm.1#10 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ .\" -.Dd October 4, 2004 +.Dd October 28, 2004 .Dt RM 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd remove directory entries .Sh SYNOPSIS .Nm -.Op Fl dfiPRrvW +.Op Fl dfiIPRrvW .Ar .Nm unlink .Ar file @@ -76,6 +76,12 @@ option overrides any previous .Fl f options. +.It Fl I +Request confirmation once if more than three files are being removed or if a +directory is being recursively removed. +This is a far less intrusive option than +.Fl i +yet provides almost the same level of protection against mistakes. .It Fl P Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, ==== //depot/projects/trustedbsd/base/bin/rm/rm.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); #include #include @@ -58,9 +58,11 @@ #include int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +int rflag, Iflag; uid_t uid; int check(char *, char *, struct stat *); +int check2(char **); void checkdot(char **); void checkslash(char **); void rm_file(char **); @@ -78,7 +80,7 @@ int main(int argc, char *argv[]) { - int ch, rflag; + int ch; char *p; /* @@ -102,7 +104,7 @@ } Pflag = rflag = 0; - while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) + while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) switch(ch) { case 'd': dflag = 1; @@ -115,6 +117,9 @@ fflag = 0; iflag = 1; break; + case 'I': + Iflag = 1; + break; case 'P': Pflag = 1; break; @@ -148,6 +153,10 @@ if (*argv) { stdin_ok = isatty(STDIN_FILENO); + if (Iflag) { + if (check2(argv) == 0) + exit (1); + } if (rflag) rm_tree(argv); else @@ -489,6 +498,56 @@ } } +int +check2(char **argv) +{ + struct stat st; + int first; + int ch; + int fcount = 0; + int dcount = 0; + int i; + const char *dname = NULL; + + for (i = 0; argv[i]; ++i) { + if (lstat(argv[i], &st) == 0) { + if (S_ISDIR(st.st_mode)) { + ++dcount; + dname = argv[i]; /* only used if 1 dir */ + } else { + ++fcount; + } + } + } + first = 0; + while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { + if (dcount && rflag) { + fprintf(stderr, "recursively remove"); + if (dcount == 1) + fprintf(stderr, " %s", dname); + else + fprintf(stderr, " %d dirs", dcount); + if (fcount == 1) + fprintf(stderr, " and 1 file"); + else if (fcount > 1) + fprintf(stderr, " and %d files", fcount); + } else if (dcount + fcount > 3) { + fprintf(stderr, "remove %d files", dcount + fcount); + } else { + return(1); + } + fprintf(stderr, "? "); + fflush(stderr); + + first = ch = getchar(); + while (ch != '\n' && ch != EOF) + ch = getchar(); + if (ch == EOF) + break; + } + return (first == 'y' || first == 'Y'); +} + #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) void checkdot(char **argv) @@ -519,7 +578,7 @@ { (void)fprintf(stderr, "%s\n%s\n", - "usage: rm [-f | -i] [-dPRrvW] file ...", + "usage: rm [-f | -i] [-dIPRrvW] file ...", " unlink file"); exit(EX_USAGE); } ==== //depot/projects/trustedbsd/base/bin/sh/sh.1#17 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -947,12 +947,16 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by one of the following -special characters. -The value of the parameter is listed -next to its character. +A special parameter is a parameter denoted by a special one-character +name. +The special parameters recognized by the +.Nm +shell of +.Fx +are shown in the following list, exactly as they would appear in input +typed by the user or in the source of a shell script. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 2 20:47:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01BED16A4D0; Tue, 2 Nov 2004 20:47:09 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD4AA16A4CE for ; Tue, 2 Nov 2004 20:47:09 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE26E43D2F for ; Tue, 2 Nov 2004 20:47:09 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2Kl9rp046176 for ; Tue, 2 Nov 2004 20:47:09 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2Kl9cc046127 for perforce@freebsd.org; Tue, 2 Nov 2004 20:47:09 GMT (envelope-from arr@freebsd.org) Date: Tue, 2 Nov 2004 20:47:09 GMT Message-Id: <200411022047.iA2Kl9cc046127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 64111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 20:47:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=64111 Change 64111 by arr@arr_tbsd_base_d400laptop on 2004/11/02 20:46:49 Somehow this Makefile was zero'd out at integ. Very odd. Affected files ... .. //depot/projects/trustedbsd/base/sys/modules/smbfs/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/base/sys/modules/smbfs/Makefile#9 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Nov 2 21:11:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4953116A4EB; Tue, 2 Nov 2004 21:11:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDFD116A505 for ; Tue, 2 Nov 2004 21:11:19 +0000 (GMT) Received: from mail6.speakeasy.net (mail6.speakeasy.net [216.254.0.206]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC4E943D1D for ; Tue, 2 Nov 2004 21:11:19 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 20851 invoked from network); 2 Nov 2004 21:11:19 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 2 Nov 2004 21:11:19 -0000 Received: from [10.50.41.235] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id iA2LAuYS070948; Tue, 2 Nov 2004 16:11:15 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Peter Wemm Date: Tue, 2 Nov 2004 16:21:05 -0500 User-Agent: KMail/1.6.2 References: <200411012326.iA1NQP1j067198@repoman.freebsd.org> In-Reply-To: <200411012326.iA1NQP1j067198@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200411021621.05815.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 64073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 21:11:21 -0000 On Monday 01 November 2004 06:26 pm, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=64073 > > Change 64073 by peter@peter_daintree on 2004/11/01 23:26:03 > > whoops. need sched_lock around this. You can probably #ifdef SMP this, btw. Also, don't commit this until I get my Alpha SMP patch submitted, because on Alpha the BSP isn't always CPU 0 (yet). > Affected files ... > > .. //depot/projects/hammer/sys/kern/kern_shutdown.c#29 edit > > Differences ... > > ==== //depot/projects/hammer/sys/kern/kern_shutdown.c#29 (text+ko) ==== > > @@ -248,7 +248,9 @@ > static int first_buf_printf = 1; > > /* Do all shutdown processing on cpu0 */ > + mtx_lock_spin(&sched_lock); > sched_bind(curthread, 0); > + mtx_unlock_spin(&sched_lock); > > /* collect extra flags that shutdown_nice might have set */ > howto |= shutdown_howto; -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Tue Nov 2 21:35:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AB8A16A4D0; Tue, 2 Nov 2004 21:35:10 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DD1316A4CE for ; Tue, 2 Nov 2004 21:35:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 324E843D45 for ; Tue, 2 Nov 2004 21:35:10 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2LZA3F053120 for ; Tue, 2 Nov 2004 21:35:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2LZ9gD053117 for perforce@freebsd.org; Tue, 2 Nov 2004 21:35:09 GMT (envelope-from sam@freebsd.org) Date: Tue, 2 Nov 2004 21:35:09 GMT Message-Id: <200411022135.iA2LZ9gD053117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64114 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 21:35:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=64114 Change 64114 by sam@sam_ebb on 2004/11/02 21:35:06 first cut at scanning Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#4 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#4 (text+ko) ==== @@ -481,11 +481,139 @@ } } +static int +getmaxrate(uint8_t rates[15], uint8_t nrates) +{ + int i, maxrate = -1; + + for (i = 0; i < nrates; i++) { + int rate = rates[i] & IEEE80211_RATE_VAL; + if (rate > maxrate) + maxrate = rate; + } + return maxrate / 2; +} + +static const char * +getcaps(int capinfo) +{ + static char capstring[32]; + char *cp = capstring; + + if (capinfo & IEEE80211_CAPINFO_ESS) + *cp++ = 'E'; + if (capinfo & IEEE80211_CAPINFO_IBSS) + *cp++ = 'I'; + if (capinfo & IEEE80211_CAPINFO_CF_POLLABLE) + *cp++ = 'c'; + if (capinfo & IEEE80211_CAPINFO_CF_POLLREQ) + *cp++ = 'C'; + if (capinfo & IEEE80211_CAPINFO_PRIVACY) + *cp++ = 'P'; + if (capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) + *cp++ = 'S'; + if (capinfo & IEEE80211_CAPINFO_PBCC) + *cp++ = 'B'; + if (capinfo & IEEE80211_CAPINFO_CHNL_AGILITY) + *cp++ = 'A'; + if (capinfo & IEEE80211_CAPINFO_SHORT_SLOTTIME) + *cp++ = 's'; + if (capinfo & IEEE80211_CAPINFO_RSN) + *cp++ = 'R'; + if (capinfo & IEEE80211_CAPINFO_DSSSOFDM) + *cp++ = 'D'; + *cp = '\0'; + return capstring; +} + static void +printie(const char* tag, const uint8_t *ie, size_t ielen, int maxlen) +{ + printf("%s", tag); + if (verbose) { + maxlen -= strlen(tag)+2; + if (2*ielen > maxlen) + maxlen--; + printf("<"); + for (; ielen > 0; ie++, ielen--) { + if (maxlen-- <= 0) + break; + printf("%02x", *ie); + } + if (ielen != 0) + printf("-"); + printf(">"); + } +} + +static void set80211scan(const char *val, int d, int s, const struct afswtch *rafp) { - /* XXX optional ssid */ - set80211(s, IEEE80211_IOC_SCAN_REQ, 0, 0, NULL); + uint8_t buf[24*1024]; + struct ieee80211req ireq; + uint8_t *cp; + int len; + + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_SCAN_REQ; + /* NB: only root can trigger a scan so ignore errors */ + (void) ioctl(s, SIOCS80211, &ireq); + + ireq.i_type = IEEE80211_IOC_SCAN_RESULTS; + ireq.i_data = buf; + ireq.i_len = sizeof(buf); + while (ioctl(s, SIOCG80211, &ireq) < 0) { + if (errno != EINPROGRESS) + errx(1, "unable to get scan results"); + sleep(1); + } + len = ireq.i_len; + if (len >= sizeof(struct ieee80211req_scan_result)) + printf("%-14.14s %-17.17s %4s %4s %-5s %3s %4s\n" + , "SSID" + , "BSSID" + , "CHAN" + , "RATE" + , "S:N" + , "INT" + , "CAPS" + ); + cp = buf; + while (len >= sizeof(struct ieee80211req_scan_result)) { + struct ieee80211req_scan_result *sr; + uint8_t *vp; + + sr = (struct ieee80211req_scan_result *) cp; + /* XXX clean ssid string */ + vp = (u_int8_t *)(sr+1); + printf("%-14.*s %s %3d %3dM %2d:%-2d %3d %-4.4s" + , sr->isr_ssid_len, vp + , ether_ntoa((const struct ether_addr *) sr->isr_bssid) + , ieee80211_mhz2ieee(sr->isr_freq) + , getmaxrate(sr->isr_rates, sr->isr_nrates) + , sr->isr_rssi, sr->isr_noise + , sr->isr_intval + , getcaps(sr->isr_capinfo) + ); + + if (sr->isr_ie_len > 0) { + vp += sr->isr_ssid_len; + switch (vp[0]) { + case IEEE80211_ELEMID_VENDOR: + if (vp[1] < 2 + 4 || + memcmp(&vp[2], "\x00\x50\xf2\x01", 4) != 0) + break; + printie("WPA", vp, 2+vp[1], 24); + break; + case IEEE80211_ELEMID_RSN: + printie("RSN", vp, 2+vp[1], 24); + break; + } + } + printf("\n"); + cp += sr->isr_len, len -= sr->isr_len; + } } enum ieee80211_opmode { @@ -1116,7 +1244,7 @@ { "chanlist", NEXTARG, set80211chanlist }, { "bssid", NEXTARG, set80211bssid }, { "ap", NEXTARG, set80211bssid }, - { "scan", OPTARG, set80211scan }, + { "scan", 0, set80211scan }, }; static struct afswtch af_ieee80211 = { .af_name = "ieee80211", From owner-p4-projects@FreeBSD.ORG Tue Nov 2 21:38:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1DE616A4D0; Tue, 2 Nov 2004 21:38:14 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CB3B16A4CE for ; Tue, 2 Nov 2004 21:38:14 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78D1A43D49 for ; Tue, 2 Nov 2004 21:38:14 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2LcEwq053293 for ; Tue, 2 Nov 2004 21:38:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2LcESx053290 for perforce@freebsd.org; Tue, 2 Nov 2004 21:38:14 GMT (envelope-from sam@freebsd.org) Date: Tue, 2 Nov 2004 21:38:14 GMT Message-Id: <200411022138.iA2LcESx053290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 21:38:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=64115 Change 64115 by sam@sam_ebb on 2004/11/02 21:37:23 o add private command line option support and use it for -L and -C options o purge some dead variables o minor whitespace cleanups o static'ize some stuff o give next member in struct cmd a consistent name This eliminates the INET6 build-time dependency. Affected files ... .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifclone.c#2 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#3 edit .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#3 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/af_inet6.c#2 (text+ko) ==== @@ -526,6 +526,13 @@ .af_addreq = &in6_addreq, }; +static void +in6_Lopt_cb(const char *optarg __unused) +{ + ip6lifetime++; /* print IPv6 address lifetime */ +} +static struct option in6_Lopt = { "L", "[-L]", in6_Lopt_cb }; + static __constructor void inet6_ctor(void) { @@ -535,5 +542,6 @@ for (i = 0; i < N(inet6_cmds); i++) cmd_register(&inet6_cmds[i]); af_register(&af_inet6); + opt_register(&in6_Lopt); #undef N } ==== //depot/projects/wifi/sbin/ifconfig/ifclone.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ #include "ifconfig.h" -void +static void list_cloners(void) { struct if_clonereq ifcr; @@ -134,6 +134,14 @@ { "unplumb", 0, clone_destroy }, }; +static void +clone_Copt_cb(const char *optarg __unused) +{ + list_cloners(); + exit(0); +} +static struct option clone_Copt = { "C", "[-C]", clone_Copt_cb }; + static __constructor void clone_ctor(void) { @@ -142,5 +150,6 @@ for (i = 0; i < N(clone_cmds); i++) cmd_register(&clone_cmds[i]); + opt_register(&clone_Copt); #undef N } ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.c#3 (text+ko) ==== @@ -79,9 +79,6 @@ * (.e.g. little/big endian difference in the structure.) */ struct ifreq ifr; -struct ifreq ridreq; -struct ifaliasreq addreq; -struct sockaddr_in netmask; char name[IFNAMSIZ]; int flags; @@ -93,69 +90,76 @@ int newaddr = 1; int verbose; -int supmedia = 0; -int listcloners = 0; -int printname = 0; /* Print the name of the created interface. */ +int supmedia = 0; +int printname = 0; /* Print the name of the created interface. */ -int ifconfig(int argc, char *const *argv, const struct afswtch *afp); -void status(const struct afswtch *afp, int addrcount, +static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); +static void status(const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, struct ifa_msghdr *ifam); -void tunnel_status(int s); -void usage(void); -void ifmaybeload(char *name); +static void tunnel_status(int s); +static void usage(void); static struct afswtch *af_getbyname(const char *name); static struct afswtch *af_getbyfamily(int af); static void af_all_status(int, const struct rt_addrinfo *sdl); +static struct option *opts = NULL; + void +opt_register(struct option *p) +{ + p->next = opts; + opts = p; +} + +static void usage(void) { -#ifndef INET6 - fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", - "usage: ifconfig interface address_family [address [dest_address]]", - " [parameters]", - " ifconfig -C", - " ifconfig interface create", - " ifconfig -a [-d] [-m] [-u] [address_family]", - " ifconfig -l [-d] [-u] [address_family]", - " ifconfig [-d] [-m] [-u]"); -#else - fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", - "usage: ifconfig [-L] interface address_family [address [dest_address]]", - " [parameters]", - " ifconfig -C", - " ifconfig interface create", - " ifconfig -a [-L] [-d] [-m] [-u] [address_family]", - " ifconfig -l [-d] [-u] [address_family]", - " ifconfig [-L] [-d] [-m] [-u]"); -#endif + char options[1024]; + struct option *p; + + /* XXX not right but close enough for now */ + options[0] = '\0'; + for (p = opts; p != NULL; p = p->next) { + strlcat(options, p->opt_usage, sizeof(options)); + strlcat(options, " ", sizeof(options)); + } + + fprintf(stderr, + "usage: ifconfig %sinterface address_family [address [dest_address]]\n" + " [parameters]\n" + " ifconfig interface create\n" + " ifconfig -a %s[-d] [-m] [-u] [-v] [address_family]\n" + " ifconfig -l [-d] [-u] [address_family]\n" + " ifconfig %s[-d] [-m] [-u] [-v]\n", + options, options, options); exit(1); } int main(int argc, char *argv[]) { - int c; - int all, namesonly, downonly, uponly; + int c, all, namesonly, downonly, uponly; int need_nl = 0, count = 0; - const struct afswtch *afp = 0; + const struct afswtch *afp = NULL; int addrcount, ifindex; - struct if_msghdr *ifm, *nextifm; - struct ifa_msghdr *ifam; - struct sockaddr_dl *sdl; - char *buf, *lim, *next; + struct if_msghdr *ifm, *nextifm; + struct ifa_msghdr *ifam; + struct sockaddr_dl *sdl; + char *buf, *lim, *next; size_t needed; int mib[6]; + char options[1024]; + struct option *p; + + all = downonly = uponly = namesonly = verbose = 0; /* Parse leading line options */ - all = downonly = uponly = namesonly = verbose = 0; - while ((c = getopt(argc, argv, "adlmuvC" -#ifdef INET6 - "L" -#endif - )) != -1) { + strlcpy(options, "adlmuv", sizeof(options)); + for (p = opts; p != NULL; p = p->next) + strlcat(options, p->opt, sizeof(options)); + while ((c = getopt(argc, argv, options)) != -1) { switch (c) { case 'a': /* scan all interfaces */ all++; @@ -172,35 +176,23 @@ case 'u': /* restrict scan to "up" interfaces */ uponly++; break; - case 'C': - listcloners = 1; - break; -#ifdef INET6 - case 'L': - ip6lifetime++; /* print IPv6 address lifetime */ - break; -#endif case 'v': verbose++; break; default: - usage(); + for (p = opts; p != NULL; p = p->next) + if (p->opt[0] == c) { + p->cb(optarg); + break; + } + if (p == NULL) + usage(); break; } } argc -= optind; argv += optind; - if (listcloners) { - /* -C must be solitary */ - if (all || supmedia || uponly || downonly || namesonly || - argc > 0) - usage(); - - list_cloners(); - exit(0); - } - /* -l cannot be used with -a or -m */ if (namesonly && (all || supmedia)) usage(); @@ -271,7 +263,7 @@ mib[5] = ifindex; /* interface index */ /* if particular family specified, only ask about it */ - if (afp) + if (afp != NULL) mib[3] = afp->af_af; if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) @@ -437,7 +429,7 @@ void cmd_register(struct cmd *p) { - p->next = cmds; + p->c_next = cmds; cmds = p; } @@ -447,7 +439,7 @@ #define N(a) (sizeof(a)/sizeof(a[0])) const struct cmd *p; - for (p = cmds; p != NULL; p = p->next) + for (p = cmds; p != NULL; p = p->c_next) if (strcmp(name, p->c_name) == 0) return p; return NULL; @@ -461,7 +453,7 @@ static void setifdstaddr(const char *, int, int, const struct afswtch *); static const struct cmd setifdstaddr_cmd = { "ifdstaddr", 0, setifdstaddr }; -int +static int ifconfig(int argc, char *const *argv, const struct afswtch *afp) { int s; @@ -793,7 +785,7 @@ * Print the status of the interface. If an address family was * specified, show only it; otherwise, show them all. */ -void +static void status(const struct afswtch *afp, int addrcount, struct sockaddr_dl *sdl, struct if_msghdr *ifm, struct ifa_msghdr *ifam) { @@ -864,7 +856,7 @@ return; } -void +static void tunnel_status(int s) { af_all_tunnel_status(s); ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.h#3 (text+ko) ==== @@ -43,14 +43,14 @@ typedef void c_func2(const char *arg, const char *arg2, int s, const struct afswtch *afp); struct cmd { - const char *c_name; + const char *c_name; int c_parameter; #define NEXTARG 0xffffff /* has following arg */ #define NEXTARG2 0xfffffe /* has 2 following args */ #define OPTARG 0xfffffd /* has optional following arg */ c_func *c_func; c_func2 *c_func2; - struct cmd *next; + struct cmd *c_next; }; void cmd_register(struct cmd *); @@ -87,6 +87,14 @@ }; void af_register(struct afswtch *); +struct option { + const char *opt; + const char *opt_usage; + void (*cb)(const char *arg); + struct option *next; +}; +void opt_register(struct option *); + extern struct ifreq ifr; extern char name[IFNAMSIZ]; /* name of interface */ extern int allmedia; @@ -102,5 +110,6 @@ void Perror(const char *cmd); void printb(const char *s, unsigned value, const char *bits); -void list_cloners(void); +void ifmaybeload(char *name); + void clone_create(void); From owner-p4-projects@FreeBSD.ORG Tue Nov 2 22:27:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B7B716A4D0; Tue, 2 Nov 2004 22:27:15 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16EF216A4CE for ; Tue, 2 Nov 2004 22:27:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA3FD43D31 for ; Tue, 2 Nov 2004 22:27:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2MREET055066 for ; Tue, 2 Nov 2004 22:27:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2MREI9055063 for perforce@freebsd.org; Tue, 2 Nov 2004 22:27:14 GMT (envelope-from jhb@freebsd.org) Date: Tue, 2 Nov 2004 22:27:14 GMT Message-Id: <200411022227.iA2MREI9055063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 22:27:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=64117 Change 64117 by jhb@jhb_slimer on 2004/11/02 22:27:06 List CPUs during boot. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#28 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#28 (text+ko) ==== @@ -424,6 +424,18 @@ void cpu_mp_announce(void) { + struct pcpu *pc; + int i; + + /* List CPUs */ + printf(" cpu0 (BSP): PAL ID: %2lu\n", boot_cpu_id); + for (i = 1; i < MAXCPU; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + MPASS(pc != NULL); + printf(" cpu%d (AP): APIC ID: %2lu\n", i, pc->pc_pal_id); + } } /* From owner-p4-projects@FreeBSD.ORG Tue Nov 2 22:28:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B81516A4D0; Tue, 2 Nov 2004 22:28:17 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBE2C16A4CE for ; Tue, 2 Nov 2004 22:28:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA10543D5D for ; Tue, 2 Nov 2004 22:28:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2MSGrQ055125 for ; Tue, 2 Nov 2004 22:28:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2MSG5j055122 for perforce@freebsd.org; Tue, 2 Nov 2004 22:28:16 GMT (envelope-from jhb@freebsd.org) Date: Tue, 2 Nov 2004 22:28:16 GMT Message-Id: <200411022228.iA2MSG5j055122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 22:28:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=64118 Change 64118 by jhb@jhb_slimer on 2004/11/02 22:27:44 Ooops. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#29 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#29 (text+ko) ==== @@ -434,7 +434,7 @@ continue; pc = pcpu_find(i); MPASS(pc != NULL); - printf(" cpu%d (AP): APIC ID: %2lu\n", i, pc->pc_pal_id); + printf(" cpu%d (AP): PAL ID: %2lu\n", i, pc->pc_pal_id); } } From owner-p4-projects@FreeBSD.ORG Tue Nov 2 22:39:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F00BC16A4D0; Tue, 2 Nov 2004 22:39:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE28616A4CE for ; Tue, 2 Nov 2004 22:39:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8346A43D1D for ; Tue, 2 Nov 2004 22:39:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2MdVSG055647 for ; Tue, 2 Nov 2004 22:39:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2MdVHi055644 for perforce@freebsd.org; Tue, 2 Nov 2004 22:39:31 GMT (envelope-from sam@freebsd.org) Date: Tue, 2 Nov 2004 22:39:31 GMT Message-Id: <200411022239.iA2MdVHi055644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 22:39:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64120 Change 64120 by sam@sam_ebb on 2004/11/02 22:38:56 update 802.11 stuff and document new parameters/commands Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#2 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 .\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.85 2004/07/27 09:51:49 yar Exp $ .\" -.Dd July 26, 2004 +.Dd Nov 2, 2004 .Dt IFCONFIG 8 .Os .Sh NAME @@ -55,6 +55,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Ar address_family .Nm .Fl l @@ -66,6 +67,7 @@ .Op Fl d .Op Fl m .Op Fl u +.Op Fl v .Op Fl C .Sh DESCRIPTION The @@ -596,64 +598,101 @@ It happens automatically when setting the first address on an interface. If the interface was reset when previously marked down, the hardware will be re-initialized. -.It Cm ssid Ar ssid -For IEEE 802.11 wireless interfaces, set the desired Service Set -Identifier (aka network name). -The SSID is a string up to 32 characters -in length and may be specified as either a normal string or in -hexadecimal when proceeded by -.Ql 0x . -Additionally, the SSID may be cleared by setting it to -.Ql - . -.It Cm nwid Ar ssid -Another name for the -.Cm ssid -parameter. -Included for -.Nx -compatibility. -.It Cm stationname Ar name -For IEEE 802.11 wireless interfaces, set the name of this station. -It appears that the station name is not really part of the IEEE 802.11 -protocol though all interfaces seem to support it. -As such it only -seems to be meaningful to identical or virtually identical equipment. -Setting the station name is identical in syntax to setting the SSID. -.It Cm station Ar name -Another name for the -.Cm stationname -parameter. -Included for -.Bsx -compatibility. -.It Cm channel Ar number -For IEEE 802.11 wireless interfaces, set the desired channel. -Channels range from 1 to 14, but the exact selection available -depends on the region your adaptor was manufactured for. -Setting -the channel to 0 will give you the default for your adaptor. -Many -adaptors ignore this setting unless you are in ad-hoc mode. +.El +.Pp +The following parameters are specific to IEEE 802.11 wireless interfaces: +.Bl -tag -width indent +.It Cm apbridge +When operating as an access point pass packets between +wireless clients directly (default). +To instead let them pass up through the +system and be forwarded using some other mechanism use +.Dq Li -apbridge. +Disabling the internal bridging +is useful when traffic is to be processed with +packet filtering. .It Cm authmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired authentication mode -in infrastructure mode. +Set the desired authentication mode in infrastructure mode. Not all adaptors support all modes. The set of valid modes is .Dq Li none , .Dq Li open , +.Dq Li shared (shared key), +.Dq Li 8021x (IEEE 802.1x), +or +.Dq Li wpa (IEEE WPA/WPA2/802.11i). +The +.Dq Li 8021x and -.Dq Li shared . +.Dq Li wpa +modes are only useful when used an authentication service +(a supplicant for client operation or an authenticator when +operating as an access point). Modes are case insensitive. +.It Cm bssid Ar address +Specify the MAC address of the access point to use when operating +as a station in a BSS network. +This overrides any automatic selection done by the system. +To disable a previously selected access point supply +.Dq Li any , +.Dq Li none , +or +.Dq Li - +for the address. +This option is useful when more than one access points have the same SSID. +Another name for the +.Cm bssid +parameter is +.Cm ap . +.It Cm chanlist Ar channels +Set the desired channels to use when scanning for access +points, neighbors in an IBSS network, or looking for unoccupied +channels when operating as an access point. +The set of channels is specified as a comma-separated list with +each element in the list either a single channel number of a range +of the form +.Dq Li a-b . +Channel numbers must be in the range 1 to 255 and be permissible +according to the operating characteristics of the device. +.It Cm channel Ar number +Set a single desired channel. +Channels range from 1 to 255, but the exact selection available +depends on the region your adaptor was manufactured for. +Setting +the channel to +.Dq Li 0 , +.Dq Li any , +or +.Dq Li - +will give you the default for your adaptor. +Many +adaptors ignore this setting unless you are in ad-hoc mode. +Alternatively the frequency, in megahertz, may be specified +instead of the channel number. +.It Cm hidessid +When operating as an access point do not broadcast the SSID +in beacon frames. +By default the SSID is included in beacon frames. +To re-enable the broadcast of the SSID use +.Fl hidessid . .It Cm powersave -For IEEE 802.11 wireless interfaces, enable powersave mode. -.It Fl powersave -For IEEE 802.11 wireless interfaces, disable powersave mode. +Enable powersave operation. +When operating as a client the station will conserve power by +periodically turning off the radio and listening for +messages from the access point telling it there are packets waiting. +The station must then retrieve the packets. +When operating as an access point the station must honor power +save operation of associated clients. +Not all devices support power save operation, either as a client +or as an access point. +Use +.Fl powersave +to disable powersave operation. .It Cm powersavesleep Ar sleep -For IEEE 802.11 wireless interfaces, set the desired max powersave sleep -time in milliseconds. +Set the desired max powersave sleep time in milliseconds. .It Cm protmode Ar technique -For IEEE 802.11 wireless interfaces operating in 11g, use the specified +For interfaces operating in 802.11g, use the specified .Ar technique for protecting OFDM frames in a mixed 11b/11g network. The set of valid techniques is @@ -664,8 +703,25 @@ .Dq Li rtscts (RTS/CTS). Technique names are case insensitive. +.It Cm roaming Ar mode +When operating as a station, control how the system will +behave when communication with the current access point +is broken. +.I Mode +may be one of +.Dq Li device +(leave it to the hardware device to decide), +.Dq Li auto +(handle either in the device or the operating system--as appropriate), +.Dq Li manual +(do nothing until explicitly instructed). +By the default the device is left to handle this if it is +capable; otherwise the operating system will automatically +attempt to reestablish communication. +Manual mode is mostly useful when an application wants to +control the selection of an access point. .It Cm rtsthreshold Ar length -For IEEE 802.11 wireless interfaces, set the threshold for which +Set the threshold for which transmitted frames are preceded by transmission of an RTS control frame. @@ -674,8 +730,26 @@ argument is the frame size in bytes and must be in the range 1 to 2312. Not all adaptors support setting the RTS threshold. +.It Cm ssid Ar ssid +Set the desired Service Set Identifier (aka network name). +The SSID is a string up to 32 characters +in length and may be specified as either a normal string or in +hexadecimal when proceeded by +.Ql 0x . +Additionally, the SSID may be cleared by setting it to +.Ql - . +.It Cm scan +Display the current set of scanned neighbors and/or trigger a new scan. +Only the super-user can trigger a scan. +.It Cm stationname Ar name +Set the name of this station. +It appears that the station name is not really part of the IEEE 802.11 +protocol though all interfaces seem to support it. +As such it only +seems to be meaningful to identical or virtually identical equipment. +Setting the station name is identical in syntax to setting the SSID. .It Cm txpower Ar power -For IEEE 802.11 wireless interfaces, set the power used to transmit frames. +Set the power used to transmit frames. The .Ar power argument @@ -686,7 +760,7 @@ the driver will use the setting closest to the specified value. Not all adaptors support changing the transmit power. .It Cm wepmode Ar mode -For IEEE 802.11 wireless interfaces, set the desired WEP mode. +Set the desired WEP mode. Not all adaptors support all modes. The set of valid modes is .Dq Li off , @@ -706,10 +780,9 @@ .Dq Li mixed . Modes are case insensitive. .It Cm weptxkey Ar index -For IEEE 802.11 wireless interfaces, set the WEP key to be used for -transmission. +Set the WEP key to be used for transmission. .It Cm wepkey Ar key Ns | Ns Ar index : Ns Ar key -For IEEE 802.11 wireless interfaces, set the selected WEP key. +Set the selected WEP key. If an .Ar index is not given, key 1 is set. @@ -732,6 +805,31 @@ If that is the case, then the first four keys (1-4) will be the standard temporary keys and any others will be adaptor specific keys such as permanent keys stored in NVRAM. +.It Cm wme +Enable Wireless Media Extensions (WME) support, if available, +for the specified interface. +WME is a subset of the IEEE 802.11e standard to support the +efficient communication of realtime and multimedia data. +To disable WME support use +.Fl wme . +.El +.Pp +The following parameters are support for compatibility with other systems: +.Bl -tag -width indent +.It Cm nwid Ar ssid +Another name for the +.Cm ssid +parameter. +Included for +.Nx +compatibility. +.It Cm station Ar name +Another name for the +.Cm stationname +parameter. +Included for +.Bsx +compatibility. .It Cm wep Another way of saying .Cm wepmode on . @@ -746,9 +844,7 @@ compatibility. .It Cm nwkey key Another way of saying: -.Pp .Dq Li "wepmode on weptxkey 1 wepkey 1:key wepkey 2:- wepkey 3:- wepkey 4:-" . -.Pp Included for .Nx compatibility. @@ -758,16 +854,13 @@ .Sm on .Xc Another way of saying -.Pp .Dq Li "wepmode on weptxkey n wepkey 1:k1 wepkey 2:k2 wepkey 3:k3 wepkey 4:k4" . -.Pp Included for .Nx compatibility. .It Fl nwkey Another way of saying .Cm wepmode off . -.Pp Included for .Nx compatibility. @@ -823,6 +916,10 @@ (only list interfaces that are up). .Pp The +.Fl v +flag may be used to get more verbose status for an interface. +.Pp +The .Fl C flag may be used to list all of the interface cloners available on the system, with no additional information. From owner-p4-projects@FreeBSD.ORG Tue Nov 2 23:26:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE12316A4D0; Tue, 2 Nov 2004 23:26:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B149116A4CE for ; Tue, 2 Nov 2004 23:26:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 643A943D1D for ; Tue, 2 Nov 2004 23:26:31 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2NQV28057469 for ; Tue, 2 Nov 2004 23:26:31 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2NQTlj057466 for perforce@freebsd.org; Tue, 2 Nov 2004 23:26:29 GMT (envelope-from sam@freebsd.org) Date: Tue, 2 Nov 2004 23:26:29 GMT Message-Id: <200411022326.iA2NQTlj057466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 23:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64122 Change 64122 by sam@sam_ebb on 2004/11/02 23:25:31 IFC @ 64121 Affected files ... .. //depot/projects/wifi/UPDATING#2 integrate .. //depot/projects/wifi/bin/rm/rm.1#2 integrate .. //depot/projects/wifi/bin/rm/rm.c#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#2 integrate .. //depot/projects/wifi/bin/stty/key.c#2 integrate .. //depot/projects/wifi/crypto/openssh/.cvsignore#2 delete .. //depot/projects/wifi/crypto/openssh/CREDITS#2 integrate .. //depot/projects/wifi/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/crypto/openssh/INSTALL#2 integrate .. //depot/projects/wifi/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/wifi/crypto/openssh/README#2 integrate .. //depot/projects/wifi/crypto/openssh/README.platform#2 integrate .. //depot/projects/wifi/crypto/openssh/README.privsep#2 integrate .. //depot/projects/wifi/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-pam.h#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth.h#2 integrate .. //depot/projects/wifi/crypto/openssh/auth1.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2.c#2 integrate .. //depot/projects/wifi/crypto/openssh/authfd.c#2 integrate .. //depot/projects/wifi/crypto/openssh/authfile.c#2 integrate .. //depot/projects/wifi/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/wifi/crypto/openssh/canohost.c#2 integrate .. //depot/projects/wifi/crypto/openssh/channels.c#2 integrate .. //depot/projects/wifi/crypto/openssh/channels.h#2 integrate .. //depot/projects/wifi/crypto/openssh/cipher.c#2 integrate .. //depot/projects/wifi/crypto/openssh/cipher.h#2 integrate .. //depot/projects/wifi/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/wifi/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/wifi/crypto/openssh/compat.h#2 integrate .. //depot/projects/wifi/crypto/openssh/config.guess#2 integrate .. //depot/projects/wifi/crypto/openssh/config.h#2 integrate .. //depot/projects/wifi/crypto/openssh/config.sub#2 integrate .. //depot/projects/wifi/crypto/openssh/configure.ac#2 integrate .. //depot/projects/wifi/crypto/openssh/contrib/Makefile#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/README#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/aix/README#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/aix/buildbff.sh#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/aix/inventory.sh#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/aix/pam.conf#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/caldera/openssh.spec#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/caldera/ssh-host-keygen#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/caldera/sshd.init#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/caldera/sshd.pam#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/cygwin/Makefile#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/cygwin/README#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/cygwin/ssh-host-config#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/cygwin/ssh-user-config#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/findssl.sh#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/gnome-ssh-askpass1.c#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/gnome-ssh-askpass2.c#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/hpux/README#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/hpux/egd#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/hpux/egd.rc#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/hpux/sshd#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/hpux/sshd.rc#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/redhat/openssh.spec#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/redhat/sshd.init#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/redhat/sshd.pam#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/solaris/README#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/solaris/buildpkg.sh#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/solaris/opensshd.in#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/ssh-copy-id#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/ssh-copy-id.1#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/sshd.pam.freebsd#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/sshd.pam.generic#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/suse/openssh.spec#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/suse/rc.config.sshd#2 delete .. //depot/projects/wifi/crypto/openssh/contrib/suse/rc.sshd#2 delete .. //depot/projects/wifi/crypto/openssh/defines.h#2 integrate .. //depot/projects/wifi/crypto/openssh/dh.c#2 integrate .. //depot/projects/wifi/crypto/openssh/dh.h#2 integrate .. //depot/projects/wifi/crypto/openssh/dns.c#2 integrate .. //depot/projects/wifi/crypto/openssh/envpass.sh#1 branch .. //depot/projects/wifi/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/wifi/crypto/openssh/includes.h#2 integrate .. //depot/projects/wifi/crypto/openssh/kex.c#2 integrate .. //depot/projects/wifi/crypto/openssh/kex.h#2 integrate .. //depot/projects/wifi/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/wifi/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/wifi/crypto/openssh/key.c#2 integrate .. //depot/projects/wifi/crypto/openssh/log.c#2 integrate .. //depot/projects/wifi/crypto/openssh/log.h#2 integrate .. //depot/projects/wifi/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/wifi/crypto/openssh/logintest.c#2 integrate .. //depot/projects/wifi/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/wifi/crypto/openssh/misc.c#2 integrate .. //depot/projects/wifi/crypto/openssh/misc.h#2 integrate .. //depot/projects/wifi/crypto/openssh/moduli.c#2 integrate .. //depot/projects/wifi/crypto/openssh/moduli.h#2 delete .. //depot/projects/wifi/crypto/openssh/monitor.c#2 integrate .. //depot/projects/wifi/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/wifi/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/wifi/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/wifi/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/wifi/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/wifi/crypto/openssh/nchan.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/.cvsignore#2 delete .. //depot/projects/wifi/crypto/openssh/openbsd-compat/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/wifi/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/wifi/crypto/openssh/packet.c#2 integrate .. //depot/projects/wifi/crypto/openssh/packet.h#2 integrate .. //depot/projects/wifi/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/wifi/crypto/openssh/progressmeter.c#2 integrate .. //depot/projects/wifi/crypto/openssh/readconf.c#2 integrate .. //depot/projects/wifi/crypto/openssh/readconf.h#2 integrate .. //depot/projects/wifi/crypto/openssh/readpass.c#2 integrate .. //depot/projects/wifi/crypto/openssh/readpass.h#2 delete .. //depot/projects/wifi/crypto/openssh/regress/Makefile#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/dynamic-forward.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/login-timeout.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/test-exec.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/try-ciphers.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/rijndael.c#2 integrate .. //depot/projects/wifi/crypto/openssh/scard-opensc.c#2 integrate .. //depot/projects/wifi/crypto/openssh/scard.c#2 integrate .. //depot/projects/wifi/crypto/openssh/scard/.cvsignore#2 delete .. //depot/projects/wifi/crypto/openssh/scp.1#2 integrate .. //depot/projects/wifi/crypto/openssh/scp.c#2 integrate .. //depot/projects/wifi/crypto/openssh/servconf.c#2 integrate .. //depot/projects/wifi/crypto/openssh/servconf.h#2 integrate .. //depot/projects/wifi/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/wifi/crypto/openssh/session.c#2 integrate .. //depot/projects/wifi/crypto/openssh/session.h#2 integrate .. //depot/projects/wifi/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sftp.1#2 integrate .. //depot/projects/wifi/crypto/openssh/sftp.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh.1#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh.c#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh1.h#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshd.8#2 integrate .. //depot/projects/wifi/crypto/openssh/sshd.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config#2 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/wifi/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/wifi/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/wifi/crypto/openssh/sshtty.h#2 delete .. //depot/projects/wifi/crypto/openssh/tildexpand.c#2 integrate .. //depot/projects/wifi/crypto/openssh/tildexpand.h#2 delete .. //depot/projects/wifi/crypto/openssh/ttymodes.h#2 integrate .. //depot/projects/wifi/crypto/openssh/version.c#2 integrate .. //depot/projects/wifi/crypto/openssh/version.h#2 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#2 integrate .. //depot/projects/wifi/etc/network.subr#2 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#2 integrate .. //depot/projects/wifi/etc/rc.d/moused#2 integrate .. //depot/projects/wifi/etc/rc.d/netif#2 integrate .. //depot/projects/wifi/etc/usbd.conf#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/wifi/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/wifi/lib/libdisk/chunk.c#2 integrate .. //depot/projects/wifi/lib/libdisk/open_disk.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_mutex.c#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/wifi/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/powerpc/reloc.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/powerpc/rtld_machdep.h#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/wifi/release/Makefile#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate .. //depot/projects/wifi/sbin/ccdconfig/ccdconfig.8#2 integrate .. //depot/projects/wifi/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/wifi/sbin/gpt/gpt.8#2 integrate .. //depot/projects/wifi/sbin/gpt/migrate.c#3 integrate .. //depot/projects/wifi/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/wifi/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/wifi/share/examples/netgraph/bluetooth/rc.bluetooth#2 integrate .. //depot/projects/wifi/share/man/man4/Makefile#2 integrate .. //depot/projects/wifi/share/man/man4/altq.4#2 integrate .. //depot/projects/wifi/share/man/man4/mem.4#2 integrate .. //depot/projects/wifi/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/wifi/share/man/man4/tcp.4#2 integrate .. //depot/projects/wifi/share/man/man4/uftdi.4#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#2 integrate .. //depot/projects/wifi/share/misc/bsd-family-tree#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/wifi/sys/alpha/conf/GENERIC#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/wifi/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/wifi/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/wifi/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/wifi/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/wifi/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#3 integrate .. //depot/projects/wifi/sys/conf/files#4 integrate .. //depot/projects/wifi/sys/conf/options#2 integrate .. //depot/projects/wifi/sys/ddb/db_output.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_ps.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_thread.c#2 integrate .. //depot/projects/wifi/sys/ddb/db_variables.c#2 integrate .. //depot/projects/wifi/sys/ddb/ddb.h#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/wifi/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/wifi/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/wifi/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#2 integrate .. //depot/projects/wifi/sys/dev/scd/scd.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/wifi/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/wifi/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/udf/udf.h#2 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/wifi/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/wifi/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/wifi/sys/geom/geom.h#2 integrate .. //depot/projects/wifi/sys/geom/geom_dev.c#3 integrate .. //depot/projects/wifi/sys/geom/geom_subr.c#2 integrate .. //depot/projects/wifi/sys/geom/geom_vfs.c#1 branch .. //depot/projects/wifi/sys/geom/geom_vfs.h#1 branch .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/wifi/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_mount.h#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_subr.c#2 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/wifi/sys/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/wifi/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/wifi/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/db_trace.c#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/wifi/sys/isofs/cd9660/iso.h#2 integrate .. //depot/projects/wifi/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_environment.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_mac.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_physio.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_sig.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_socket2.c#2 integrate .. //depot/projects/wifi/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_default.c#3 integrate .. //depot/projects/wifi/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/wifi/sys/kern/vnode_if.src#2 integrate .. //depot/projects/wifi/sys/net/if.c#2 integrate .. //depot/projects/wifi/sys/net/if_tap.c#2 integrate .. //depot/projects/wifi/sys/net/if_tun.c#2 integrate .. //depot/projects/wifi/sys/net/if_var.h#3 integrate .. //depot/projects/wifi/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#2 integrate .. //depot/projects/wifi/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/wifi/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/wifi/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp.h#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_seq.h#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#2 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/wifi/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/wifi/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/wifi/sys/pc98/i386/machdep.c#2 integrate .. //depot/projects/wifi/sys/pc98/pc98/wd_cd.c#2 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#2 integrate .. //depot/projects/wifi/sys/pci/if_skreg.h#2 integrate .. //depot/projects/wifi/sys/pci/if_vr.c#2 integrate .. //depot/projects/wifi/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/wifi/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/wifi/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/wifi/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/wifi/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/wifi/sys/sys/buf.h#3 integrate .. //depot/projects/wifi/sys/sys/bufobj.h#3 integrate .. //depot/projects/wifi/sys/sys/conf.h#3 integrate .. //depot/projects/wifi/sys/sys/kernel.h#2 integrate .. //depot/projects/wifi/sys/sys/mount.h#2 integrate .. //depot/projects/wifi/sys/sys/systm.h#3 integrate .. //depot/projects/wifi/sys/sys/vnode.h#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/inode.h#2 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/wifi/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/wifi/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/wifi/tools/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/wifi/tools/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 integrate .. //depot/projects/wifi/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 integrate .. //depot/projects/wifi/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/config.c#2 integrate Differences ... ==== //depot/projects/wifi/UPDATING#2 (text+ko) ==== @@ -23,6 +23,11 @@ developers choose to disable these features on build machines to maximize performance. +20041102: + The size of struct tcpcb has changed again due to the removal + of RFC1644 T/TCP. You have to recompile userland programs that + read kmem for tcp sockets directly (netstat, sockstat, etc.) + 20041022: The size of struct tcpcb has changed. You have to recompile userland programs that read kmem for tcp sockets directly @@ -1956,4 +1961,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ +$FreeBSD: src/UPDATING,v 1.377 2004/11/02 22:22:22 andre Exp $ ==== //depot/projects/wifi/bin/rm/rm.1#2 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ .\" -.Dd October 4, 2004 +.Dd October 28, 2004 .Dt RM 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd remove directory entries .Sh SYNOPSIS .Nm -.Op Fl dfiPRrvW +.Op Fl dfiIPRrvW .Ar .Nm unlink .Ar file @@ -76,6 +76,12 @@ option overrides any previous .Fl f options. +.It Fl I +Request confirmation once if more than three files are being removed or if a +directory is being recursively removed. +This is a far less intrusive option than +.Fl i +yet provides almost the same level of protection against mistakes. .It Fl P Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, ==== //depot/projects/wifi/bin/rm/rm.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); #include #include @@ -58,9 +58,11 @@ #include int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +int rflag, Iflag; uid_t uid; int check(char *, char *, struct stat *); +int check2(char **); void checkdot(char **); void checkslash(char **); void rm_file(char **); @@ -78,7 +80,7 @@ int main(int argc, char *argv[]) { - int ch, rflag; + int ch; char *p; /* @@ -102,7 +104,7 @@ } Pflag = rflag = 0; - while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) + while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) switch(ch) { case 'd': dflag = 1; @@ -115,6 +117,9 @@ fflag = 0; iflag = 1; break; + case 'I': + Iflag = 1; + break; case 'P': Pflag = 1; break; @@ -148,6 +153,10 @@ if (*argv) { stdin_ok = isatty(STDIN_FILENO); + if (Iflag) { + if (check2(argv) == 0) + exit (1); + } if (rflag) rm_tree(argv); else @@ -489,6 +498,56 @@ } } +int +check2(char **argv) +{ + struct stat st; + int first; + int ch; + int fcount = 0; + int dcount = 0; + int i; + const char *dname = NULL; + + for (i = 0; argv[i]; ++i) { + if (lstat(argv[i], &st) == 0) { + if (S_ISDIR(st.st_mode)) { + ++dcount; + dname = argv[i]; /* only used if 1 dir */ + } else { + ++fcount; + } + } + } + first = 0; + while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { + if (dcount && rflag) { + fprintf(stderr, "recursively remove"); + if (dcount == 1) + fprintf(stderr, " %s", dname); + else + fprintf(stderr, " %d dirs", dcount); + if (fcount == 1) + fprintf(stderr, " and 1 file"); + else if (fcount > 1) + fprintf(stderr, " and %d files", fcount); + } else if (dcount + fcount > 3) { + fprintf(stderr, "remove %d files", dcount + fcount); + } else { + return(1); + } + fprintf(stderr, "? "); + fflush(stderr); + + first = ch = getchar(); + while (ch != '\n' && ch != EOF) + ch = getchar(); + if (ch == EOF) + break; + } + return (first == 'y' || first == 'Y'); +} + #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) void checkdot(char **argv) @@ -519,7 +578,7 @@ { (void)fprintf(stderr, "%s\n%s\n", - "usage: rm [-f | -i] [-dPRrvW] file ...", + "usage: rm [-f | -i] [-dIPRrvW] file ...", " unlink file"); exit(EX_USAGE); } ==== //depot/projects/wifi/bin/sh/sh.1#2 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -947,12 +947,16 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by one of the following -special characters. -The value of the parameter is listed -next to its character. +A special parameter is a parameter denoted by a special one-character +name. +The special parameters recognized by the +.Nm +shell of +.Fx +are shown in the following list, exactly as they would appear in input +typed by the user or in the source of a shell script. .Bl -hang -.It Li * +.It Li $* Expands to the positional parameters, starting from one. When the expansion occurs within a double-quoted string @@ -965,7 +969,7 @@ if .Ev IFS is unset. -.It Li @ +.It Li $@ Expands to the positional parameters, starting from one. When the expansion occurs within double-quotes, each positional @@ -988,26 +992,26 @@ .Bd -literal -offset indent "abc" "def ghi" .Ed -.It Li # +.It Li $# Expands to the number of positional parameters. -.It Li \&? +.It Li $\&? Expands to the exit status of the most recent pipeline. -.It Li - +.It Li $- (hyphen) Expands to the current option flags (the single-letter option names concatenated into a string) as specified on invocation, by the set built-in command, or implicitly by the shell. -.It Li $ +.It Li $$ Expands to the process ID of the invoked shell. A subshell retains the same value of $ as its parent. -.It Li \&! +.It Li $\&! Expands to the process ID of the most recent background command executed from the current shell. For a pipeline, the process ID is that of the last command in the pipeline. -.It Li 0 +.It Li $0 (zero) Expands to the name of the shell or shell script. .El .Ss Word Expansions ==== //depot/projects/wifi/bin/stty/key.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.18 2004/04/06 20:06:53 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.19 2004/11/02 18:10:01 phk Exp $"); #include @@ -263,7 +263,7 @@ ip->t.c_iflag |= ICRNL; /* preserve user-preference flags in lflag */ #define LKEEP (ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH) - ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP); + ip->t.c_lflag = TTYDEF_LFLAG_ECHO | (ip->t.c_lflag & LKEEP); ip->t.c_oflag = TTYDEF_OFLAG; ip->set = 1; } ==== //depot/projects/wifi/crypto/openssh/CREDITS#2 (text+ko) ==== @@ -31,6 +31,7 @@ David Del Piero - bug fixes David Hesprich - Configure fixes David Rankin - libwrap, AIX, NetBSD fixes +Dag-Erling Smørgrav - Challenge-Response PAM code. Ed Eden - configure fixes Garrick James - configure fixes Gary E. Miller - SCO support @@ -43,7 +44,7 @@ IWAMURO Motonori - bugfixes Jani Hakala - Patches Jarno Huuskonen - Bugfixes -Jim Knoble - Many patches +Jim Knoble - Many patches Jonchen (email unknown) - the original author of PAM support of SSH Juergen Keil - scp bugfixing KAMAHARA Junzo - Configure fixes @@ -61,6 +62,7 @@ Mark D. Roth - Features, bug fixes Mark Miller - Bugfixes Matt Richards - AIX patches +Michael Steffens - HP-UX fixes Michael Stone - Irix enhancements Nakaji Hiroyuki - Sony News-OS patch Nalin Dahyabhai - PAM environment patch @@ -76,6 +78,7 @@ Philippe WILLEM - Bugfixes Phill Camp - login code fix Rip Loomis - Solaris package support, fixes +Robert Dahlem - Reliant Unix fixes Roumen Petrov - Compile & configure fixes SAKAI Kiyotaka - Multiple bugfixes Simon Wilkinson - PAM fixes, Compat with MIT KrbV @@ -95,5 +98,5 @@ Damien Miller -$Id: CREDITS,v 1.77 2004/01/30 04:00:50 dtucker Exp $ +$Id: CREDITS,v 1.79 2004/05/26 23:59:31 dtucker Exp $ ==== //depot/projects/wifi/crypto/openssh/ChangeLog#2 (text+ko) ==== @@ -1,10 +1,681 @@ +20040817 + - (dtucker) [regress/README.regress] Note compatibility issues with GNU head. + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/08/16 08:17:01 + [version.h] + 3.9 + - (djm) Crank RPM spec version numbers + - (djm) Release 3.9p1 + +20040816 + - (dtucker) [acconfig.h auth-pam.c configure.ac] Set real uid to non-root + to convince Solaris PAM to honour password complexity rules. ok djm@ + +20040815 + - (dtucker) [Makefile.in ssh-keysign.c ssh.c] Use permanently_set_uid() since + it does the right thing on all platforms. ok djm@ + - (djm) [acconfig.h configure.ac openbsd-compat/Makefile.in + openbsd-compat/bsd-closefrom.c openbsd-compat/bsd-misc.c + openbsd-compat/bsd-misc.h openbsd-compat/openbsd-compat.h] Use smarter + closefrom() replacement from sudo; ok dtucker@ + - (djm) [loginrec.c] Check that seek succeeded here too; ok dtucker + - (dtucker) [Makefile.in] Fix typo. + +20040814 + - (dtucker) [auth-krb5.c gss-serv-krb5.c openbsd-compat/xmmap.c] + Explicitly set umask for mkstemp; ok djm@ + - (dtucker) [includes.h] Undef _INCLUDE__STDC__ on HP-UX, otherwise + prot.h and shadow.h provide conflicting declarations of getspnam. ok djm@ + - (dtucker) [loginrec.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h] + Plug AIX login recording into login_write so logins will be recorded for + all auth types. + +20040813 + - (dtucker) [openbsd-compat/bsd-misc.c] Typo in #ifdef; from vinschen at + redhat.com +- (dtucker) OpenBSD CVS Sync + - avsm@cvs.openbsd.org 2004/08/11 21:43:05 + [channels.c channels.h clientloop.c misc.c misc.h serverloop.c ssh-agent.c] + some signed/unsigned int comparison cleanups; markus@ ok + - avsm@cvs.openbsd.org 2004/08/11 21:44:32 + [authfd.c scp.c ssh-keyscan.c] + use atomicio instead of homegrown equivalents or read/write. + markus@ ok + - djm@cvs.openbsd.org 2004/08/12 09:18:24 + [sshlogin.c] + typo in error message, spotted by moritz AT jodeit.org (Id sync only) + - jakob@cvs.openbsd.org 2004/08/12 21:41:13 + [ssh-keygen.1 ssh.1] + improve SSHFP documentation; ok deraadt@ + - jmc@cvs.openbsd.org 2004/08/13 00:01:43 + [ssh-keygen.1] + kill whitespace at eol; + - djm@cvs.openbsd.org 2004/08/13 02:51:48 + [monitor_fdpass.c] + extra check for no message case; ok markus, deraadt, hshoexer, henning + - dtucker@cvs.openbsd.org 2004/08/13 11:09:24 + [servconf.c] + Fix line numbers off-by-one in error messages, from tortay at cc.in2p3.fr + ok markus@, djm@ + +20040812 + - (dtucker) [sshd.c] Remove duplicate variable imported during sync. + - (dtucker) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/07/28 08:56:22 + [sshd.c] + call setsid() _before_ re-exec + - markus@cvs.openbsd.org 2004/07/28 09:40:29 + [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c + sshconnect1.c] + more s/illegal/invalid/ + - djm@cvs.openbsd.org 2004/08/04 10:37:52 + [dh.c] + return group14 when no primes found - fixes hang on empty /etc/moduli; + ok markus@ + - dtucker@cvs.openbsd.org 2004/08/11 11:09:54 + [servconf.c] + Fix minor leak; "looks right" deraadt@ + - dtucker@cvs.openbsd.org 2004/08/11 11:50:09 + [sshd.c] + Don't try to close startup_pipe if it's not open; ok djm@ + - djm@cvs.openbsd.org 2004/08/11 11:59:22 + [sshlogin.c] + check that lseek went were we told it to; ok markus@ + (Id sync only, but similar changes are needed in loginrec.c) + - djm@cvs.openbsd.org 2004/08/11 12:01:16 + [sshlogin.c] + make store_lastlog_message() static to appease -Wall; ok markus + - (dtucker) [sshd.c] Clear loginmsg in postauth monitor, prevents doubling + messages generated before the postauth privsep split. + +20040720 + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/07/21 08:56:12 + [auth.c] + s/Illegal user/Invalid user/; many requests; ok djm, millert, niklas, + miod, ... + - djm@cvs.openbsd.org 2004/07/21 10:33:31 + [auth1.c auth2.c] + bz#899: Don't display invalid usernames in setproctitle + from peak AT argo.troja.mff.cuni.cz; ok markus@ + - djm@cvs.openbsd.org 2004/07/21 10:36:23 + [gss-serv-krb5.c] + fix function declaration + - djm@cvs.openbsd.org 2004/07/21 11:51:29 + [canohost.c] + bz#902: cache remote port so we don't fatal() in auth_log when remote + connection goes away quickly. from peak AT argo.troja.mff.cuni.cz; + ok markus@ + - (djm) [auth-pam.c] Portable parts of bz#899: Don't display invalid + usernames in setproctitle from peak AT argo.troja.mff.cuni.cz; + +20040720 + - (djm) [log.c] bz #111: Escape more control characters when sending data + to syslog; from peak AT argo.troja.mff.cuni.cz + - (djm) [contrib/redhat/sshd.pam] bz #903: Remove redundant entries; from + peak AT argo.troja.mff.cuni.cz + - (djm) [regress/README.regress] Remove caveat regarding TCP wrappers, now + that sshd is fixed to behave better; suggested by tim + +20040719 + - (djm) [openbsd-compat/bsd-arc4random.c] Discard early keystream, like OpenBSD + ok dtucker@ + - (djm) [auth-pam.c] Avoid use of xstrdup and friends in conversation function, + instead return PAM_CONV_ERR, avoiding another path to fatal(); ok dtucker@ + - (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry. + Report by rac AT tenzing.org + +20040717 + - (dtucker) [logintest.c scp.c sftp-server.c sftp.c ssh-add.c ssh-agent.c + ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c ssh.c sshd.c + openbsd-compat/bsd-misc.c] Move "char *__progname" to bsd-misc.c. Reduces + diff vs OpenBSD; ok mouring@, tested by tim@ too. + - (dtucker) OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2004/07/11 17:48:47 + [channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c + readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c + session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h + sshd.c ttymodes.h] + spaces + - brad@cvs.openbsd.org 2004/07/12 23:34:25 + [ssh-keyscan.1] + Fix incorrect macro, .I -> .Em + From: Eric S. Raymond + ok jmc@ + - dtucker@cvs.openbsd.org 2004/07/17 05:31:41 + [monitor.c monitor_wrap.c session.c session.h sshd.c sshlogin.c] + Move "Last logged in at.." message generation to the monitor, right + before recording the new login. Fixes missing lastlog message when + /var/log/lastlog is not world-readable and incorrect datestamp when + multiple sessions are used (bz #463); much assistance & ok markus@ + +20040711 + - (dtucker) [auth-pam.c] Check for zero from waitpid() too, which allows + the monitor to properly clean up the PAM thread (Debian bug #252676). + +20040709 + - (tim) [contrib/cygwin/README] add minires-devel requirement. Patch from + vinschen AT redhat.com + +20040708 + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2004/07/03 05:11:33 + [sshlogin.c] (RCSID sync only, the corresponding code is not in Portable) + Use '\0' not 0 for string; ok djm@, deraadt@ + - dtucker@cvs.openbsd.org 2004/07/03 11:02:25 + [monitor_wrap.c] + Put s/key functions inside #ifdef SKEY same as monitor.c, + from des@freebsd via bz #330, ok markus@ + - dtucker@cvs.openbsd.org 2004/07/08 12:47:21 + [scp.c] + Prevent scp from skipping the file following a double-error. + bz #863, ok markus@ + +20040702 + - (dtucker) [mdoc2man.awk] Teach it to ignore .Bk -words, reported by + strube at physik3.gwdg.de a long time ago. + +20040701 + - (dtucker) [session.c] Call display_loginmsg again after do_pam_session. + Ensures messages from PAM modules are displayed when privsep=no. + - (dtucker) [auth-pam.c] Bug #705: Make arguments match PAM specs, fixes + warnings on compliant platforms. From paul.a.bolton at bt.com. ok djm@ + - (dtucker) [auth-pam.c] Bug #559 (last piece): Pass DISALLOW_NULL_AUTHTOK + to pam_authenticate for challenge-response auth too. Originally from + fcusack at fcusack.com, ok djm@ + - (tim) [buildpkg.sh.in] Add $REV to bump the package revision within + the same version. Handle the case where someone uses --with-privsep-user= + and the user name does not match the group name. ok dtucker@ + +20040630 + - (dtucker) [auth-pam.c] Check for buggy PAM modules that return a NULL + appdata_ptr to the conversation function. ok djm@ + - (djm) OpenBSD CVS Sync + - jmc@cvs.openbsd.org 2004/06/26 09:03:21 + [ssh.1] + - remove double word + - rearrange .Bk to keep SYNOPSIS nice + - -M before -m in options description + - jmc@cvs.openbsd.org 2004/06/26 09:11:14 + [ssh_config.5] + punctuation and grammar fixes. also, keep the options in order. + - jmc@cvs.openbsd.org 2004/06/26 09:14:40 + [sshd_config.5] + new sentence, new line; + - avsm@cvs.openbsd.org 2004/06/26 20:07:16 + [sshd.c] + initialise some fd variables to -1, djm@ ok + - djm@cvs.openbsd.org 2004/06/30 08:36:59 + [session.c] + unbreak TTY break, diagnosed by darren AT dazwin.com; ok markus@ + +20040627 + - (tim) update README files. + - (dtucker) [mdoc2man.awk] Bug #883: correctly recognise .Pa and .Ev macros. + - (dtucker) [regress/README.regress] Document new variables. + - (dtucker) [acconfig.h configure.ac sftp-server.c] Bug #823: add sftp + rename handling for Linux which returns EPERM for link() on (at least some) + filesystems that do not support hard links. sftp-server will fall back to + stat+rename() in such cases. + - (dtucker) [openbsd-compat/port-aix.c] Missing __func__. + +20040626 + - (djm) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2004/06/25 18:43:36 + [sshd.c] + fix broken fd handling in the re-exec fallback path, particularly when + /dev/crypto is in use; ok deraadt@ markus@ + - djm@cvs.openbsd.org 2004/06/25 23:21:38 + [sftp.c] + bz #875: fix bad escape char error message; reported by f_mohr AT yahoo.de + +20040625 + - (dtucker) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2004/06/24 19:30:54 + [servconf.c servconf.h sshd.c] + re-exec sshd on accept(); initial work, final debugging and ok markus@ + - djm@cvs.openbsd.org 2004/06/25 01:16:09 + [sshd.c] + only perform tcp wrappers checks when the incoming connection is on a + socket. silences useless warnings from regress tests that use + proxycommand="sshd -i". prompted by david@ ok markus@ + - djm@cvs.openbsd.org 2004/06/24 19:32:00 + [regress/Makefile regress/test-exec.sh, added regress/reexec.sh] + regress test for re-exec corner cases + - djm@cvs.openbsd.org 2004/06/25 01:25:12 + [regress/test-exec.sh] + clean reexec-specific junk out of text-exec.sh and simplify; idea markus@ + - dtucker@cvs.openbsd.org 2004/06/25 05:38:48 + [sftp-server.c] + Fall back to stat+rename if filesystem doesn't doesn't support hard + links. bz#823, ok djm@ + - (dtucker) [configure.ac openbsd-compat/misc.c [openbsd-compat/misc.h] + Add closefrom() for platforms that don't have it. + - (dtucker) [sshd.c] add line missing from reexec sync. + +20040623 + - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 + connections with empty passwords. Patch from davidwu at nbttech.com, + ok djm@ + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2004/06/22 22:42:02 + [regress/envpass.sh] + Add quoting for test -z; ok markus@ + - dtucker@cvs.openbsd.org 2004/06/22 22:45:52 + [regress/test-exec.sh] + Add TEST_SSH_SSHD_CONFOPTS and TEST_SSH_SSH_CONFOPTS to allow adding + arbitary options to sshd_config and ssh_config during tests. ok markus@ + - dtucker@cvs.openbsd.org 2004/06/22 22:55:56 + [regress/dynamic-forward.sh regress/test-exec.sh] + Allow setting of port for regress from TEST_SSH_PORT variable; ok markus@ + - mouring@cvs.openbsd.org 2004/06/23 00:39:38 + [rijndael.c] + -Wshadow fix up s/encrypt/do_encrypt/. OK djm@, markus@ + - dtucker@cvs.openbsd.org 2004/06/23 14:31:01 + [ssh.c] + Fix counting in master/slave when passing environment variables; ok djm@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 2 23:57:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3700916A4D0; Tue, 2 Nov 2004 23:57:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0DE4D16A4CE for ; Tue, 2 Nov 2004 23:57:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B501043D4C for ; Tue, 2 Nov 2004 23:57:11 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA2NvBew058624 for ; Tue, 2 Nov 2004 23:57:11 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA2Nv9bn058621 for perforce@freebsd.org; Tue, 2 Nov 2004 23:57:09 GMT (envelope-from arr@freebsd.org) Date: Tue, 2 Nov 2004 23:57:09 GMT Message-Id: <200411022357.iA2Nv9bn058621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 64124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Nov 2004 23:57:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=64124 Change 64124 by arr@arr_audit3_d400laptop on 2004/11/02 23:56:08 Integ from trustedbsd base branch. Includes ufs_vnops fix. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#3 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#3 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.1#3 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#3 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/CREDITS#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/INSTALL#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README.platform#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/README.privsep#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-pam.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2-gss.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2-pubkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/auth2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/authfd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/authfile.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/canohost.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/channels.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/channels.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/cipher.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/clientloop.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.guess#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/config.sub#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/configure.ac#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/defines.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dh.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/dns.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/envpass.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/gss-serv-krb5.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/includes.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kex.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kex.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/key.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/log.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/log.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/logintest.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/mdoc2man.awk#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/misc.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/moduli.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/moduli.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/myproposal.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/nchan.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/fake-rfc2553.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/getrrsetbyname.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/sys-queue.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/openbsd-compat/xmmap.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/packet.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/packet.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/pathnames.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/progressmeter.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readpass.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/readpass.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/README.regress#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/dynamic-forward.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/login-timeout.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/test-exec.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/regress/try-ciphers.sh#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/rijndael.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scard-opensc.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scard.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scp.1#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/scp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/servconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/servconf.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/session.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/session.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.1#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sftp.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.1#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-gss.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.1#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.1#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.1#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh1.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.8#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshlogin.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshpty.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshtty.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/sshtty.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/tildexpand.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/tildexpand.h#2 delete .. //depot/projects/trustedbsd/audit3/crypto/openssh/ttymodes.h#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/version.c#2 integrate .. //depot/projects/trustedbsd/audit3/crypto/openssh/version.h#2 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#3 integrate .. //depot/projects/trustedbsd/audit3/etc/mtree/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/namedb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/etc/network.subr#3 integrate .. //depot/projects/trustedbsd/audit3/etc/pam.d/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/devfs#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/moused#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/natd#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/netif#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/pf#3 integrate .. //depot/projects/trustedbsd/audit3/etc/rc.d/savecore#3 integrate .. //depot/projects/trustedbsd/audit3/etc/usbd.conf#2 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/games/ppt/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/games/primes/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/lib/libobjc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/as/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/gdbreplay/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbfd/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbinutils/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libiberty/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libopcodes/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/c++/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc1/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc1obj/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc1plus/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cc/cc_int/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cvs/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/cvs/libdiff/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/dialog/TESTS/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/src/libs/libbib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/src/libs/libdriver/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/src/libs/libgroff/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/man/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/rcs/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/texinfo/libtxi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/include/arpa/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/include/protocols/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/config.mk#2 integrate .. //depot/projects/trustedbsd/audit3/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libalias/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libarchive/archive_read_support_format_tar.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libbsnmp/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sparc64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/mlock.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/read.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/write.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc_r/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libcrypt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/chunk.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/open_disk.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libio/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libncurses/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/libpam/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_create.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_exit.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_find_thread.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_mutex.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libpthread/thread/thr_sig.c#3 integrate .. //depot/projects/trustedbsd/audit3/lib/librpcsvc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libsm/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libsmb/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libsmdb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libsmutil/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libstand/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libtelnet/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libxpg4/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/lib/liby/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/powerpc/rtld_machdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/trustedbsd/audit3/release/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/audit3/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/release/scripts/print-cdrom-packages.sh#3 integrate .. //depot/projects/trustedbsd/audit3/rescue/librescue/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/rescue/rescue/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ccdconfig/ccdconfig.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/common/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dst/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/minires/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/omapip/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/add.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/create.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/destroy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/gpt.h#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/migrate.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/recover.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/remove.c#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/gpt/show.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/growfs/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/gvinum/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/mca/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/pflogd/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/rtsol/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/secure/lib/libssl/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/dict/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/IPv6/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/bind9/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/bufbio/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/devfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/diskperf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/jail/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/kernmalloc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/kerntune/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/nqnfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/px/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/relengr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/sysperf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/papers/timecounter/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/01.cacm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/02.implement/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/05.sysman/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/06.Clang/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/13.rcs/rcs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/15.yacc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/16.lex/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/18.gprof/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/20.ipctut/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/21.ipc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/22.rpcgen/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/23.rpc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/24.xdr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/25.xdrrfc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/26.rpcrfc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/27.nfsrpc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/psd/28.cvs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/smm/01.setup/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/smm/02.config/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/smm/05.fastfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/smm/08.sendmailop/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/smm/12.timed/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/04.csh/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/07.mail/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/10.exref/summary/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/11.vitut/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/12.vi/summary/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/12.vi/vi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/13.viref/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/doc/usd/21.troff/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/share/examples/autofs/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/cvsup/stable-supfile#3 integrate .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#3 integrate .. //depot/projects/trustedbsd/audit3/share/examples/ipfilter/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/isdn/v21/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/libvgl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/ppi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/smbfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/smbfs/print/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/info/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/altq.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/divert.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/fd.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/inet.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/mem.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_device.4#2 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/trustedbsd/audit3/share/man/man4/tcp.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uftdi.4#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/firewall.7#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/taskqueue.9#3 integrate .. //depot/projects/trustedbsd/audit3/share/misc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/misc/bsd-family-tree#3 integrate .. //depot/projects/trustedbsd/audit3/share/mk/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/mk/sys.mk#3 integrate .. //depot/projects/trustedbsd/audit3/share/security/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/sendmail/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/skel/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/snmp/mibs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/syscons/fonts/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/alpha/libalpha/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arc/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.sparc64#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#3 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_output.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_ps.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_variables.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/ddb.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dcons/dcons.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/iec13213.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/global.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/patm/genrtab/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/scd/scd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uftdi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/hpfs/hpfs.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/ntfs/ntfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_dev.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_event.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_int.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_vfs.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/geom_vfs.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/ext2fs/ext2_mount.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/ext2fs/ext2_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/db_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/ia64/sscdisk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/isofs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/isofs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/isofs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/isofs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/isofs/cd9660/iso.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_conf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_environment.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_intr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mac.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_physio.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sig.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/sched_ule.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_trap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_unit.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#7 edit .. //depot/projects/trustedbsd/audit3/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_default.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vnode_if.src#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/aic7xxx/ahd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/net/if.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_cisco.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/if_ether.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfsnode.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/wd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/wd_cd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp_i810.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_sk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_skreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_vr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powermac/ata_macio.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/db_trace.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/buf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/conf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/kernel.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/ktr.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mount.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/systm.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/uma_core.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_contig.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_glue.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_kern.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pager.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/trustedbsd/audit3/tools/diag/dumpvfscache/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/diag/localeck/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom/ConfCmp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/geom/MdLoad/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/tcpconnect/tcpconnect.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/regression/usr.bin/make/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/test/malloc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/aac/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/gdb_regofs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ministat/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nanobsd/localfiles#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/nanobsd/make.conf#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/netsend/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/raidtest/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/dirname/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/du/du.1#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/elf2aout/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/compat.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/job.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/job.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/make/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/mktemp/mktemp.1#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/newgrp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/unexpand/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/uudecode/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/amd/libamu/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/bsnmpd/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.y#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/lang.l#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ctm/mkCTM/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/fwcontrol/fwcontrol.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/lpr/SMM.doc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/lpr/common_source/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/lpr/filters.ru/koi2855/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/lpr/filters.ru/koi2alt/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/lpr/filters/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mrouted/common/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/libntp/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/libparse/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntpq/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pcvt/Misc/Doc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pcvt/Misc/Etc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pcvt/Misc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ppp/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.ypupdated/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -502,7 +502,7 @@ .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} -KERNWARN= yes +KERNWARN= .else KERNCONF?= GENERIC .endif ==== //depot/projects/trustedbsd/audit3/UPDATING#3 (text+ko) ==== @@ -23,6 +23,11 @@ developers choose to disable these features on build machines to maximize performance. +20041022: + The size of struct tcpcb has changed. You have to recompile + userland programs that read kmem for tcp sockets directly + (netstat, sockstat, etc.) + 20041018: A major sweep over the tty drivers to elimnate approx 3100 lines of copy&pasted code have been performed. As a part of @@ -1951,4 +1956,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ +$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ ==== //depot/projects/trustedbsd/audit3/bin/rm/rm.1#3 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ .\" -.Dd October 4, 2004 +.Dd October 28, 2004 .Dt RM 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd remove directory entries .Sh SYNOPSIS .Nm -.Op Fl dfiPRrvW +.Op Fl dfiIPRrvW .Ar .Nm unlink .Ar file @@ -76,6 +76,12 @@ option overrides any previous .Fl f options. +.It Fl I +Request confirmation once if more than three files are being removed or if a +directory is being recursively removed. +This is a far less intrusive option than +.Fl i +yet provides almost the same level of protection against mistakes. .It Fl P Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, ==== //depot/projects/trustedbsd/audit3/bin/rm/rm.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); #include #include @@ -58,9 +58,11 @@ #include int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +int rflag, Iflag; uid_t uid; int check(char *, char *, struct stat *); +int check2(char **); void checkdot(char **); void checkslash(char **); void rm_file(char **); @@ -78,7 +80,7 @@ int main(int argc, char *argv[]) { - int ch, rflag; + int ch; char *p; /* @@ -102,7 +104,7 @@ } Pflag = rflag = 0; - while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) + while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) switch(ch) { case 'd': dflag = 1; @@ -115,6 +117,9 @@ fflag = 0; iflag = 1; break; + case 'I': + Iflag = 1; + break; case 'P': Pflag = 1; break; @@ -148,6 +153,10 @@ if (*argv) { stdin_ok = isatty(STDIN_FILENO); + if (Iflag) { + if (check2(argv) == 0) + exit (1); + } if (rflag) rm_tree(argv); else @@ -489,6 +498,56 @@ } } +int +check2(char **argv) +{ + struct stat st; + int first; + int ch; + int fcount = 0; + int dcount = 0; + int i; + const char *dname = NULL; + + for (i = 0; argv[i]; ++i) { + if (lstat(argv[i], &st) == 0) { + if (S_ISDIR(st.st_mode)) { + ++dcount; + dname = argv[i]; /* only used if 1 dir */ + } else { + ++fcount; + } + } + } + first = 0; + while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { + if (dcount && rflag) { + fprintf(stderr, "recursively remove"); + if (dcount == 1) + fprintf(stderr, " %s", dname); + else + fprintf(stderr, " %d dirs", dcount); + if (fcount == 1) + fprintf(stderr, " and 1 file"); + else if (fcount > 1) + fprintf(stderr, " and %d files", fcount); + } else if (dcount + fcount > 3) { + fprintf(stderr, "remove %d files", dcount + fcount); + } else { + return(1); + } + fprintf(stderr, "? "); + fflush(stderr); + + first = ch = getchar(); + while (ch != '\n' && ch != EOF) + ch = getchar(); + if (ch == EOF) + break; + } + return (first == 'y' || first == 'Y'); +} + #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) void checkdot(char **argv) @@ -519,7 +578,7 @@ { (void)fprintf(stderr, "%s\n%s\n", - "usage: rm [-f | -i] [-dPRrvW] file ...", + "usage: rm [-f | -i] [-dIPRrvW] file ...", " unlink file"); exit(EX_USAGE); } ==== //depot/projects/trustedbsd/audit3/bin/sh/sh.1#3 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -947,12 +947,16 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by one of the following -special characters. -The value of the parameter is listed -next to its character. +A special parameter is a parameter denoted by a special one-character +name. +The special parameters recognized by the +.Nm +shell of +.Fx +are shown in the following list, exactly as they would appear in input +typed by the user or in the source of a shell script. .Bl -hang -.It Li * +.It Li $* Expands to the positional parameters, starting from one. When the expansion occurs within a double-quoted string @@ -965,7 +969,7 @@ if .Ev IFS is unset. -.It Li @ +.It Li $@ Expands to the positional parameters, starting from one. When >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 3 01:56:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6E6C16A4D0; Wed, 3 Nov 2004 01:56:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ADD1D16A4CF for ; Wed, 3 Nov 2004 01:56:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D2543D2F for ; Wed, 3 Nov 2004 01:56:40 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA31uefn069311 for ; Wed, 3 Nov 2004 01:56:40 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA31udNK069307 for perforce@freebsd.org; Wed, 3 Nov 2004 01:56:39 GMT (envelope-from peter@freebsd.org) Date: Wed, 3 Nov 2004 01:56:39 GMT Message-Id: <200411030156.iA31udNK069307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2004 01:56:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=64128 Change 64128 by peter@peter_daintree on 2004/11/03 01:56:16 IFC @64125 Affected files ... .. //depot/projects/hammer/UPDATING#65 integrate .. //depot/projects/hammer/bin/rm/rm.1#8 integrate .. //depot/projects/hammer/bin/sh/sh.1#11 integrate .. //depot/projects/hammer/bin/stty/key.c#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#40 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#28 integrate .. //depot/projects/hammer/etc/rc.d/moused#7 integrate .. //depot/projects/hammer/etc/usbd.conf#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#30 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#24 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#19 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#24 integrate .. //depot/projects/hammer/release/Makefile#65 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#64 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#3 integrate .. //depot/projects/hammer/share/examples/netgraph/bluetooth/rc.bluetooth#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#53 integrate .. //depot/projects/hammer/share/man/man4/altq.4#2 integrate .. //depot/projects/hammer/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/hammer/share/man/man4/tcp.4#14 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#41 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#20 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#10 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#23 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#28 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#60 integrate .. //depot/projects/hammer/sys/arm/arm/db_trace.c#7 integrate .. //depot/projects/hammer/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/hammer/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/hammer/sys/conf/NOTES#71 integrate .. //depot/projects/hammer/sys/ddb/db_output.c#6 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#15 integrate .. //depot/projects/hammer/sys/ddb/db_thread.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_variables.c#4 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#8 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#26 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#7 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#32 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/db_trace.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#42 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#35 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#42 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#9 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_cisco.c#6 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/hammer/sys/netinet/tcp.h#9 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#38 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_seq.h#6 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#23 integrate .. //depot/projects/hammer/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#20 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#19 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#36 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#30 integrate .. //depot/projects/hammer/sys/pci/if_skreg.h#8 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#20 integrate .. //depot/projects/hammer/sys/powerpc/include/elf.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_kauai.c#5 integrate .. //depot/projects/hammer/sys/powerpc/powermac/ata_macio.c#9 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/db_trace.c#7 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#31 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/db_trace.c#9 integrate .. //depot/projects/hammer/tools/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#6 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#17 integrate Differences ... ==== //depot/projects/hammer/UPDATING#65 (text+ko) ==== @@ -23,6 +23,11 @@ developers choose to disable these features on build machines to maximize performance. +20041102: + The size of struct tcpcb has changed again due to the removal + of RFC1644 T/TCP. You have to recompile userland programs that + read kmem for tcp sockets directly (netstat, sockstat, etc.) + 20041022: The size of struct tcpcb has changed. You have to recompile userland programs that read kmem for tcp sockets directly @@ -1956,4 +1961,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ +$FreeBSD: src/UPDATING,v 1.377 2004/11/02 22:22:22 andre Exp $ ==== //depot/projects/hammer/bin/rm/rm.1#8 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.32 2004/10/28 08:25:30 delphij Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ .\" .Dd October 28, 2004 .Dt RM 1 @@ -77,9 +77,9 @@ .Fl f options. .It Fl I -Request confirmation once if more then three files are being removed or if a -directory is being recursively removed. This is a far less intrusive option -than +Request confirmation once if more than three files are being removed or if a +directory is being recursively removed. +This is a far less intrusive option than .Fl i yet provides almost the same level of protection against mistakes. .It Fl P ==== //depot/projects/hammer/bin/sh/sh.1#11 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -947,12 +947,16 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by one of the following -special characters. -The value of the parameter is listed -next to its character. +A special parameter is a parameter denoted by a special one-character +name. +The special parameters recognized by the +.Nm +shell of +.Fx +are shown in the following list, exactly as they would appear in input +typed by the user or in the source of a shell script. .Bl -hang -.It Li * +.It Li $* Expands to the positional parameters, starting from one. When the expansion occurs within a double-quoted string @@ -965,7 +969,7 @@ if .Ev IFS is unset. -.It Li @ +.It Li $@ Expands to the positional parameters, starting from one. When the expansion occurs within double-quotes, each positional @@ -988,26 +992,26 @@ .Bd -literal -offset indent "abc" "def ghi" .Ed -.It Li # +.It Li $# Expands to the number of positional parameters. -.It Li \&? +.It Li $\&? Expands to the exit status of the most recent pipeline. -.It Li - +.It Li $- (hyphen) Expands to the current option flags (the single-letter option names concatenated into a string) as specified on invocation, by the set built-in command, or implicitly by the shell. -.It Li $ +.It Li $$ Expands to the process ID of the invoked shell. A subshell retains the same value of $ as its parent. -.It Li \&! +.It Li $\&! Expands to the process ID of the most recent background command executed from the current shell. For a pipeline, the process ID is that of the last command in the pipeline. -.It Li 0 +.It Li $0 (zero) Expands to the name of the shell or shell script. .El .Ss Word Expansions ==== //depot/projects/hammer/bin/stty/key.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.18 2004/04/06 20:06:53 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/key.c,v 1.19 2004/11/02 18:10:01 phk Exp $"); #include @@ -263,7 +263,7 @@ ip->t.c_iflag |= ICRNL; /* preserve user-preference flags in lflag */ #define LKEEP (ECHOKE|ECHOE|ECHOK|ECHOPRT|ECHOCTL|ALTWERASE|TOSTOP|NOFLSH) - ip->t.c_lflag = TTYDEF_LFLAG | (ip->t.c_lflag & LKEEP); + ip->t.c_lflag = TTYDEF_LFLAG_ECHO | (ip->t.c_lflag & LKEEP); ip->t.c_oflag = TTYDEF_OFLAG; ip->set = 1; } ==== //depot/projects/hammer/etc/defaults/rc.conf#40 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.227 2004/10/30 13:44:05 pjd Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.228 2004/11/01 18:05:40 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -362,6 +362,8 @@ font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO). blanktime="300" # blank time (in seconds) or "NO" to turn it off. saver="NO" # screen saver: Uses /boot/kernel/${saver}_saver.ko +moused_nondefault_enable="YES" # Treat non-default mice as enabled unless + # specifically overriden in rc.conf(5). moused_enable="NO" # Run the mouse daemon. moused_type="auto" # See man page for rc.conf(5) for available settings. moused_port="/dev/psm0" # Set to your mouse port. ==== //depot/projects/hammer/etc/rc.d/Makefile#28 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.44 2004/09/29 00:12:28 trhodes Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.45 2004/11/02 12:35:54 pjd Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -25,8 +25,8 @@ network_ipv6 nfsclient nfsd \ nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ - pccard pcvt pf pflog preseedrandom \ - power_profile ppp-user pppoed pwcheck \ + pccard pcvt pf pflog \ + power_profile ppp-user pppoed preseedrandom pwcheck \ quota \ random rarpd rcconf.sh resolv root \ route6d routed routing rpcbind rtadvd rwho \ ==== //depot/projects/hammer/etc/rc.d/moused#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.7 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.8 2004/11/01 18:05:40 mtm Exp $ # # PROVIDE: moused @@ -14,11 +14,47 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" start_cmd="moused_start" +_pidprefix="/var/run/moused" +pidfile="${_pidprefix}.pid" +_pidarg= +load_rc_config $name +# Set the pid file and variable name. The second argument, if it exists, is +# expected to be the mouse device. +# +if [ -n "$2" ]; then + checkyesno moused_nondefault_enable && + eval moused_$2_enable=\${moused_$2_enable-YES} + rcvar=`set_rcvar moused_$2` + pidfile="${_pidprefix}.$2.pid" + _pidarg="-I $pidfile" +fi + moused_start() { - echo -n 'Starting moused:' - /usr/sbin/moused ${moused_flags} -p ${moused_port} -t ${moused_type} + local ms myflags myport mytype + + # Set the mouse device and get any related variables. If + # a moused device has been specified on the commandline, then + # rc.conf(5) variables defined for that device take precedence + # over the generic moused_* variables. The only exception is + # the moused_port variable, which if not defined sets it to the + # passed in device name. + # + ms=$1 + if [ -n "$ms" ]; then + eval myflags=\${moused_${ms}_flags-$moused_flags} + eval myport=\${moused_${ms}_port-/dev/$ms} + eval mytype=\${moused_${ms}_type-$moused_type} + else + ms="default" + myflags="$moused_flags" + myport="$moused_port" + mytype="$moused_type" + fi + + echo -n "Starting ${ms} moused:" + /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${_pidarg} _mousechar_arg= case ${mousechar_start} in @@ -36,5 +72,4 @@ echo '.' } -load_rc_config $name -run_rc_command "$1" +run_rc_command $* ==== //depot/projects/hammer/etc/usbd.conf#3 (text+ko) ==== @@ -2,7 +2,7 @@ # # See usbd.conf(5) for the description of the format of the file. # -# $FreeBSD: src/etc/usbd.conf,v 1.12 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/usbd.conf,v 1.13 2004/11/01 18:05:40 mtm Exp $ # Firmware download into the ActiveWire board. After the firmware download is # done the device detaches and reappears as something new and shiny automatically. @@ -46,7 +46,7 @@ # device "Mouse" devname "ums[0-9]+" - attach "/usr/sbin/moused -p /dev/${DEVNAME} -I /var/run/moused.${DEVNAME}.pid ; /usr/sbin/vidcontrol -m on" + attach "/etc/rc.d/moused start ${DEVNAME}" # The fallthrough entry: Nothing is specified, nothing is done. And it isn't # necessary at all :-). Just for pretty printing in debugging mode. ==== //depot/projects/hammer/lib/libpthread/thread/thr_private.h#30 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.119 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_private.h,v 1.120 2004/11/01 10:49:34 davidxu Exp $ */ #ifndef _THR_PRIVATE_H @@ -563,6 +563,7 @@ struct pthread_sigframe { int psf_valid; int psf_flags; + int psf_cancelflags; int psf_interrupted; int psf_timeout; int psf_signo; ==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#24 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.81 2004/10/23 23:28:36 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.82 2004/11/01 10:49:34 davidxu Exp $ */ #include #include @@ -1188,6 +1188,7 @@ if (psf->psf_valid == 0) PANIC("invalid pthread_sigframe\n"); thread->flags = psf->psf_flags; + thread->cancelflags = psf->psf_cancelflags; thread->interrupted = psf->psf_interrupted; thread->timeout = psf->psf_timeout; thread->state = psf->psf_state; @@ -1200,6 +1201,7 @@ { /* This has to initialize all members of the sigframe. */ psf->psf_flags = thread->flags & THR_FLAGS_PRIVATE; + psf->psf_cancelflags = thread->cancelflags; psf->psf_interrupted = thread->interrupted; psf->psf_timeout = thread->timeout; psf->psf_state = thread->state; ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#19 (text+ko) ==== @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.171 2004/10/30 17:30:56 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.174 2004/11/02 18:48:44 yar Exp $"; #endif /* not lint */ /* @@ -1258,8 +1258,11 @@ e = pam_start("ftpd", (*ppw)->pw_name, &conv, &pamh); if (e != PAM_SUCCESS) { - /* pamh is NULL, cannot use pam_strerror() */ - syslog(LOG_ERR, "pam_start failed"); + /* + * In OpenPAM, it's OK to pass NULL to pam_strerror() + * if context creation has failed in the first place. + */ + syslog(LOG_ERR, "pam_start: %s", pam_strerror(NULL, e)); return -1; } @@ -3172,9 +3175,9 @@ if (statfd >= 0 && getwd(path) != NULL) { time(&now); - snprintf(buf, sizeof(buf), "%.20s!%s!%s!%s/%s!%qd!%ld\n", + snprintf(buf, sizeof(buf), "%.20s!%s!%s!%s/%s!%jd!%ld\n", ctime(&now)+4, ident, remotehost, - path, name, (long long)size, + path, name, (intmax_t)size, (long)(now - start + (now == start))); write(statfd, buf, strlen(buf)); } ==== //depot/projects/hammer/libexec/rtld-elf/powerpc/reloc.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/powerpc/reloc.c,v 1.4 2004/08/04 19:12:14 dfr Exp $ + * $FreeBSD: src/libexec/rtld-elf/powerpc/reloc.c,v 1.5 2004/11/02 09:47:01 ssouhlal Exp $ */ #include @@ -206,6 +206,58 @@ */ break; + case R_PPC_DTPMOD32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, + false, cache); + + if (def == NULL) + return (-1); + + *where = (Elf_Addr) defobj->tlsindex; + + break; + + case R_PPC_TPREL32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, + false, cache); + + if (def == NULL) + return (-1); + + /* + * We lazily allocate offsets for static TLS as we + * see the first relocation that references the + * TLS block. This allows us to support (small + * amounts of) static TLS in dynamically loaded + * modules. If we run out of space, we generate an + * error. + */ + if (!defobj->tls_done) { + if (!allocate_tls_offset((Obj_Entry*) defobj)) { + _rtld_error("%s: No space available for static " + "Thread Local Storage", obj->path); + return (-1); + } + } + + *(Elf_Addr **)where = *where * sizeof(Elf_Addr) + + (Elf_Addr *)(def->st_value + rela->r_addend + + defobj->tlsoffset - TLS_TP_OFFSET - TLS_TCB_SIZE); + + break; + + case R_PPC_DTPREL32: + def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj, + false, cache); + + if (def == NULL) + return (-1); + + *where += (Elf_Addr)(def->st_value + rela->r_addend + - TLS_DTV_OFFSET); + + break; + default: _rtld_error("%s: Unsupported relocation type %d" " in non-PLT relocations\n", obj->path, @@ -494,6 +546,7 @@ allocate_initial_tls(Obj_Entry *list) { register Elf_Addr **tp __asm__("r2"); + Elf_Addr **_tp; /* * Fix the size of the static TLS block by using the maximum @@ -503,7 +556,14 @@ tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; - tp = (Elf_Addr **) ((char *) allocate_tls(list, 0, 8, 8) + 0x7008); + _tp = (Elf_Addr **) ((char *) allocate_tls(list, 0, 8, 8) + + TLS_TP_OFFSET + TLS_TCB_SIZE); + + /* + * XXX gcc seems to ignore 'tp = _tp;' + */ + + __asm __volatile("mr %0,%1" : "=r"(tp) : "r"(_tp)); } void* @@ -512,6 +572,8 @@ register Elf_Addr **tp __asm__("r2"); char *p; - p = tls_get_addr_common(tp, ti->ti_module, ti->ti_offset); - return p + 0x8000; + p = tls_get_addr_common((Elf_Addr**)((Elf_Addr)tp - TLS_TP_OFFSET + - TLS_TCB_SIZE), ti->ti_module, ti->ti_offset); + + return (p + TLS_DTV_OFFSET); } ==== //depot/projects/hammer/libexec/rtld-elf/powerpc/rtld_machdep.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_machdep.h,v 1.3 2004/08/04 19:12:14 dfr Exp $ + * $FreeBSD: src/libexec/rtld-elf/powerpc/rtld_machdep.h,v 1.4 2004/11/02 09:47:01 ssouhlal Exp $ */ #ifndef RTLD_MACHDEP_H @@ -62,6 +62,14 @@ void _rtld_powerpc_pltresolve(void); void _rtld_powerpc_pltcall(void); +/* + * TLS + */ + +#define TLS_TP_OFFSET 0x7000 +#define TLS_DTV_OFFSET 0x8000 +#define TLS_TCB_SIZE 8 + #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) #define calculate_first_tls_offset(size, align) \ ==== //depot/projects/hammer/libexec/rtld-elf/rtld.c#24 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.100 2004/09/23 23:04:52 cognet Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.101 2004/11/02 09:42:21 ssouhlal Exp $ */ /* @@ -390,6 +390,17 @@ exit (0); } + /* setup TLS for main thread */ + dbg("initializing initial thread local storage"); + STAILQ_FOREACH(entry, &list_main, link) { + /* + * Allocate all the initial objects out of the static TLS + * block even if they didn't ask for it. + */ + allocate_tls_offset(entry->obj); + } + allocate_initial_tls(obj_list); + if (relocate_objects(obj_main, ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld) == -1) die(); @@ -410,17 +421,6 @@ dbg("initializing thread locks"); lockdflt_init(); - /* setup TLS for main thread */ - dbg("initializing initial thread local storage"); - STAILQ_FOREACH(entry, &list_main, link) { - /* - * Allocate all the initial objects out of the static TLS - * block even if they didn't ask for it. - */ - allocate_tls_offset(entry->obj); - } - allocate_initial_tls(obj_list); - /* Make a list of init functions to call. */ objlist_init(&initlist); initlist_add_objects(obj_list, preload_tail, &initlist); ==== //depot/projects/hammer/release/Makefile#65 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.866 2004/10/21 08:54:10 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.867 2004/11/02 11:59:27 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -951,9 +951,10 @@ @echo 'mfsroot_load="YES"' > ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_type="mfs_root"' >> ${CD_DISC2}/boot/loader.conf @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DISC2}/boot/loader.conf -.if exists(${HINTSFILE}) +.if exists(${RD}/trees/base/boot/device.hints) # Break the link to device.hints so we can modify it - @cp -f ${HINTSFILE} ${CD_DISC2}/boot/device.hints + @rm -f ${CD_DISC2}/boot/device.hints + @cp ${RD}/trees/base/boot/device.hints ${CD_DISC2}/boot/device.hints .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" @echo 'hint.atkbd.0.flags="0x1"' >> ${CD_DISC2}/boot/device.hints .endif ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#64 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.259 2004/09/26 19:13:37 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.260 2004/11/02 22:31:29 simon Exp $ Supported Devices @@ -195,6 +195,9 @@ driver) + The hptmv(4) driver supports the HighPoint + RocketRAID 182x SATA controllers. + &hwlist.ips; &hwlist.mpt; ==== //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.4 2004/08/22 16:22:20 pjd Exp $ +.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.5 2004/11/01 15:46:21 pjd Exp $ .\" .Dd Aug 22, 2004 .Dt GRAID3 8 @@ -112,7 +112,7 @@ when device is in complete state. With this option specified random I/O read operations are even 40% faster, but sequential reads are slower. -One cannot not use this options if +One cannot use this options if .Fl w option is also specified. .It Fl w ==== //depot/projects/hammer/share/examples/netgraph/bluetooth/rc.bluetooth#2 (text+ko) ==== @@ -27,7 +27,7 @@ # SUCH DAMAGE. # # $Id: rc.bluetooth,v 1.5 2003/03/30 04:03:16 max Exp $ -# $FreeBSD: src/share/examples/netgraph/bluetooth/rc.bluetooth,v 1.1 2003/05/10 21:53:43 julian Exp $ +# $FreeBSD: src/share/examples/netgraph/bluetooth/rc.bluetooth,v 1.2 2004/11/02 20:06:33 emax Exp $ # logger="/usr/bin/logger -i -s -p user.err" @@ -182,7 +182,7 @@ exit 1 fi - ${hcseriald} -f /dev/cuaa${unit} -n ${dev} + ${hcseriald} -f /dev/cuad${unit} -n ${dev} sleep 1 # wait a little bit if [ ! -f "/var/run/hcseriald.${dev}.pid" ]; then ==== //depot/projects/hammer/share/man/man4/Makefile#53 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.287 2004/10/12 23:38:22 emax Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.288 2004/11/02 10:46:28 harti Exp $ MAN= aac.4 \ acpi.4 \ @@ -155,6 +155,7 @@ netintro.4 \ ng_async.4 \ ng_atm.4 \ + ngatmbase.4 \ ng_atmllc.4 \ ng_atmpif.4 \ ng_bluetooth.4 \ ==== //depot/projects/hammer/share/man/man4/altq.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.2 2004/10/08 03:33:31 green Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.3 2004/11/01 11:43:07 mlaier Exp $ .\" .Dd October 7, 2004 .Dt ALTQ 4 @@ -110,6 +110,7 @@ .Xr ath 4 , .Xr awi 4 , .Xr bfe 4 , +.Xr bge 4 , .Xr dc 4 , .Xr em 4 , .Xr fxp 4 , ==== //depot/projects/hammer/share/man/man4/tcp.4#14 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.50 2004/10/23 18:37:23 andre Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.51 2004/11/02 22:22:22 andre Exp $ .\" -.Dd October 23, 2004 +.Dd November 2, 2004 .Dt TCP 4 .Os .Sh NAME @@ -233,16 +233,11 @@ branch of the .Xr sysctl 3 MIB. -.Bl -tag -width ".Va TCPCTL_DO_RFC1644" +.Bl -tag -width ".Va TCPCTL_DO_RFC1323" .It Dv TCPCTL_DO_RFC1323 .Pq Va rfc1323 Implement the window scaling and timestamp options of RFC 1323 (default is true). -.It Dv TCPCTL_DO_RFC1644 -.Pq Va rfc1644 -Implement Transaction -.Tn TCP , -as described in RFC 1644. .It Dv TCPCTL_MSSDFLT .Pq Va mssdflt The default value used for the maximum segment size @@ -517,7 +512,6 @@ .Xr intro 4 , .Xr ip 4 , .Xr syncache 4 , -.Xr ttcp 4 , .Xr setkey 8 .Rs .%A "V. Jacobson" @@ -527,11 +521,6 @@ .%O "RFC 1323" .Re .Rs -.%A "R. Braden" -.%T "T/TCP - TCP Extensions for Transactions" -.%O "RFC 1644" -.Re -.Rs .%A "A. Heffernan" .%T "Protection of BGP Sessions via the TCP MD5 Signature Option" .%O "RFC 2385" ==== //depot/projects/hammer/share/man/man5/rc.conf.5#41 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.233 2004/10/30 13:44:06 pjd Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.234 2004/11/01 18:05:41 mtm Exp $ .\" .Dd October 23, 2004 .Dt RC.CONF 5 @@ -2223,6 +2223,21 @@ this is the actual screen saver to use .Li ( blank , snake , daemon , etc). +.It Va moused_nondefault_enable +.Pq Vt str +If set to +.Dq Li NO +the mouse device specified on +the command line is not automatically treated as enabled by the +.Pa /etc/rc.d/moused +script. +Having this variable set to +.Dq Li YES +allows a +.Xr usb 4 +mouse, +for example, +to be enabled as soon as it is plugged in. .It Va moused_enable .Pq Vt str If set to ==== //depot/projects/hammer/share/misc/bsd-family-tree#20 (text+ko) ==== @@ -172,7 +172,7 @@ | | | | \ FreeBSD 5.0 | | | | | | | | | -FreeBSD 5.1 | NetBSD -current OpenBSD -current DragonFly 1.0 +FreeBSD 5.1 | | | DragonFly 1.0 | \ | | | | | ----- Mac OS X | | | | 10.3 | | | @@ -181,10 +181,10 @@ | FreeBSD 5.2.1 | | | | | | | | | *---FreeBSD 5.3 | | | | - | | | | | | + | | | | OpenBSD 3.6 | | v | | | | | | | | | -FreeBSD 6 -current | | | | +FreeBSD 6 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -410,6 +410,7 @@ FreeBSD 4.10 2004-05-27 [FBD] DragonFly 1.0 2004-07-12 [DFD] FreeBSD 5.3 2004-10-24 [FBD] +OpenBSD 3.6 2004-10-29 [OBD] Bibliography ------------------------ @@ -470,4 +471,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.84 2004/10/24 10:09:20 scottl Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.85 2004/11/02 09:40:57 maxim Exp $ ==== //depot/projects/hammer/sys/alpha/alpha/db_trace.c#10 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -221,7 +221,7 @@ last_ipl = ~0L; tf = NULL; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) ==== //depot/projects/hammer/sys/alpha/conf/GENERIC#24 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ machine alpha cpu EV4 @@ -66,7 +66,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -381,7 +381,7 @@ first = TRUE; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.10 2004/11/01 22:15:13 jhb Exp $ */ /* @@ -313,7 +313,7 @@ else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) if (*isrc != NULL) db_dump_ithread((*isrc)->is_ithread, verbose); ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#60 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $ machine amd64 cpu HAMMER @@ -48,7 +48,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues ==== //depot/projects/hammer/sys/arm/arm/db_trace.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -138,7 +138,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 3 13:06:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D36C816A4D0; Wed, 3 Nov 2004 13:06:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9467A16A4CE for ; Wed, 3 Nov 2004 13:06:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47EE743D2D for ; Wed, 3 Nov 2004 13:06:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA3D6MHO010066 for ; Wed, 3 Nov 2004 13:06:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA3D6H6e010062 for perforce@freebsd.org; Wed, 3 Nov 2004 13:06:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 Nov 2004 13:06:17 GMT Message-Id: <200411031306.iA3D6H6e010062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2004 13:06:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=64142 Change 64142 by rwatson@rwatson_tislabs on 2004/11/03 13:05:19 Integ of trustedbsd mac branch: - struct tcpcb has changed size - rm(1) now has a -I option - openssh update - various rc.d startup script changes - libphtread fixes - amd64 fixes by peter - placeholders for audit syscalls - some minor ddb beautification - bfe device locking fixes - usb ehci enhancements - many fs changes related to the vfs / geom changes by phk - HighPoint RocketRAID 182x support default in config - Adding tracing to bus dma - VM hacking by alc Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#50 integrate .. //depot/projects/trustedbsd/mac/UPDATING#41 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/OVERVIEW#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-none.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dh.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/envpass.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/logintest.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/nchan.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/opensshd.init.in#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/pathnames.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.h#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/dynamic-forward.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/envpass.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/login-timeout.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/multiplex.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reexec.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/try-ciphers.sh#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/rijndael.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scard-opensc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scard.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#21 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-gss.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#15 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#16 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshlogin.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.h#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/ttymodes.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#15 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#37 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#6 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/moused#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/natd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/netif#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pf#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/savecore#7 integrate .. //depot/projects/trustedbsd/mac/etc/usbd.conf#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#33 integrate .. //depot/projects/trustedbsd/mac/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/games/ppt/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/games/primes/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbfd/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libopcodes/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1plus/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/libdiff/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libbib/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libdriver/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libgroff/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/rcs/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/libtxi/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/include/arpa/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/include/protocols/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.mk#2 integrate .. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libbsnmp/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/brk.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/mlock.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#18 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/open_disk.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libio/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_exit.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_find_thread.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#19 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#18 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/librpcsvc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libsmdb/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libsmutil/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libtelnet/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libxpg4/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/liby/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpgw/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#26 integrate .. //depot/projects/trustedbsd/mac/libexec/pt_chown/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/reloc.c#5 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#22 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#58 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/aps/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/help/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/msg/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/ns/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/oinit/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/sps/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/view/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/vm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#27 integrate .. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#27 integrate .. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#11 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/common/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dhcpctl/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/dst/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/minires/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/dhclient/omapip/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/destroy.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#6 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/recover.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/remove.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/gvinum/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#28 integrate .. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/pflogd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/rtsol/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssl/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/dict/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/IPv6/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/bind9/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/bufbio/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/devfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/diskperf/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/jail/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/kernmalloc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/kerntune/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/nqnfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/px/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/relengr/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/sysperf/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/05.sysman/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/06.Clang/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/13.rcs/rcs/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/16.lex/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/18.gprof/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/20.ipctut/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/21.ipc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/22.rpcgen/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/23.rpc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/24.xdr/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/25.xdrrfc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/26.rpcrfc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/27.nfsrpc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/28.cvs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/01.setup/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/02.config/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/05.fastfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/08.sendmailop/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/12.timed/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/04.csh/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/07.mail/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/10.exref/summary/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/11.vitut/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/summary/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/vi/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/13.viref/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/21.troff/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/share/examples/autofs/driver/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/stable-supfile#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#27 integrate .. //depot/projects/trustedbsd/mac/share/examples/ipfilter/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/v21/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/syscall/test/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/libvgl/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/pf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/ppi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/smbfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/smbfs/print/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/info/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#44 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/divert.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fd.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/mem.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_device.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ngatmbase.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#15 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#34 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/firewall.7#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#7 integrate .. //depot/projects/trustedbsd/mac/share/misc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#17 integrate .. //depot/projects/trustedbsd/mac/share/mk/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/sys.mk#15 integrate .. //depot/projects/trustedbsd/mac/share/security/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/sendmail/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/share/skel/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/snmp/mibs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/syscons/fonts/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/share/syscons/keymaps/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_trace.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/beastie.4th#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biospci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#56 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#108 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#39 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#30 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#25 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#28 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#67 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_output.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_thread.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_variables.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfereg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwcrom.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/iec13213.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/global.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdi.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfsmount.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#31 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_int.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.h#1 branch .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_inode.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_mount.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_subr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_asus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#38 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#48 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/db_trace.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/db_trace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sscdisk.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_bmap.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/iso.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_shell.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#63 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#441 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#42 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_xxx.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_unit.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#63 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#60 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#62 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#67 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#71 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#21 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#72 integrate .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/smbfs/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/if.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#27 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#9 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd_cd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_skreg.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#22 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_macio.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#138 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/buf.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/bufobj.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/sys/kernel.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#35 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#57 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#63 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#62 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#64 integrate .. //depot/projects/trustedbsd/mac/sys/sys/systm.h#26 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#68 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_inode.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/inode.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_bmap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#73 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#25 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_zeroidle.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#30 integrate .. //depot/projects/trustedbsd/mac/tools/diag/dumpvfscache/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/diag/localeck/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/fsx/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/gaithrstress/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/MdLoad/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/ia64_unaligned/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netatalk/simple_send/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/tcpconnect.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test1/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test2/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/p1003_1b/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/pipe/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/security/access/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/security/proc_to_proc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/socketpair/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/libxx/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/libyy/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls1/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls2/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/tools/test/malloc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/test/ppsapi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/aac/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/gdb_regofs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ministat/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/localfiles#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/netblast/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/netreceive/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/netsend/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/pirtool/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/raidtest/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/recoverdisk.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/syscall_timing/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#31 integrate .. //depot/projects/trustedbsd/mac/usr.bin/dirname/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/du/du.1#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/elf2aout/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lex/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/locate/bigram/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/locate/code/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.h#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#20 integrate .. //depot/projects/trustedbsd/mac/usr.bin/mktemp/mktemp.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/newgrp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/unexpand/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/uudecode/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vgrind/RETEST/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/libamu/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bootparamd/callbootd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/config.y#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/lang.l#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/crunch/examples/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_smail/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ctm/mkCTM/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.8#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/SMM.doc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/common/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/testrsrr/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libntp/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libparse/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdate/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpq/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptime/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptrace/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/sntp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/demo/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/kbdio/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpc.ypupdated/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#19 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/vnconfig/Makefile#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#50 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -502,7 +502,7 @@ .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} -KERNWARN= yes +KERNWARN= .else KERNCONF?= GENERIC .endif ==== //depot/projects/trustedbsd/mac/UPDATING#41 (text+ko) ==== @@ -23,6 +23,11 @@ developers choose to disable these features on build machines to maximize performance. +20041022: + The size of struct tcpcb has changed. You have to recompile + userland programs that read kmem for tcp sockets directly + (netstat, sockstat, etc.) + 20041018: A major sweep over the tty drivers to elimnate approx 3100 lines of copy&pasted code have been performed. As a part of @@ -1951,4 +1956,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ +$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ ==== //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ .\" -.Dd October 4, 2004 +.Dd October 28, 2004 .Dt RM 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd remove directory entries .Sh SYNOPSIS .Nm -.Op Fl dfiPRrvW +.Op Fl dfiIPRrvW .Ar .Nm unlink .Ar file @@ -76,6 +76,12 @@ option overrides any previous .Fl f options. +.It Fl I +Request confirmation once if more than three files are being removed or if a +directory is being recursively removed. +This is a far less intrusive option than +.Fl i +yet provides almost the same level of protection against mistakes. .It Fl P Overwrite regular files before deleting them. Files are overwritten three times, first with the byte pattern 0xff, ==== //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); +__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); #include #include @@ -58,9 +58,11 @@ #include int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; +int rflag, Iflag; uid_t uid; int check(char *, char *, struct stat *); +int check2(char **); void checkdot(char **); void checkslash(char **); void rm_file(char **); @@ -78,7 +80,7 @@ int main(int argc, char *argv[]) { - int ch, rflag; + int ch; char *p; /* @@ -102,7 +104,7 @@ } Pflag = rflag = 0; - while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) + while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) switch(ch) { case 'd': dflag = 1; @@ -115,6 +117,9 @@ fflag = 0; iflag = 1; break; + case 'I': + Iflag = 1; + break; case 'P': Pflag = 1; break; @@ -148,6 +153,10 @@ if (*argv) { stdin_ok = isatty(STDIN_FILENO); + if (Iflag) { + if (check2(argv) == 0) + exit (1); + } if (rflag) rm_tree(argv); else @@ -489,6 +498,56 @@ } } +int +check2(char **argv) +{ + struct stat st; + int first; + int ch; + int fcount = 0; + int dcount = 0; + int i; + const char *dname = NULL; + + for (i = 0; argv[i]; ++i) { + if (lstat(argv[i], &st) == 0) { + if (S_ISDIR(st.st_mode)) { + ++dcount; + dname = argv[i]; /* only used if 1 dir */ + } else { + ++fcount; + } + } + } + first = 0; + while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { + if (dcount && rflag) { + fprintf(stderr, "recursively remove"); + if (dcount == 1) + fprintf(stderr, " %s", dname); + else + fprintf(stderr, " %d dirs", dcount); + if (fcount == 1) + fprintf(stderr, " and 1 file"); + else if (fcount > 1) + fprintf(stderr, " and %d files", fcount); + } else if (dcount + fcount > 3) { + fprintf(stderr, "remove %d files", dcount + fcount); + } else { + return(1); + } + fprintf(stderr, "? "); + fflush(stderr); + + first = ch = getchar(); + while (ch != '\n' && ch != EOF) + ch = getchar(); + if (ch == EOF) + break; + } + return (first == 'y' || first == 'Y'); +} + #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) void checkdot(char **argv) @@ -519,7 +578,7 @@ { (void)fprintf(stderr, "%s\n%s\n", - "usage: rm [-f | -i] [-dPRrvW] file ...", + "usage: rm [-f | -i] [-dIPRrvW] file ...", " unlink file"); exit(EX_USAGE); } ==== //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -947,12 +947,16 @@ .Ic set built-in command can also be used to set or reset them. .Ss Special Parameters -A special parameter is a parameter denoted by one of the following -special characters. -The value of the parameter is listed -next to its character. +A special parameter is a parameter denoted by a special one-character +name. +The special parameters recognized by the +.Nm +shell of +.Fx +are shown in the following list, exactly as they would appear in input +typed by the user or in the source of a shell script. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 3 13:37:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D3DA16A4D0; Wed, 3 Nov 2004 13:37:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 54AB816A4CE for ; Wed, 3 Nov 2004 13:37:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 065DC43D46 for ; Wed, 3 Nov 2004 13:37:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA3Db1K2010991 for ; Wed, 3 Nov 2004 13:37:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA3Db0Rw010988 for perforce@freebsd.org; Wed, 3 Nov 2004 13:37:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 3 Nov 2004 13:37:00 GMT Message-Id: <200411031337.iA3Db0Rw010988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2004 13:37:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64145 Change 64145 by rwatson@rwatson_zoo on 2004/11/03 13:36:26 Integrate netperf_socket: - audit system call stubs added - geom_vfs - specfs goes away - bufobj turns up - file systems talk directly to geom - hptmv driver - pf locking fixes - more aicisms - if_bfe locking fixes - various and sundry other and minor changes - KTR tracing for geom - KTR tracing for busdma - more vm locking and optimization - MAC locking fixes for early boot - locking fixen for dynamically loaded protocols - T/TCP gone! - mac_bsdextended API leakage improvements loop back: - further /dev/random optimization and cleanup - accept lock fix for soaccept() - getsock() optimizations to avoid lots of socket reference count mutex operations - ABI hardening for ifnet: if_handoff() a function, spare fields in struct ifnet. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#9 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#12 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#19 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/netperf_socket/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#6 integrate .. //depot/projects/netperf_socket/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/arc/lib/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/ficl/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#8 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.arm#4 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#44 integrate .. //depot/projects/netperf_socket/sys/conf/files#55 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#29 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#11 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#17 integrate .. //depot/projects/netperf_socket/sys/conf/options#32 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#15 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_output.c#4 integrate .. //depot/projects/netperf_socket/sys/ddb/db_ps.c#6 integrate .. //depot/projects/netperf_socket/sys/ddb/db_thread.c#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_variables.c#3 integrate .. //depot/projects/netperf_socket/sys/ddb/ddb.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwcrom.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/iec13213.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/global.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/netperf_socket/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#23 integrate .. //depot/projects/netperf_socket/sys/dev/patm/genrtab/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scd.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#27 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdivar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/zs/zs.c#12 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#5 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#10 delete .. //depot/projects/netperf_socket/sys/fs/udf/udf.h#4 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom.h#8 integrate .. //depot/projects/netperf_socket/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/geom_event.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_int.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/geom_io.c#11 integrate .. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_slice.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/geom_subr.c#10 integrate .. //depot/projects/netperf_socket/sys/geom/geom_vfs.c#1 branch .. //depot/projects/netperf_socket/sys/geom/geom_vfs.h#1 branch .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_var.h#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_bmap.c#3 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#30 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#30 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#9 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/sscdisk.c#4 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#5 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_bmap.c#3 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.c#5 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.h#4 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#4 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/kern_environment.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#21 integrate .. //depot/projects/netperf_socket/sys/kern/kern_intr.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_ktr.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mac.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_physio.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#22 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#23 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_trap.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/subr_unit.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#12 integrate .. //depot/projects/netperf_socket/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#42 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#24 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#25 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/vnode_if.src#4 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#22 integrate .. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahd/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/ipdivert/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#8 integrate .. //depot/projects/netperf_socket/sys/modules/smbfs/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/if.c#23 integrate .. //depot/projects/netperf_socket/sys/net/if_tap.c#11 integrate .. //depot/projects/netperf_socket/sys/net/if_tun.c#12 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#21 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#12 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#12 integrate .. //depot/projects/netperf_socket/sys/netinet/in.h#7 integrate .. //depot/projects/netperf_socket/sys/netinet/in_proto.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/in_var.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_divert.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw_pfil.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp.h#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_seq.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#23 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#8 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#11 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#6 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#12 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#15 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd.c#5 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/wd_cd.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#9 integrate .. //depot/projects/netperf_socket/sys/pci/agp_i810.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#13 integrate .. //depot/projects/netperf_socket/sys/pci/if_skreg.h#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_vr.c#16 integrate .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#12 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/elf.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate .. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#8 integrate .. //depot/projects/netperf_socket/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/netperf_socket/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_trace.c#5 integrate .. //depot/projects/netperf_socket/sys/sys/buf.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/bufobj.h#1 branch .. //depot/projects/netperf_socket/sys/sys/conf.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/kernel.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/ktr.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mac_policy.h#6 integrate .. //depot/projects/netperf_socket/sys/sys/mount.h#14 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#29 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#12 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#12 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#12 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#12 integrate .. //depot/projects/netperf_socket/sys/sys/vnode.h#12 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#8 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#11 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#10 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufsmount.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#10 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#15 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#11 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#14 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#16 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#9 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pager.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#7 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -221,7 +221,7 @@ last_ipl = ~0L; tf = NULL; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) ==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.42 2004/10/18 21:51:24 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $"); #include #include @@ -107,7 +107,7 @@ tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) == 0) { tp->t_state |= TS_CARR_ON; - ttyconsmode(tp, 0); + ttyconsolemode(tp, 0); ttsetwater(tp); setuptimeout = 1; ==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#12 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ machine alpha cpu EV4 @@ -66,7 +66,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -381,7 +381,7 @@ first = TRUE; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.10 2004/11/01 22:15:13 jhb Exp $ */ /* @@ -313,7 +313,7 @@ else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) if (*isrc != NULL) db_dump_ithread((*isrc)->is_ithread, verbose); ==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#19 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.621 2004/09/24 01:11:11 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.622 2004/10/28 12:16:03 simokawa Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -823,6 +823,7 @@ char *cp; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; + quad_t dcons_addr, dcons_size; bzero(physmap, sizeof(physmap)); basemem = 0; @@ -968,6 +969,13 @@ pte = CMAP1; /* + * Get dcons buffer address + */ + if (getenv_quad("dcons.addr", &dcons_addr) == 0 || + getenv_quad("dcons.size", &dcons_size) == 0) + dcons_addr = 0; + + /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. */ @@ -987,6 +995,14 @@ if (pa >= 0x100000 && pa < first) continue; + /* + * block out dcons buffer + */ + if (dcons_addr > 0 + && pa >= trunc_page(dcons_addr) + && pa < dcons_addr + dcons_size) + continue; + page_bad = FALSE; /* ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#19 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $ machine amd64 cpu HAMMER @@ -48,7 +48,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues ==== //depot/projects/netperf_socket/sys/amd64/include/vmparam.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.44 2003/12/07 04:51:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $ */ @@ -57,7 +57,7 @@ #define DFLDSIZ (128UL*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (8192UL*1024*1024) /* max data size */ +#define MAXDSIZ (32768UL*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (8UL*1024*1024) /* initial stack size limit */ ==== //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.112 2004/10/31 15:50:32 des Exp $"); #include "opt_cpu.h" @@ -117,7 +117,7 @@ * via some other means. If we have, bail since otherwise * we're going to end up duplicating it. */ - if ((pci_devclass = devclass_find("pci")) && + if ((pci_devclass = devclass_find("pci")) && devclass_get_device(pci_devclass, 0)) return; @@ -136,7 +136,7 @@ */ if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; - if ((hdrtype & PCIM_MFDEV) && + if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) pcifunchigh = PCI_FUNCMAX; else @@ -266,10 +266,9 @@ SYSCTL_DECL(_hw_pci); -static int legacy_host_mem_start = 0x80000000; -/* No TUNABLE_ULONG :-( */ -TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); -SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, +static unsigned long legacy_host_mem_start = 0x80000000; +TUNABLE_ULONG("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &legacy_host_mem_start, 0x80000000, "Limit the host bridge memory to being above this address. Must be\n\ set at boot via a tunable."); @@ -394,12 +393,12 @@ /* * Install placeholder to claim the resources owned by the - * PCI bus interface. This could be used to extract the + * PCI bus interface. This could be used to extract the * config space registers in the extreme case where the PnP * ID is available and the PCI BIOS isn't, but for now we just * eat the PnP ID and do nothing else. * - * XXX we should silence this probe, as it will generally confuse + * XXX we should silence this probe, as it will generally confuse * people. */ static struct isa_pnp_id pcibus_pnp_ids[] = { @@ -411,7 +410,7 @@ pcibus_pnp_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0) device_quiet(dev); return(result); ==== //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.4 2004/09/23 21:57:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.5 2004/10/21 11:59:33 cognet Exp $"); /* * MacPPC bus dma support routines @@ -687,7 +687,7 @@ int resid; struct iovec *iov; - if (op == BUS_DMASYNC_POSTREAD) + if (op == BUS_DMASYNC_POSTWRITE) return; if (map->flags & DMAMAP_COHERENT) return; ==== //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#6 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -138,7 +138,7 @@ scp_offset = -(get_pc_str_offset() >> 2); quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && frame != NULL && !quit) { db_addr_t scp; u_int32_t savecode; ==== //depot/projects/netperf_socket/sys/arm/conf/IQ31244#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.2 2004/10/01 16:51:37 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.3 2004/11/02 20:57:19 andre Exp $ machine arm ident IQ31244 @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/netperf_socket/sys/arm/conf/SIMICS#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.5 2004/11/02 20:57:19 andre Exp $ machine arm ident SIMICS @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI #options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.14 2004/02/11 22:01:17 ru Exp $ +# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $ LIB= alpha -INTERNALLIB= true +INTERNALLIB= #CFLAGS+= -DDISK_DEBUG ==== //depot/projects/netperf_socket/sys/boot/arc/lib/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/arc/lib/Makefile,v 1.9 2002/05/13 10:53:24 ru Exp $ +# $FreeBSD: src/sys/boot/arc/lib/Makefile,v 1.10 2004/10/24 15:32:49 ru Exp $ LIB= arc -INTERNALLIB= true +INTERNALLIB= CFLAGS+= -ffreestanding .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} ==== //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#4 (text+ko) ==== @@ -1,17 +1,18 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.19 2004/08/29 00:48:41 iedowse Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.21 2004/10/24 12:32:41 ru Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -SRCS+= load_elf32.c load_elf32_obj.c load_elf64.c load_elf64_obj.c -SRCS+= reloc_elf32.c reloc_elf64.c -.endif -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c +SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c +.elif ${MACHINE} == "pc98" +SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c +.elif ${MACHINE_ARCH} == "powerpc" SRCS+= load_elf32.c reloc_elf32.c -.endif -.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "alpha" +.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || \ + ${MACHINE_ARCH} == "alpha" SRCS+= load_elf64.c reloc_elf64.c .endif ==== //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.14 2004/02/13 04:43:41 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} LIB= efi -INTERNALLIB= true +INTERNALLIB= SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S ==== //depot/projects/netperf_socket/sys/boot/ficl/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.39 2004/08/23 16:25:07 obrien Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.40 2004/10/24 15:32:49 ru Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/} BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ @@ -29,7 +29,7 @@ .include .else LIB= ficl -INTERNALLIB= yes +INTERNALLIB= .include .endif ==== //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#2 (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/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $ marker task-beastie.4th @@ -40,6 +40,7 @@ variable bootkey variable bootacpikey +variable bootusbkey variable bootsafekey variable bootverbosekey variable bootsinglekey @@ -159,6 +160,11 @@ printmenuitem ." Boot FreeBSD in single user mode" bootsinglekey ! printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey ! printmenuitem ." Escape to loader prompt" escapekey ! + s" arch-i386" environment? if + printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey ! + else + -2 bootacpikey ! + then printmenuitem ." Reboot" rebootkey ! menuX @ 20 at-xy ." Select option, [Enter] for default" @@ -223,6 +229,10 @@ then 0 boot then + dup bootusbkey @ = if + s" 0x1" s" hint.atkbd.0.flags" setenv + 0 boot + then dup bootsafekey @ = if s" arch-i386" environment? if s" acpi_load" unsetenv ==== //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.36 2004/02/07 23:30:45 ru Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.37 2004/10/24 15:32:49 ru Exp $ # LIB= i386 -INTERNALLIB= true +INTERNALLIB= SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ ==== //depot/projects/netperf_socket/sys/boot/i386/libi386/biospci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.4 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.5 2004/10/22 14:56:23 simokawa Exp $"); /* * PnP enumerator using the PCI BIOS. @@ -112,6 +112,10 @@ {-1, NULL} }; +static struct pci_progif progif_firewire[] = { + {0x10, "OHCI"}, + {-1, NULL} +}; struct pci_subclass { @@ -160,7 +164,7 @@ }; static struct pci_subclass subclass_serial[] = { - {0x0, "Firewire", progif_null}, + {0x0, "FireWire", progif_firewire}, {0x1, "ACCESS.bus", progif_null}, {0x2, "SSA", progif_null}, {0x3, "USB", progif_null}, @@ -199,7 +203,8 @@ static void biospci_enumerate(void) { - int device_index, locator, devid; + int device_index, err; + uint32_t locator, devid; struct pci_class *pc; struct pci_subclass *psc; struct pci_progif *ppi; @@ -231,34 +236,19 @@ /* Scan for matches */ for (device_index = 0; ; device_index++) { - /* Look for a match */ - v86.ctl = V86_FLAGS; - v86.addr = 0x1a; - v86.eax = 0xb103; - v86.ecx = (pc->pc_class << 16) + (psc->ps_subclass << 8) + ppi->pi_code; - v86.esi = device_index; - v86int(); - /* error/end of matches */ - if ((v86.efl & 1) || (v86.eax & 0xff00)) + err = biospci_find_devclass((pc->pc_class << 16) + + (psc->ps_subclass << 8) + ppi->pi_code, + device_index, &locator); + if (err != 0) break; - /* Got something */ - locator = v86.ebx; - /* Read the device identifier from the nominated device */ - v86.ctl = V86_FLAGS; - v86.addr = 0x1a; - v86.eax = 0xb10a; - v86.ebx = locator; - v86.edi = 0x0; - v86int(); - /* error */ - if ((v86.efl & 1) || (v86.eax & 0xff00)) + err = biospci_read_config(locator, 0, 2, &devid); + if (err != 0) break; /* We have the device ID, create a PnP object and save everything */ - devid = v86.ecx; biospci_addinfo(devid, pc, psc, ppi); } } @@ -292,3 +282,61 @@ pnp_addident(pi, desc); pnp_addinfo(pi); } + +int +biospci_find_devclass(uint32_t class, int index, uint32_t *locator) +{ + v86.ctl = V86_FLAGS; + v86.addr = 0x1a; + v86.eax = 0xb103; + v86.ecx = class; + v86.esi = index; + v86int(); + + /* error */ + if ((v86.efl & 1) || (v86.eax & 0xff00)) + return (-1); + + *locator = v86.ebx; + return (0); +} +/* + * Configuration space access methods. + * width = 0(byte), 1(word) or 2(dword). + */ +int +biospci_write_config(uint32_t locator, int offset, int width, uint32_t val) +{ + v86.ctl = V86_FLAGS; + v86.addr = 0x1a; + v86.eax = 0xb10b + width; + v86.ebx = locator; + v86.edi = offset; + v86.ecx = val; + v86int(); + + /* error */ + if ((v86.efl & 1) || (v86.eax & 0xff00)) + return (-1); + + return(0); +} + +int +biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val) +{ + v86.ctl = V86_FLAGS; + v86.addr = 0x1a; + v86.eax = 0xb108 + width; + v86.ebx = locator; + v86.edi = offset; + v86int(); + + /* error */ + if ((v86.efl & 1) || (v86.eax & 0xff00)) + return (-1); + + *val = v86.ecx; + return (0); +} + ==== //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#3 (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/boot/i386/libi386/libi386.h,v 1.18 2004/06/16 18:21:22 phk Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.19 2004/10/22 14:56:23 simokawa Exp $ */ @@ -93,6 +93,10 @@ extern u_int32_t bios_extmem; /* extended memory in bytes */ extern vm_offset_t memtop; +int biospci_find_devclass(uint32_t class, int index); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 3 18:34:19 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B6FC16A4D3; Wed, 3 Nov 2004 18:34:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4532716A4CE; Wed, 3 Nov 2004 18:34:19 +0000 (GMT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4791043D2F; Wed, 3 Nov 2004 18:34:18 +0000 (GMT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.13.1/8.13.1) with ESMTP id iA3IXQYm076332; Wed, 3 Nov 2004 13:33:26 -0500 (EST) (envelope-from arr@watson.org) Received: from localhost (arr@localhost)iA3IXQ1C076329; Wed, 3 Nov 2004 13:33:26 -0500 (EST) (envelope-from arr@watson.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Wed, 3 Nov 2004 13:33:26 -0500 (EST) From: "Andrew R. Reiter" To: Robert Watson In-Reply-To: <200411031306.iA3D6H6e010062@repoman.freebsd.org> Message-ID: <20041103133234.O75648@fledge.watson.org> References: <200411031306.iA3D6H6e010062@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 64142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2004 18:34:20 -0000 D'oh,.. if you catch me doing an integ of tbsd related branches, ping me to update this tree too if you want it done. Sorry I did not offer yesterday. Cheers, Andrew On Wed, 3 Nov 2004, Robert Watson wrote: :http://perforce.freebsd.org/chv.cgi?CH=64142 : :Change 64142 by rwatson@rwatson_tislabs on 2004/11/03 13:05:19 : : Integ of trustedbsd mac branch: : - struct tcpcb has changed size : - rm(1) now has a -I option : - openssh update : - various rc.d startup script changes : - libphtread fixes : - amd64 fixes by peter : - placeholders for audit syscalls : - some minor ddb beautification : - bfe device locking fixes : - usb ehci enhancements : - many fs changes related to the vfs / geom changes by phk : - HighPoint RocketRAID 182x support default in config : - Adding tracing to bus dma : - VM hacking by alc : :Affected files ... : :.. //depot/projects/trustedbsd/mac/Makefile.inc1#50 integrate :.. //depot/projects/trustedbsd/mac/UPDATING#41 integrate :.. //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 integrate :.. //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 integrate :.. //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/OVERVIEW#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/README#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-none.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#12 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#12 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.h#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.h#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/envpass.sh#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/logintest.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.h#2 delete :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/nchan.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.c#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/opensshd.init.in#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/pathnames.h#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.h#4 delete :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/dynamic-forward.sh#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/envpass.sh#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/login-timeout.sh#2 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/multiplex.sh#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reexec.sh#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp.sh#1 branch :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/try-ciphers.sh#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/rijndael.c#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/scard-opensc.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/scard.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#12 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#21 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#8 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#12 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-gss.h#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#6 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh1.h#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#15 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#7 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#11 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#13 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#16 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#13 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshlogin.c#10 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#9 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.h#3 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.c#5 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.h#4 delete :.. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.h#3 delete :.. //depot/projects/trustedbsd/mac/crypto/openssh/ttymodes.h#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/version.c#4 integrate :.. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#15 integrate :.. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#37 integrate :.. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/etc/namedb/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/etc/network.subr#6 integrate :.. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#20 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#8 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/moused#6 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/natd#3 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/netif#7 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/pf#4 integrate :.. //depot/projects/trustedbsd/mac/etc/rc.d/savecore#7 integrate :.. //depot/projects/trustedbsd/mac/etc/usbd.conf#6 integrate :.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#33 integrate :.. //depot/projects/trustedbsd/mac/games/fortune/unstr/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/games/ppt/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/games/primes/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/Makefile.inc#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#12 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbfd/Makefile#14 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libopcodes/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1plus/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#12 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/libdiff/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libbib/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libdriver/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libgroff/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/lib/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/rcs/lib/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/libtxi/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/include/arpa/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/include/protocols/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/lib/bind/config.mk#2 integrate :.. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libbsnmp/Makefile.inc#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/Makefile#16 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/Makefile.inc#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/Makefile.inc#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/brk.S#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/ia64/Makefile.inc#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Makefile.inc#3 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/mlock.2#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#7 integrate :.. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#13 integrate :.. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#18 integrate :.. //depot/projects/trustedbsd/mac/lib/libdisk/open_disk.c#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libio/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#12 integrate :.. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#23 integrate :.. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#8 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#10 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#11 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_exit.c#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_find_thread.c#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#19 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#11 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#18 integrate :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#14 integrate :.. //depot/projects/trustedbsd/mac/lib/librpcsvc/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/lib/libsmdb/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libsmutil/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#13 integrate :.. //depot/projects/trustedbsd/mac/lib/libtelnet/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/lib/libxpg4/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/lib/liby/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpgw/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#26 integrate :.. //depot/projects/trustedbsd/mac/libexec/pt_chown/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#10 integrate :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/reloc.c#5 integrate :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#22 integrate :.. //depot/projects/trustedbsd/mac/release/Makefile#58 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#5 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/aps/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/help/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/msg/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/ns/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/oinit/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/sps/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/view/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/vm/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#27 integrate :.. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/sbin/Makefile#27 integrate :.. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#11 integrate :.. //depot/projects/trustedbsd/mac/sbin/dhclient/common/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/dhclient/dhcpctl/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/sbin/dhclient/dst/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/dhclient/minires/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/dhclient/omapip/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#10 integrate :.. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#2 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#7 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#7 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/destroy.c#4 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#4 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#8 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#6 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#8 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/mkdisk.sh#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/recover.c#6 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/remove.c#2 integrate :.. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#8 integrate :.. //depot/projects/trustedbsd/mac/sbin/growfs/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/sbin/gvinum/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#28 integrate :.. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/pflogd/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sbin/rtsol/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#21 integrate :.. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#13 integrate :.. //depot/projects/trustedbsd/mac/secure/lib/libssl/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#13 integrate :.. //depot/projects/trustedbsd/mac/share/dict/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/IPv6/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/bind9/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/bufbio/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/devfs/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/diskperf/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/jail/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/kernmalloc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/kerntune/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/nqnfs/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/px/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/relengr/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/sysperf/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/05.sysman/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/06.Clang/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/13.rcs/rcs/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/16.lex/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/18.gprof/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/20.ipctut/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/21.ipc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/22.rpcgen/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/23.rpc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/24.xdr/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/25.xdrrfc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/26.rpcrfc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/27.nfsrpc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/psd/28.cvs/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/smm/01.setup/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/smm/02.config/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/smm/05.fastfs/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/smm/08.sendmailop/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/smm/12.timed/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/04.csh/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/07.mail/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/10.exref/summary/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/11.vitut/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/summary/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/vi/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/13.viref/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/doc/usd/21.troff/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/examples/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/share/examples/autofs/driver/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/share/examples/cvsup/stable-supfile#5 integrate :.. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#27 integrate :.. //depot/projects/trustedbsd/mac/share/examples/ipfilter/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/examples/isdn/v21/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/examples/kld/syscall/test/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/share/examples/libvgl/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/examples/pf/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/share/examples/ppi/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/share/examples/smbfs/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/examples/smbfs/print/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/share/info/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#44 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#2 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/divert.4#5 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/fd.4#2 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#10 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/mem.4#7 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/ng_device.4#3 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/ngatmbase.4#1 branch :.. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#15 integrate :.. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#3 integrate :.. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#34 integrate :.. //depot/projects/trustedbsd/mac/share/man/man7/firewall.7#9 integrate :.. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#7 integrate :.. //depot/projects/trustedbsd/mac/share/misc/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#17 integrate :.. //depot/projects/trustedbsd/mac/share/mk/Makefile#11 integrate :.. //depot/projects/trustedbsd/mac/share/mk/sys.mk#15 integrate :.. //depot/projects/trustedbsd/mac/share/security/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/share/sendmail/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/share/skel/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/share/snmp/mibs/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/share/syscons/fonts/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/share/syscons/keymaps/Makefile#12 integrate :.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_trace.c#9 integrate :.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#6 integrate :.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#3 integrate :.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#14 integrate :.. //depot/projects/trustedbsd/mac/sys/amd64/include/vmparam.h#7 integrate :.. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#9 integrate :.. //depot/projects/trustedbsd/mac/sys/arm/arm/db_trace.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/common/Makefile.inc#9 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#10 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/forth/beastie.4th#6 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#10 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biospci.c#4 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#5 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/conf.c#3 integrate :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/main.c#4 integrate :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#7 integrate :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#7 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/Makefile.arm#2 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#13 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#56 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/files#108 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/files.i386#39 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#30 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#25 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#28 integrate :.. //depot/projects/trustedbsd/mac/sys/conf/options#67 integrate :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/access601.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/array.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/atapi.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/command.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/gui_lib.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/hptproc.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/ioctl.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvSata.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/raid5n.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/readme.txt#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/vdevice.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#5 integrate :.. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/sys/ddb/db_output.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#21 integrate :.. //depot/projects/trustedbsd/mac/sys/ddb/db_thread.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/ddb/db_variables.c#5 integrate :.. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#10 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#6 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfereg.h#4 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#33 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#21 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons.h#4 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_os.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#3 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwcrom.c#8 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/firewire/iec13213.h#6 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/entry.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/global.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/hptintf.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mv.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mvOs.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/osbsd.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#13 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#36 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/patm/genrtab/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#31 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#11 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/apcdmareg.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/usb/ehcivar.h#3 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdi.c#10 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#27 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#35 integrate :.. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#18 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#21 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#51 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs.h#6 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#19 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#19 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#17 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#21 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfsmount.h#9 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#18 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf.h#6 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#24 integrate :.. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#19 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom.h#31 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#13 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#32 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#17 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom_int.h#11 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#29 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_plex.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_var.h#2 integrate :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_bmap.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_inode.c#12 integrate :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_mount.h#4 integrate :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_subr.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#20 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_asus.c#3 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#38 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#48 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#19 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/i386/db_trace.c#14 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#5 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#43 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#32 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#43 integrate :.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#24 integrate :.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/db_trace.c#11 integrate :.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sscdisk.c#10 integrate :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_bmap.c#5 integrate :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.c#10 integrate :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.h#6 integrate :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#19 integrate :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/iso.h#7 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/imgact_shell.c#10 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#63 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#22 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#12 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#39 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#30 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_ktr.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#441 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#13 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#42 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#28 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/kern_xxx.c#10 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#15 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#35 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/subr_unit.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#63 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#60 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#12 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#12 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#62 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#43 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#44 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#37 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#39 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#24 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#28 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#32 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#67 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#71 integrate :.. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#21 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/Makefile#72 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/hptmv/Makefile#1 branch :.. //depot/projects/trustedbsd/mac/sys/modules/ipfw/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/netgraph/Makefile#10 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/smbfs/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/audiocs/Makefile#1 branch :.. //depot/projects/trustedbsd/mac/sys/net/if.c#39 integrate :.. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#20 integrate :.. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#28 integrate :.. //depot/projects/trustedbsd/mac/sys/net/if_var.h#27 integrate :.. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/netflow.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#9 integrate :.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#7 integrate :.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#25 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#25 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#29 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#26 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#2 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#21 integrate :.. //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#6 integrate :.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#6 integrate :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#21 integrate :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#27 integrate :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsnode.h#8 integrate :.. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#9 integrate :.. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#40 integrate :.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd.c#14 integrate :.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd_cd.c#11 integrate :.. //depot/projects/trustedbsd/mac/sys/pci/agp.c#19 integrate :.. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#23 integrate :.. //depot/projects/trustedbsd/mac/sys/pci/if_skreg.h#7 integrate :.. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#27 integrate :.. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#22 integrate :.. //depot/projects/trustedbsd/mac/sys/powerpc/include/elf.h#4 integrate :.. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_kauai.c#4 integrate :.. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_macio.c#11 integrate :.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/db_trace.c#5 integrate :.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#138 integrate :.. //depot/projects/trustedbsd/mac/sys/sparc64/conf/NOTES#6 integrate :.. //depot/projects/trustedbsd/mac/sys/sparc64/ebus/ebusreg.h#1 branch :.. //depot/projects/trustedbsd/mac/sys/sparc64/isa/isa_dma.c#1 branch :.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#12 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/buf.h#23 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/bufobj.h#2 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/conf.h#22 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/kernel.h#19 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#11 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/mount.h#35 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/proc.h#57 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#63 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#62 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#64 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/systm.h#26 integrate :.. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#68 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#28 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#13 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_inode.c#18 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#11 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#30 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#26 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#47 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#32 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/inode.h#16 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_bmap.c#12 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#73 integrate :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#10 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#28 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#29 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#18 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#33 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#24 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#32 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#41 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#25 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#27 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#16 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vm_zeroidle.c#11 integrate :.. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#30 integrate :.. //depot/projects/trustedbsd/mac/tools/diag/dumpvfscache/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/tools/diag/localeck/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/fsx/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/gaithrstress/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/geom/MdLoad/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/ia64_unaligned/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/netatalk/simple_send/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/tcpconnect.c#3 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test1/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test2/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/p1003_1b/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/pipe/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/security/access/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/security/proc_to_proc/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/socketpair/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/tls/libxx/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/tls/libyy/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls1/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls2/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#13 integrate :.. //depot/projects/trustedbsd/mac/tools/test/malloc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/tools/test/ppsapi/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/aac/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/gdb_regofs/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/ministat/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/localfiles#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#4 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netblast/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netreceive/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netsend/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/pirtool/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/raidtest/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/recoverdisk.c#2 integrate :.. //depot/projects/trustedbsd/mac/tools/tools/syscall_timing/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#31 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/dirname/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/du/du.1#6 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/elf2aout/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/lex/lib/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/locate/bigram/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/locate/code/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#9 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#13 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/make/job.h#8 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#20 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/mktemp/mktemp.1#5 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#7 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/newgrp/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/truss/Makefile#9 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/unexpand/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/uudecode/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/usr.bin/vgrind/RETEST/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/amd/libamu/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/bootparamd/callbootd/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/config/config.y#7 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/config/lang.l#7 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/cron/lib/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/crunch/examples/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_smail/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/mkCTM/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.8#10 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.c#10 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/SMM.doc/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/common/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/testrsrr/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libntp/Makefile#5 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libparse/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpd/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdate/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpq/Makefile#4 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptime/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptrace/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/sntp/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/demo/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/kbdio/Makefile#2 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/Makefile#6 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/ppp/Makefile#8 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/rpc.ypupdated/Makefile#3 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#19 integrate :.. //depot/projects/trustedbsd/mac/usr.sbin/vnconfig/Makefile#2 integrate : :Differences ... : :==== //depot/projects/trustedbsd/mac/Makefile.inc1#50 (text+ko) ==== : :@@ -1,5 +1,5 @@ : # :-# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ :+# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ : # : # Make command line options: : # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically :@@ -502,7 +502,7 @@ : : .if !defined(KERNCONF) && defined(KERNEL) : KERNCONF= ${KERNEL} :-KERNWARN= yes :+KERNWARN= : .else : KERNCONF?= GENERIC : .endif : :==== //depot/projects/trustedbsd/mac/UPDATING#41 (text+ko) ==== : :@@ -23,6 +23,11 @@ : developers choose to disable these features on build machines : to maximize performance. : :+20041022: :+ The size of struct tcpcb has changed. You have to recompile :+ userland programs that read kmem for tcp sockets directly :+ (netstat, sockstat, etc.) :+ : 20041018: : A major sweep over the tty drivers to elimnate approx 3100 : lines of copy&pasted code have been performed. As a part of :@@ -1951,4 +1956,4 @@ : Contact Warner Losh if you have any questions about your use of : this document. : :-$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ :+$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ : :==== //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 (text+ko) ==== : :@@ -29,9 +29,9 @@ : .\" SUCH DAMAGE. : .\" : .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 :-.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ :+.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ : .\" :-.Dd October 4, 2004 :+.Dd October 28, 2004 : .Dt RM 1 : .Os : .Sh NAME :@@ -40,7 +40,7 @@ : .Nd remove directory entries : .Sh SYNOPSIS : .Nm :-.Op Fl dfiPRrvW :+.Op Fl dfiIPRrvW : .Ar : .Nm unlink : .Ar file :@@ -76,6 +76,12 @@ : option overrides any previous : .Fl f : options. :+.It Fl I :+Request confirmation once if more than three files are being removed or if a :+directory is being recursively removed. :+This is a far less intrusive option than :+.Fl i :+yet provides almost the same level of protection against mistakes. : .It Fl P : Overwrite regular files before deleting them. : Files are overwritten three times, first with the byte pattern 0xff, : :==== //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 (text+ko) ==== : :@@ -39,7 +39,7 @@ : #endif /* not lint */ : #endif : #include :-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); :+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); : : #include : #include :@@ -58,9 +58,11 @@ : #include : : int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; :+int rflag, Iflag; : uid_t uid; : : int check(char *, char *, struct stat *); :+int check2(char **); : void checkdot(char **); : void checkslash(char **); : void rm_file(char **); :@@ -78,7 +80,7 @@ : int : main(int argc, char *argv[]) : { :- int ch, rflag; :+ int ch; : char *p; : : /* :@@ -102,7 +104,7 @@ : } : : Pflag = rflag = 0; :- while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) :+ while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) : switch(ch) { : case 'd': : dflag = 1; :@@ -115,6 +117,9 @@ : fflag = 0; : iflag = 1; : break; :+ case 'I': :+ Iflag = 1; :+ break; : case 'P': : Pflag = 1; : break; :@@ -148,6 +153,10 @@ : if (*argv) { : stdin_ok = isatty(STDIN_FILENO); : :+ if (Iflag) { :+ if (check2(argv) == 0) :+ exit (1); :+ } : if (rflag) : rm_tree(argv); : else :@@ -489,6 +498,56 @@ : } : } : :+int :+check2(char **argv) :+{ :+ struct stat st; :+ int first; :+ int ch; :+ int fcount = 0; :+ int dcount = 0; :+ int i; :+ const char *dname = NULL; :+ :+ for (i = 0; argv[i]; ++i) { :+ if (lstat(argv[i], &st) == 0) { :+ if (S_ISDIR(st.st_mode)) { :+ ++dcount; :+ dname = argv[i]; /* only used if 1 dir */ :+ } else { :+ ++fcount; :+ } :+ } :+ } :+ first = 0; :+ while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { :+ if (dcount && rflag) { :+ fprintf(stderr, "recursively remove"); :+ if (dcount == 1) :+ fprintf(stderr, " %s", dname); :+ else :+ fprintf(stderr, " %d dirs", dcount); :+ if (fcount == 1) :+ fprintf(stderr, " and 1 file"); :+ else if (fcount > 1) :+ fprintf(stderr, " and %d files", fcount); :+ } else if (dcount + fcount > 3) { :+ fprintf(stderr, "remove %d files", dcount + fcount); :+ } else { :+ return(1); :+ } :+ fprintf(stderr, "? "); :+ fflush(stderr); :+ :+ first = ch = getchar(); :+ while (ch != '\n' && ch != EOF) :+ ch = getchar(); :+ if (ch == EOF) :+ break; :+ } :+ return (first == 'y' || first == 'Y'); :+} :+ : #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) : void : checkdot(char **argv) :@@ -519,7 +578,7 @@ : { : : (void)fprintf(stderr, "%s\n%s\n", :- "usage: rm [-f | -i] [-dPRrvW] file ...", :+ "usage: rm [-f | -i] [-dIPRrvW] file ...", : " unlink file"); : exit(EX_USAGE); : } : :==== //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 (text+ko) ==== : :@@ -29,7 +29,7 @@ : .\" SUCH DAMAGE. : .\" : .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 :-.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ :+.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ : .\" : .Dd July 3, 2004 : .Dt SH 1 :@@ -947,12 +947,16 @@ : .Ic set : built-in command can also be used to set or reset them. : .Ss Special Parameters :-A special parameter is a parameter denoted by one of the following :-special characters. :-The value of the parameter is listed :-next to its character. :+A special parameter is a parameter denoted by a special one-character :+name. :+The special parameters recognized by the :+.Nm :+shell of :+.Fx :+are shown in the following list, exactly as they would appear in input :+typed by the user or in the source of a shell script. : :>>> TRUNCATED FOR MAIL (1000 lines) <<< : : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org From owner-p4-projects@FreeBSD.ORG Wed Nov 3 18:43:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CBA116A4D0; Wed, 3 Nov 2004 18:43:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C54016A4CE for ; Wed, 3 Nov 2004 18:43:38 +0000 (GMT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7726B43D54 for ; Wed, 3 Nov 2004 18:43:35 +0000 (GMT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.13.1/8.13.1) with ESMTP id iA3Igh2K076929; Wed, 3 Nov 2004 13:42:43 -0500 (EST) (envelope-from robert@fledge.watson.org) Received: from localhost (robert@localhost)iA3IghCh076926; Wed, 3 Nov 2004 13:42:43 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Wed, 3 Nov 2004 13:42:43 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Andrew R. Reiter" In-Reply-To: <20041103133234.O75648@fledge.watson.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Perforce Change Reviews Subject: Re: PERFORCE change 64142 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Nov 2004 18:43:39 -0000 On Wed, 3 Nov 2004, Andrew R. Reiter wrote: > D'oh,.. if you catch me doing an integ of tbsd related branches, ping me > to update this tree too if you want it done. Sorry I did not offer > yesterday. Not a problem. I'm getting ready to do a merge sweep so I'm syncing things up and comparing diffs. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Principal Research Scientist, McAfee Research > > Cheers, > Andrew > > On Wed, 3 Nov 2004, Robert Watson wrote: > > :http://perforce.freebsd.org/chv.cgi?CH=64142 > : > :Change 64142 by rwatson@rwatson_tislabs on 2004/11/03 13:05:19 > : > : Integ of trustedbsd mac branch: > : - struct tcpcb has changed size > : - rm(1) now has a -I option > : - openssh update > : - various rc.d startup script changes > : - libphtread fixes > : - amd64 fixes by peter > : - placeholders for audit syscalls > : - some minor ddb beautification > : - bfe device locking fixes > : - usb ehci enhancements > : - many fs changes related to the vfs / geom changes by phk > : - HighPoint RocketRAID 182x support default in config > : - Adding tracing to bus dma > : - VM hacking by alc > : > :Affected files ... > : > :.. //depot/projects/trustedbsd/mac/Makefile.inc1#50 integrate > :.. //depot/projects/trustedbsd/mac/UPDATING#41 integrate > :.. //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 integrate > :.. //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 integrate > :.. //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/CREDITS#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/OVERVIEW#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/README#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#2 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-gss.c#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-none.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#12 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#12 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.h#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/dh.h#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/dns.c#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/envpass.sh#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/gss-serv-krb5.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#2 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#2 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/log.h#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/logintest.c#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/mdoc2man.awk#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.h#2 delete > :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/nchan.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-closefrom.c#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/openbsd-compat.h#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/sys-queue.h#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.c#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/opensshd.init.in#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/packet.h#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/pathnames.h#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/progressmeter.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#11 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.h#4 delete > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/README.regress#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/dynamic-forward.sh#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/envpass.sh#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/login-timeout.sh#2 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/multiplex.sh#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reexec.sh#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp-ssh-wrapper.sh#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp.sh#1 branch > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/regress/try-ciphers.sh#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/rijndael.c#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/scard-opensc.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/scard.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#12 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/serverloop.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#21 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/session.h#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-server.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#8 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.1#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#12 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-gss.h#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#6 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#11 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh1.h#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#15 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#11 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect1.c#7 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#11 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#11 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#13 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#16 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#13 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshlogin.c#10 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.c#9 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshpty.h#3 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.c#5 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/sshtty.h#4 delete > :.. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/tildexpand.h#3 delete > :.. //depot/projects/trustedbsd/mac/crypto/openssh/ttymodes.h#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/version.c#4 integrate > :.. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#15 integrate > :.. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#37 integrate > :.. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/etc/namedb/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/etc/network.subr#6 integrate > :.. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#20 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#8 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/moused#6 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/natd#3 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/netif#7 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/pf#4 integrate > :.. //depot/projects/trustedbsd/mac/etc/rc.d/savecore#7 integrate > :.. //depot/projects/trustedbsd/mac/etc/usbd.conf#6 integrate > :.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#33 integrate > :.. //depot/projects/trustedbsd/mac/games/fortune/unstr/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/games/ppt/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/games/primes/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/gnu/Makefile.inc#2 integrate > :.. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#12 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbfd/Makefile#14 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbinutils/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libopcodes/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1plus/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#12 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/libdiff/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/TESTS/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbtui/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grohtml/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libbib/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libdriver/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/libs/libgroff/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/html/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/lib/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/rcs/lib/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/libtxi/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/include/arpa/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/include/protocols/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/bind/config.mk#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/libalias/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#4 integrate > :.. //depot/projects/trustedbsd/mac/lib/libbsnmp/Makefile.inc#4 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/Makefile#16 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/alpha/Makefile.inc#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/Makefile.inc#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/amd64/sys/brk.S#3 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/ia64/Makefile.inc#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Makefile.inc#3 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/sys/mlock.2#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/sys/read.2#7 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc/sys/write.2#7 integrate > :.. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#13 integrate > :.. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#18 integrate > :.. //depot/projects/trustedbsd/mac/lib/libdisk/open_disk.c#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libio/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#12 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#23 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#8 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#10 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#11 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_exit.c#6 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_find_thread.c#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#19 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#11 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#18 integrate > :.. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#14 integrate > :.. //depot/projects/trustedbsd/mac/lib/librpcsvc/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/lib/libsmdb/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libsmutil/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/lib/libstand/Makefile#13 integrate > :.. //depot/projects/trustedbsd/mac/lib/libtelnet/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/lib/libxpg4/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/lib/liby/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpgw/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#26 integrate > :.. //depot/projects/trustedbsd/mac/libexec/pt_chown/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/Makefile#10 integrate > :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/reloc.c#5 integrate > :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/powerpc/rtld_machdep.h#4 integrate > :.. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#22 integrate > :.. //depot/projects/trustedbsd/mac/release/Makefile#58 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/alpha/article.sgml#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/amd64/article.sgml#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/i386/article.sgml#4 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#5 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/pc98/article.sgml#3 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/hardware/sparc64/article.sgml#5 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate > :.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#1 branch > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/aps/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/help/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/msg/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/ns/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/oinit/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/simple_httpd/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/sps/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/view/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/vm/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#27 integrate > :.. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/sbin/Makefile#27 integrate > :.. //depot/projects/trustedbsd/mac/sbin/ccdconfig/ccdconfig.8#11 integrate > :.. //depot/projects/trustedbsd/mac/sbin/dhclient/common/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/dhclient/dhcpctl/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/sbin/dhclient/dst/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/dhclient/minires/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/dhclient/omapip/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/fdisk_pc98/fdisk.c#10 integrate > :.. //depot/projects/trustedbsd/mac/sbin/geom/class/raid3/graid3.8#2 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/destroy.c#4 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.8#4 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#8 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#6 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#8 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/mkdisk.sh#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/recover.c#6 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/remove.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#8 integrate > :.. //depot/projects/trustedbsd/mac/sbin/growfs/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/sbin/gvinum/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#28 integrate > :.. //depot/projects/trustedbsd/mac/sbin/mca/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/pflogd/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sbin/rtsol/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#21 integrate > :.. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#13 integrate > :.. //depot/projects/trustedbsd/mac/secure/lib/libssl/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#13 integrate > :.. //depot/projects/trustedbsd/mac/share/dict/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/IPv6/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/bind9/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/bufbio/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/devfs/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/diskperf/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/jail/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/kernmalloc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/kerntune/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/nqnfs/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/px/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/relengr/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/sysperf/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/papers/timecounter/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/05.sysman/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/06.Clang/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/13.rcs/rcs/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/16.lex/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/18.gprof/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/20.ipctut/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/21.ipc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/22.rpcgen/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/23.rpc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/24.xdr/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/25.xdrrfc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/26.rpcrfc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/27.nfsrpc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/psd/28.cvs/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/smm/01.setup/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/smm/02.config/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/smm/05.fastfs/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/smm/08.sendmailop/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/smm/12.timed/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/04.csh/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/07.mail/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/10.exref/summary/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/11.vitut/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/summary/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/vi/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/13.viref/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/doc/usd/21.troff/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/autofs/driver/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/cvsup/stable-supfile#5 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#27 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/ipfilter/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/isdn/v21/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/kld/syscall/test/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/libvgl/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/pf/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/ppi/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/smbfs/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/examples/smbfs/print/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/share/info/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#44 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/altq.4#2 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/divert.4#5 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/fd.4#2 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/inet.4#10 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/mem.4#7 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/ng_device.4#3 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/ngatmbase.4#1 branch > :.. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#15 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#3 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#34 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man7/firewall.7#9 integrate > :.. //depot/projects/trustedbsd/mac/share/man/man9/taskqueue.9#7 integrate > :.. //depot/projects/trustedbsd/mac/share/misc/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#17 integrate > :.. //depot/projects/trustedbsd/mac/share/mk/Makefile#11 integrate > :.. //depot/projects/trustedbsd/mac/share/mk/sys.mk#15 integrate > :.. //depot/projects/trustedbsd/mac/share/security/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/share/sendmail/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/share/skel/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/share/snmp/mibs/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/share/syscons/fonts/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/share/syscons/keymaps/Makefile#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/db_trace.c#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/intr_machdep.c#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#14 integrate > :.. //depot/projects/trustedbsd/mac/sys/amd64/include/vmparam.h#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/arm/arm/db_trace.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/arc/lib/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/common/Makefile.inc#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/ficl/Makefile#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/forth/beastie.4th#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/biospci.c#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/main.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/libpc98/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/conf.c#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/main.c#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_proto.h#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/syscalls.master#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/Makefile.arm#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#13 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/NOTES#56 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/files#108 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/files.i386#39 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#30 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#25 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#28 integrate > :.. //depot/projects/trustedbsd/mac/sys/conf/options#67 integrate > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/access601.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/array.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/atapi.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/command.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/gui_lib.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/hptproc.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/ioctl.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvSata.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/raid5n.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/readme.txt#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/dev/hptmv/vdevice.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/pf.c#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/crypto/rijndael/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/ddb/db_output.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/ddb/db_thread.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/ddb/db_variables.c#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfe.c#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/bfe/if_bfereg.h#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#33 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons.h#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/dcons/dcons_os.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/fdc/fdc.c#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwcrom.c#8 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/firewire/iec13213.h#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/entry.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/global.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/hptintf.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mv.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/mvOs.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/hptmv/osbsd.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#13 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#36 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/patm/genrtab/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#31 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/apcdmareg.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/sound/sbus/cs4231.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/usb/ehcivar.h#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdi.c#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#27 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#35 integrate > :.. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#18 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#51 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs.h#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#17 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfsmount.h#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#18 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf.h#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#24 integrate > :.. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom.h#31 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#13 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#32 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_event.c#17 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_int.h#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#29 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/geom/geom_vfs.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_plex.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/geom/vinum/geom_vinum_var.h#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_bmap.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_inode.c#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_mount.h#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_subr.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#22 integrate > :.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#20 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_asus.c#3 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_machdep.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#38 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#48 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/i386/db_trace.c#14 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/i386/intr_machdep.c#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#43 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#32 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#43 integrate > :.. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#24 integrate > :.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/db_trace.c#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sscdisk.c#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_bmap.c#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.c#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_node.h#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#22 integrate > :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/iso.h#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/imgact_shell.c#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#63 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#22 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#39 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#30 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_ktr.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#441 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_physio.c#13 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#42 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#28 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/kern_xxx.c#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/sched_ule.c#15 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#35 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/subr_unit.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#63 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#60 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/sysv_ipc.c#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#62 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#43 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#44 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#37 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#39 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#24 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#28 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#32 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#67 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#71 integrate > :.. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/Makefile#72 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/hptmv/Makefile#1 branch > :.. //depot/projects/trustedbsd/mac/sys/modules/ipfw/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/netgraph/Makefile#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/smbfs/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/audiocs/Makefile#1 branch > :.. //depot/projects/trustedbsd/mac/sys/net/if.c#39 integrate > :.. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#20 integrate > :.. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#28 integrate > :.. //depot/projects/trustedbsd/mac/sys/net/if_var.h#27 integrate > :.. //depot/projects/trustedbsd/mac/sys/netgraph/netflow/netflow.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_device.c#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#25 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#25 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#29 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#26 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_sack.c#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vfsops.c#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/nfs4client/nfs4_vnops.c#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#21 integrate > :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#27 integrate > :.. //depot/projects/trustedbsd/mac/sys/nfsclient/nfsnode.h#8 integrate > :.. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#9 integrate > :.. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#40 integrate > :.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd.c#14 integrate > :.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/wd_cd.c#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/pci/agp.c#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#23 integrate > :.. //depot/projects/trustedbsd/mac/sys/pci/if_skreg.h#7 integrate > :.. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#27 integrate > :.. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#22 integrate > :.. //depot/projects/trustedbsd/mac/sys/powerpc/include/elf.h#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_kauai.c#4 integrate > :.. //depot/projects/trustedbsd/mac/sys/powerpc/powermac/ata_macio.c#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/db_trace.c#5 integrate > :.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#138 integrate > :.. //depot/projects/trustedbsd/mac/sys/sparc64/conf/NOTES#6 integrate > :.. //depot/projects/trustedbsd/mac/sys/sparc64/ebus/ebusreg.h#1 branch > :.. //depot/projects/trustedbsd/mac/sys/sparc64/isa/isa_dma.c#1 branch > :.. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/db_trace.c#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/buf.h#23 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/bufobj.h#2 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/conf.h#22 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/kernel.h#19 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/ktr.h#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/mount.h#35 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/proc.h#57 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#63 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#62 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#64 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/systm.h#26 integrate > :.. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#68 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#28 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#13 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_inode.c#18 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_rawread.c#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#30 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#26 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#47 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#32 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/inode.h#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_bmap.c#12 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#73 integrate > :.. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#10 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#28 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#29 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#18 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#33 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#24 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#32 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#41 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#25 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#27 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#16 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vm_zeroidle.c#11 integrate > :.. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#30 integrate > :.. //depot/projects/trustedbsd/mac/tools/diag/dumpvfscache/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/tools/diag/localeck/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/fsx/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/gaithrstress/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/geom/MdLoad/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/ia64_unaligned/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/include/tgmath/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/netatalk/simple_send/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/ipsockopt/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpconnect/tcpconnect.c#3 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpstream/tcpstream.c#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test1/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/nfsmmap/test2/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/p1003_1b/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/pipe/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/security/access/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/security/proc_to_proc/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accept_fd_leak/accept_fd_leak.c#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/accf_data_attach/accf_data_attach.c#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sockets/socketpair/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/tls/libxx/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/tls/libyy/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls1/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/tls/ttls2/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#13 integrate > :.. //depot/projects/trustedbsd/mac/tools/test/malloc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/tools/test/ppsapi/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/aac/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/gdb_regofs/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/ministat/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/localfiles#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/make.conf#4 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netblast/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netreceive/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/netrate/netsend/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/pirtool/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/raidtest/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/recoverdisk/recoverdisk.c#2 integrate > :.. //depot/projects/trustedbsd/mac/tools/tools/syscall_timing/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#31 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/dirname/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/du/du.1#6 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/elf2aout/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/lex/lib/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/locate/bigram/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/locate/code/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#9 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#13 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/make/job.h#8 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#20 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/mktemp/mktemp.1#5 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#7 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/newgrp/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/truss/Makefile#9 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/unexpand/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/uudecode/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/usr.bin/vgrind/RETEST/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/amd/libamu/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/bootparamd/callbootd/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/bsnmpd/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/config/config.y#7 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/config/lang.l#7 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/cron/lib/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/crunch/examples/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_dequeue/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_smail/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ctm/mkCTM/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.8#10 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/fwcontrol/fwcontrol.c#10 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/SMM.doc/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2855/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2alt/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/common/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/testrsrr/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libntp/Makefile#5 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/libparse/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntp-keygen/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpd/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdate/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpq/Makefile#4 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptime/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntptrace/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ntp/sntp/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Doc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Etc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/Misc/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/demo/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/pcvt/kbdio/Makefile#2 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/Makefile#6 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/ppp/Makefile#8 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/rpc.ypupdated/Makefile#3 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#19 integrate > :.. //depot/projects/trustedbsd/mac/usr.sbin/vnconfig/Makefile#2 integrate > : > :Differences ... > : > :==== //depot/projects/trustedbsd/mac/Makefile.inc1#50 (text+ko) ==== > : > :@@ -1,5 +1,5 @@ > : # > :-# $FreeBSD: src/Makefile.inc1,v 1.449 2004/10/11 23:51:13 peter Exp $ > :+# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ > : # > : # Make command line options: > : # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically > :@@ -502,7 +502,7 @@ > : > : .if !defined(KERNCONF) && defined(KERNEL) > : KERNCONF= ${KERNEL} > :-KERNWARN= yes > :+KERNWARN= > : .else > : KERNCONF?= GENERIC > : .endif > : > :==== //depot/projects/trustedbsd/mac/UPDATING#41 (text+ko) ==== > : > :@@ -23,6 +23,11 @@ > : developers choose to disable these features on build machines > : to maximize performance. > : > :+20041022: > :+ The size of struct tcpcb has changed. You have to recompile > :+ userland programs that read kmem for tcp sockets directly > :+ (netstat, sockstat, etc.) > :+ > : 20041018: > : A major sweep over the tty drivers to elimnate approx 3100 > : lines of copy&pasted code have been performed. As a part of > :@@ -1951,4 +1956,4 @@ > : Contact Warner Losh if you have any questions about your use of > : this document. > : > :-$FreeBSD: src/UPDATING,v 1.375 2004/10/18 21:24:21 phk Exp $ > :+$FreeBSD: src/UPDATING,v 1.376 2004/10/22 19:55:04 andre Exp $ > : > :==== //depot/projects/trustedbsd/mac/bin/rm/rm.1#9 (text+ko) ==== > : > :@@ -29,9 +29,9 @@ > : .\" SUCH DAMAGE. > : .\" > : .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 > :-.\" $FreeBSD: src/bin/rm/rm.1,v 1.31 2004/10/04 19:03:44 des Exp $ > :+.\" $FreeBSD: src/bin/rm/rm.1,v 1.33 2004/11/01 16:52:34 delphij Exp $ > : .\" > :-.Dd October 4, 2004 > :+.Dd October 28, 2004 > : .Dt RM 1 > : .Os > : .Sh NAME > :@@ -40,7 +40,7 @@ > : .Nd remove directory entries > : .Sh SYNOPSIS > : .Nm > :-.Op Fl dfiPRrvW > :+.Op Fl dfiIPRrvW > : .Ar > : .Nm unlink > : .Ar file > :@@ -76,6 +76,12 @@ > : option overrides any previous > : .Fl f > : options. > :+.It Fl I > :+Request confirmation once if more than three files are being removed or if a > :+directory is being recursively removed. > :+This is a far less intrusive option than > :+.Fl i > :+yet provides almost the same level of protection against mistakes. > : .It Fl P > : Overwrite regular files before deleting them. > : Files are overwritten three times, first with the byte pattern 0xff, > : > :==== //depot/projects/trustedbsd/mac/bin/rm/rm.c#14 (text+ko) ==== > : > :@@ -39,7 +39,7 @@ > : #endif /* not lint */ > : #endif > : #include > :-__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.50 2004/10/04 19:24:28 des Exp $"); > :+__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.51 2004/10/28 08:25:30 delphij Exp $"); > : > : #include > : #include > :@@ -58,9 +58,11 @@ > : #include > : > : int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok; > :+int rflag, Iflag; > : uid_t uid; > : > : int check(char *, char *, struct stat *); > :+int check2(char **); > : void checkdot(char **); > : void checkslash(char **); > : void rm_file(char **); > :@@ -78,7 +80,7 @@ > : int > : main(int argc, char *argv[]) > : { > :- int ch, rflag; > :+ int ch; > : char *p; > : > : /* > :@@ -102,7 +104,7 @@ > : } > : > : Pflag = rflag = 0; > :- while ((ch = getopt(argc, argv, "dfiPRrvW")) != -1) > :+ while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1) > : switch(ch) { > : case 'd': > : dflag = 1; > :@@ -115,6 +117,9 @@ > : fflag = 0; > : iflag = 1; > : break; > :+ case 'I': > :+ Iflag = 1; > :+ break; > : case 'P': > : Pflag = 1; > : break; > :@@ -148,6 +153,10 @@ > : if (*argv) { > : stdin_ok = isatty(STDIN_FILENO); > : > :+ if (Iflag) { > :+ if (check2(argv) == 0) > :+ exit (1); > :+ } > : if (rflag) > : rm_tree(argv); > : else > :@@ -489,6 +498,56 @@ > : } > : } > : > :+int > :+check2(char **argv) > :+{ > :+ struct stat st; > :+ int first; > :+ int ch; > :+ int fcount = 0; > :+ int dcount = 0; > :+ int i; > :+ const char *dname = NULL; > :+ > :+ for (i = 0; argv[i]; ++i) { > :+ if (lstat(argv[i], &st) == 0) { > :+ if (S_ISDIR(st.st_mode)) { > :+ ++dcount; > :+ dname = argv[i]; /* only used if 1 dir */ > :+ } else { > :+ ++fcount; > :+ } > :+ } > :+ } > :+ first = 0; > :+ while (first != 'n' && first != 'N' && first != 'y' && first != 'Y') { > :+ if (dcount && rflag) { > :+ fprintf(stderr, "recursively remove"); > :+ if (dcount == 1) > :+ fprintf(stderr, " %s", dname); > :+ else > :+ fprintf(stderr, " %d dirs", dcount); > :+ if (fcount == 1) > :+ fprintf(stderr, " and 1 file"); > :+ else if (fcount > 1) > :+ fprintf(stderr, " and %d files", fcount); > :+ } else if (dcount + fcount > 3) { > :+ fprintf(stderr, "remove %d files", dcount + fcount); > :+ } else { > :+ return(1); > :+ } > :+ fprintf(stderr, "? "); > :+ fflush(stderr); > :+ > :+ first = ch = getchar(); > :+ while (ch != '\n' && ch != EOF) > :+ ch = getchar(); > :+ if (ch == EOF) > :+ break; > :+ } > :+ return (first == 'y' || first == 'Y'); > :+} > :+ > : #define ISDOT(a) ((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2]))) > : void > : checkdot(char **argv) > :@@ -519,7 +578,7 @@ > : { > : > : (void)fprintf(stderr, "%s\n%s\n", > :- "usage: rm [-f | -i] [-dPRrvW] file ...", > :+ "usage: rm [-f | -i] [-dIPRrvW] file ...", > : " unlink file"); > : exit(EX_USAGE); > : } > : > :==== //depot/projects/trustedbsd/mac/bin/sh/sh.1#17 (text+ko) ==== > : > :@@ -29,7 +29,7 @@ > : .\" SUCH DAMAGE. > : .\" > : .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 > :-.\" $FreeBSD: src/bin/sh/sh.1,v 1.92 2004/07/03 02:03:44 tjr Exp $ > :+.\" $FreeBSD: src/bin/sh/sh.1,v 1.93 2004/11/01 19:05:04 alfred Exp $ > : .\" > : .Dd July 3, 2004 > : .Dt SH 1 > :@@ -947,12 +947,16 @@ > : .Ic set > : built-in command can also be used to set or reset them. > : .Ss Special Parameters > :-A special parameter is a parameter denoted by one of the following > :-special characters. > :-The value of the parameter is listed > :-next to its character. > :+A special parameter is a parameter denoted by a special one-character > :+name. > :+The special parameters recognized by the > :+.Nm > :+shell of > :+.Fx > :+are shown in the following list, exactly as they would appear in input > :+typed by the user or in the source of a shell script. > : > :>>> TRUNCATED FOR MAIL (1000 lines) <<< > : > : > > -- > Andrew R. Reiter > arr@watson.org > arr@FreeBSD.org > From owner-p4-projects@FreeBSD.ORG Thu Nov 4 04:07:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAF3E16A4D0; Thu, 4 Nov 2004 04:07:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8752816A4CE for ; Thu, 4 Nov 2004 04:07:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46DA443D41 for ; Thu, 4 Nov 2004 04:07:13 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA447Dho061238 for ; Thu, 4 Nov 2004 04:07:13 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA447CYW061235 for perforce@freebsd.org; Thu, 4 Nov 2004 04:07:12 GMT (envelope-from marcel@freebsd.org) Date: Thu, 4 Nov 2004 04:07:12 GMT Message-Id: <200411040407.iA447CYW061235@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 04:07:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=64191 Change 64191 by marcel@marcel_nfs on 2004/11/04 04:07:07 IFC @64188 Affected files ... .. //depot/projects/uart/alpha/alpha/db_trace.c#4 integrate .. //depot/projects/uart/alpha/conf/GENERIC#5 integrate .. //depot/projects/uart/amd64/amd64/db_trace.c#4 integrate .. //depot/projects/uart/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/uart/amd64/conf/GENERIC#7 integrate .. //depot/projects/uart/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/uart/arm/arm/db_trace.c#2 integrate .. //depot/projects/uart/arm/conf/IQ31244#2 integrate .. //depot/projects/uart/arm/conf/SIMICS#2 integrate .. //depot/projects/uart/boot/forth/beastie.4th#4 integrate .. //depot/projects/uart/conf/NOTES#18 integrate .. //depot/projects/uart/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/uart/ddb/db_output.c#4 integrate .. //depot/projects/uart/ddb/db_ps.c#6 integrate .. //depot/projects/uart/ddb/db_thread.c#2 integrate .. //depot/projects/uart/ddb/db_variables.c#3 integrate .. //depot/projects/uart/ddb/ddb.h#4 integrate .. //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/uart/dev/acpica/acpi_timer.c#6 integrate .. //depot/projects/uart/dev/bge/if_bge.c#12 integrate .. //depot/projects/uart/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/uart/dev/em/if_em.c#8 integrate .. //depot/projects/uart/dev/fdc/fdc.c#3 integrate .. //depot/projects/uart/dev/pci/pci.c#13 integrate .. //depot/projects/uart/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/uart/dev/usb/ehci.c#5 integrate .. //depot/projects/uart/dev/usb/ehcireg.h#3 integrate .. //depot/projects/uart/dev/usb/ehcivar.h#3 integrate .. //depot/projects/uart/dev/usb/uftdi.c#6 integrate .. //depot/projects/uart/dev/usb/uhub.c#6 integrate .. //depot/projects/uart/dev/usb/usb_subr.c#7 integrate .. //depot/projects/uart/dev/usb/usbdevs#10 integrate .. //depot/projects/uart/dev/usb/usbdivar.h#6 integrate .. //depot/projects/uart/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/uart/fs/ntfs/ntfs_subr.c#5 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/uart/geom/geom_mbr.c#5 integrate .. //depot/projects/uart/geom/geom_slice.c#3 integrate .. //depot/projects/uart/i386/acpica/acpi_asus.c#2 integrate .. //depot/projects/uart/i386/conf/GENERIC#6 integrate .. //depot/projects/uart/i386/i386/busdma_machdep.c#9 integrate .. //depot/projects/uart/i386/i386/db_trace.c#4 integrate .. //depot/projects/uart/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/uart/i386/i386/machdep.c#9 integrate .. //depot/projects/uart/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/uart/i386/pci/pci_bus.c#6 integrate .. //depot/projects/uart/ia64/ia64/db_trace.c#5 integrate .. //depot/projects/uart/isa/vga_isa.c#4 integrate .. //depot/projects/uart/kern/imgact_shell.c#2 integrate .. //depot/projects/uart/kern/kern_environment.c#3 integrate .. //depot/projects/uart/kern/kern_intr.c#4 integrate .. //depot/projects/uart/kern/kern_ktr.c#7 integrate .. //depot/projects/uart/kern/kern_mac.c#7 integrate .. //depot/projects/uart/kern/kern_subr.c#4 integrate .. //depot/projects/uart/kern/sched_ule.c#9 integrate .. //depot/projects/uart/kern/subr_bus.c#6 integrate .. //depot/projects/uart/kern/tty.c#3 integrate .. //depot/projects/uart/kern/uipc_jumbo.c#3 integrate .. //depot/projects/uart/kern/uipc_socket.c#6 integrate .. //depot/projects/uart/kern/uipc_syscalls.c#6 integrate .. //depot/projects/uart/kern/vfs_bio.c#11 integrate .. //depot/projects/uart/kern/vfs_subr.c#8 integrate .. //depot/projects/uart/net/if.c#7 integrate .. //depot/projects/uart/net/if_tap.c#3 integrate .. //depot/projects/uart/net/if_tun.c#4 integrate .. //depot/projects/uart/net/if_var.h#4 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_main.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate .. //depot/projects/uart/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/uart/netgraph/netgraph.h#3 integrate .. //depot/projects/uart/netgraph/ng_base.c#3 integrate .. //depot/projects/uart/netgraph/ng_cisco.c#3 integrate .. //depot/projects/uart/netgraph/ng_device.c#4 integrate .. //depot/projects/uart/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/uart/netgraph/ng_source.c#3 integrate .. //depot/projects/uart/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/uart/netinet/ip_fw2.c#10 integrate .. //depot/projects/uart/netinet/tcp.h#3 integrate .. //depot/projects/uart/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/uart/netinet/tcp_input.c#6 integrate .. //depot/projects/uart/netinet/tcp_output.c#4 integrate .. //depot/projects/uart/netinet/tcp_seq.h#4 integrate .. //depot/projects/uart/netinet/tcp_subr.c#5 integrate .. //depot/projects/uart/netinet/tcp_syncache.c#6 integrate .. //depot/projects/uart/netinet/tcp_timer.c#4 integrate .. //depot/projects/uart/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/uart/netinet/tcp_var.h#4 integrate .. //depot/projects/uart/netinet/udp_usrreq.c#6 integrate .. //depot/projects/uart/pc98/i386/machdep.c#7 integrate .. //depot/projects/uart/pci/if_sk.c#6 integrate .. //depot/projects/uart/pci/if_skreg.h#4 integrate .. //depot/projects/uart/powerpc/conf/GENERIC#3 integrate .. //depot/projects/uart/powerpc/include/elf.h#3 integrate .. //depot/projects/uart/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/uart/powerpc/powermac/ata_macio.c#4 integrate .. //depot/projects/uart/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/uart/sparc64/conf/GENERIC#7 integrate .. //depot/projects/uart/sparc64/sparc64/db_trace.c#4 integrate .. //depot/projects/uart/sparc64/sparc64/pmap.c#13 integrate .. //depot/projects/uart/sys/buf.h#7 integrate .. //depot/projects/uart/sys/kernel.h#6 integrate .. //depot/projects/uart/sys/systm.h#7 integrate .. //depot/projects/uart/sys/ttydefaults.h#3 integrate .. //depot/projects/uart/vm/vm_contig.c#9 integrate .. //depot/projects/uart/vm/vm_glue.c#8 integrate .. //depot/projects/uart/vm/vm_object.c#9 integrate .. //depot/projects/uart/vm/vm_page.c#11 integrate .. //depot/projects/uart/vm/vm_pageout.c#12 integrate .. //depot/projects/uart/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -221,7 +221,7 @@ last_ipl = ~0L; tf = NULL; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &diff); if (sym == DB_SYM_NULL) ==== //depot/projects/uart/alpha/conf/GENERIC#5 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ machine alpha cpu EV4 @@ -66,7 +66,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/uart/amd64/amd64/db_trace.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -381,7 +381,7 @@ first = TRUE; quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && !quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/uart/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.11 2004/11/03 18:03:06 scottl Exp $ */ /* @@ -166,8 +166,8 @@ * argument for counting hardware interrupts when they're * processed too. */ - atomic_add_long(isrc->is_count, 1); - atomic_add_int(&cnt.v_intr, 1); + (*isrc->is_count)++; + cnt.v_intr++; it = isrc->is_ithread; if (it == NULL) @@ -219,7 +219,7 @@ error = ithread_schedule(it); } if (error == EINVAL) { - atomic_add_long(isrc->is_straycount, 1); + (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) log(LOG_ERR, "stray irq%d\n", vector); else if (*isrc->is_straycount == MAX_STRAY_LOG) @@ -313,7 +313,7 @@ else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) if (*isrc != NULL) db_dump_ithread((*isrc)->is_ithread, verbose); ==== //depot/projects/uart/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $ machine amd64 cpu HAMMER @@ -48,7 +48,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues ==== //depot/projects/uart/amd64/pci/pci_bus.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.112 2004/10/31 15:50:32 des Exp $"); #include "opt_cpu.h" @@ -117,7 +117,7 @@ * via some other means. If we have, bail since otherwise * we're going to end up duplicating it. */ - if ((pci_devclass = devclass_find("pci")) && + if ((pci_devclass = devclass_find("pci")) && devclass_get_device(pci_devclass, 0)) return; @@ -136,7 +136,7 @@ */ if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; - if ((hdrtype & PCIM_MFDEV) && + if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) pcifunchigh = PCI_FUNCMAX; else @@ -266,10 +266,9 @@ SYSCTL_DECL(_hw_pci); -static int legacy_host_mem_start = 0x80000000; -/* No TUNABLE_ULONG :-( */ -TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); -SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, +static unsigned long legacy_host_mem_start = 0x80000000; +TUNABLE_ULONG("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &legacy_host_mem_start, 0x80000000, "Limit the host bridge memory to being above this address. Must be\n\ set at boot via a tunable."); @@ -394,12 +393,12 @@ /* * Install placeholder to claim the resources owned by the - * PCI bus interface. This could be used to extract the + * PCI bus interface. This could be used to extract the * config space registers in the extreme case where the PnP * ID is available and the PCI BIOS isn't, but for now we just * eat the PnP ID and do nothing else. * - * XXX we should silence this probe, as it will generally confuse + * XXX we should silence this probe, as it will generally confuse * people. */ static struct isa_pnp_id pcibus_pnp_ids[] = { @@ -411,7 +410,7 @@ pcibus_pnp_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0) device_quiet(dev); return(result); ==== //depot/projects/uart/arm/arm/db_trace.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $"); #include #include @@ -138,7 +138,7 @@ scp_offset = -(get_pc_str_offset() >> 2); quit = 0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && frame != NULL && !quit) { db_addr_t scp; u_int32_t savecode; ==== //depot/projects/uart/arm/conf/IQ31244#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.2 2004/10/01 16:51:37 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.3 2004/11/02 20:57:19 andre Exp $ machine arm ident IQ31244 @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/uart/arm/conf/SIMICS#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.5 2004/11/02 20:57:19 andre Exp $ machine arm ident SIMICS @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI #options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/uart/boot/forth/beastie.4th#4 (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/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $ marker task-beastie.4th @@ -40,6 +40,7 @@ variable bootkey variable bootacpikey +variable bootusbkey variable bootsafekey variable bootverbosekey variable bootsinglekey @@ -159,6 +160,11 @@ printmenuitem ." Boot FreeBSD in single user mode" bootsinglekey ! printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey ! printmenuitem ." Escape to loader prompt" escapekey ! + s" arch-i386" environment? if + printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey ! + else + -2 bootacpikey ! + then printmenuitem ." Reboot" rebootkey ! menuX @ 20 at-xy ." Select option, [Enter] for default" @@ -223,6 +229,10 @@ then 0 boot then + dup bootusbkey @ = if + s" 0x1" s" hint.atkbd.0.flags" setenv + 0 boot + then dup bootsafekey @ = if s" arch-i386" environment? if s" acpi_load" unsetenv ==== //depot/projects/uart/conf/NOTES#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1285 2004/10/27 19:26:01 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1286 2004/11/02 20:57:20 andre Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1050,7 +1050,7 @@ options CAM_MAX_HIGHPOWER=4 options SCSI_NO_SENSE_STRINGS options SCSI_NO_OP_STRINGS -options SCSI_DELAY=8000 # Be pessimistic about Joe SCSI device +options SCSI_DELAY=5000 # Be pessimistic about Joe SCSI device # Options for the CAM CDROM driver: # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN ==== //depot/projects/uart/contrib/pf/net/pf_if.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.6 2004/09/14 15:20:24 mlaier Exp $ */ +/* $FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.7 2004/11/03 17:21:12 mlaier Exp $ */ /* $OpenBSD: pf_if.c,v 1.11 2004/03/15 11:38:23 cedric Exp $ */ /* add $OpenBSD: pf_if.c,v 1.19 2004/08/11 12:06:44 henning Exp $ */ @@ -157,12 +157,11 @@ #ifdef __FreeBSD__ PF_LOCK(); IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) - if (ifp->if_dunit != IF_DUNIT_NONE) { - IFNET_RUNLOCK(); - pfi_attach_ifnet(ifp); - IFNET_RLOCK(); - } + TAILQ_FOREACH(ifp, &ifnet, if_link) { + IFNET_RUNLOCK(); + pfi_attach_ifnet(ifp); + IFNET_RLOCK(); + } IFNET_RUNLOCK(); PF_UNLOCK(); pfi_dummy = pfi_if_create("notyet", pfi_self, @@ -248,8 +247,7 @@ pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp) { PF_LOCK(); - if (ifp->if_dunit != IF_DUNIT_NONE) - pfi_attach_ifnet(ifp); + pfi_attach_ifnet(ifp); PF_UNLOCK(); } @@ -341,8 +339,8 @@ /* add/modify interface */ if (p == NULL) - p = pfi_if_create(ifp->if_xname, q, - realname?PFI_IFLAG_INSTANCE:PFI_IFLAG_PLACEHOLDER); + p = pfi_if_create(ifp->if_xname, q, PFI_IFLAG_INSTANCE | + (realname?0:PFI_IFLAG_PLACEHOLDER)); else { /* remove from the dummy group */ /* XXX: copy stats? We should not have any!!! */ @@ -354,10 +352,9 @@ q->pfik_addcnt++; TAILQ_INSERT_TAIL(&q->pfik_grouphead, p, pfik_instances); - if (realname) { + if (realname) p->pfik_flags &= ~PFI_IFLAG_PLACEHOLDER; - p->pfik_flags |= PFI_IFLAG_INSTANCE; - } + p->pfik_flags |= PFI_IFLAG_INSTANCE; } if (p == NULL) panic("pfi_attach_ifnet: " @@ -874,6 +871,7 @@ if (p->pfik_rules > 0 || p->pfik_states > 0) { /* move back to the dummy group */ p->pfik_parent = pfi_dummy; + p->pfik_flags &= ~PFI_IFLAG_INSTANCE; pfi_dummy->pfik_addcnt++; TAILQ_INSERT_TAIL(&pfi_dummy->pfik_grouphead, p, pfik_instances); @@ -912,11 +910,8 @@ */ IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { - if (ifp->if_dunit == IF_DUNIT_NONE) - continue; + TAILQ_FOREACH(ifp, &ifnet, if_link) pfi_newgroup(ifp->if_dname, PFI_IFLAG_DYNAMIC); - } IFNET_RUNLOCK(); #else char *buses[] = PFI_DYNAMIC_BUSES; ==== //depot/projects/uart/ddb/db_output.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.31 2004/07/10 23:47:18 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_output.c,v 1.32 2004/11/01 22:15:14 jhb Exp $"); #include #include @@ -65,8 +65,9 @@ #define NEXT_TAB(i) \ ((((i) + db_tab_stop_width) / db_tab_stop_width) * db_tab_stop_width) db_expr_t db_max_width = 79; /* output line width */ +db_expr_t db_lines_per_page = 20; /* lines per page */ static int db_newlines; /* # lines this page */ -static int db_maxlines = -1; /* max lines per page */ +static int db_maxlines = -1; /* max lines/page when paging */ static db_page_calloutfcn_t *db_page_callout = NULL; static void *db_page_callout_arg = NULL; static int ddb_use_printf = 0; @@ -143,6 +144,7 @@ } else if (c == '\n') { /* Newline */ + db_force_whitespace(); cnputc(c); db_output_position = 0; db_last_non_space = 0; @@ -157,6 +159,7 @@ } else if (c == '\r') { /* Return */ + db_force_whitespace(); cnputc(c); db_output_position = 0; db_last_non_space = 0; @@ -197,21 +200,33 @@ void db_simple_pager(void *arg) { - int c; + int c, done; db_printf("--More--\r"); - for (;;) { + done = 0; + while (!done) { c = cngetc(); switch (c) { + case 'e': + case 'j': case '\n': /* Just one more line. */ db_setup_paging(db_simple_pager, arg, 1); - return; + done++; + break; + case 'd': + /* Half a page. */ + db_setup_paging(db_simple_pager, arg, + db_lines_per_page / 2); + done++; + break; + case 'f': case ' ': /* Another page. */ db_setup_paging(db_simple_pager, arg, - DB_LINES_PER_PAGE); - return; + db_lines_per_page); + done++; + break; case 'q': case 'Q': case 'x': @@ -219,8 +234,8 @@ /* Quit */ if (arg != NULL) { *(int *)arg = 1; - db_printf("\n"); - return; + done++; + break; } #if 0 /* FALLTHROUGH */ @@ -229,6 +244,7 @@ #endif } } + db_printf(" \r"); } /* ==== //depot/projects/uart/ddb/db_ps.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.53 2004/09/05 02:09:52 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.54 2004/11/01 22:15:14 jhb Exp $"); #include #include @@ -65,7 +65,7 @@ else p = &proc0; - db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); db_printf(" pid proc uarea uid ppid pgrp flag stat wmesg wchan cmd\n"); while (--np >= 0 && !quit) { if (p == NULL) { ==== //depot/projects/uart/ddb/db_thread.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.1 2004/07/10 23:47:19 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_thread.c,v 1.2 2004/11/01 22:15:14 jhb Exp $"); #include #include @@ -88,7 +88,7 @@ struct thread *thr; int pager_quit; - db_setup_paging(db_simple_pager, &pager_quit, DB_LINES_PER_PAGE); + db_setup_paging(db_simple_pager, &pager_quit, db_lines_per_page); pager_quit = 0; thr = kdb_thr_first(); ==== //depot/projects/uart/ddb/db_variables.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_variables.c,v 1.21 2004/07/10 23:47:19 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_variables.c,v 1.22 2004/11/01 22:15:14 jhb Exp $"); #include #include @@ -45,6 +45,7 @@ { "maxoff", &db_maxoff, FCN_NULL }, { "maxwidth", &db_max_width, FCN_NULL }, { "tabstops", &db_tab_stop_width, FCN_NULL }, + { "lines", &db_lines_per_page, FCN_NULL }, }; static struct db_variable *db_evars = db_vars + sizeof(db_vars)/sizeof(db_vars[0]); ==== //depot/projects/uart/ddb/ddb.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/ddb.h,v 1.36 2004/07/21 05:07:09 marcel Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.37 2004/11/01 22:15:14 jhb Exp $ */ /* @@ -39,8 +39,6 @@ #include /* type definitions */ -#define DB_LINES_PER_PAGE 20 - typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif); @@ -78,6 +76,7 @@ extern db_expr_t db_radix; extern db_expr_t db_max_width; extern db_expr_t db_tab_stop_width; +extern db_expr_t db_lines_per_page; struct thread; struct vm_map; ==== //depot/projects/uart/dev/acpica/acpi_pcib_acpi.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.42 2004/10/11 21:10:23 imp Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.44 2004/10/31 15:50:32 des Exp $ */ #include "opt_acpi.h" #include @@ -73,7 +73,7 @@ static int acpi_pcib_acpi_route_interrupt(device_t pcib, device_t dev, int pin); static struct resource *acpi_pcib_acpi_alloc_resource(device_t dev, - device_t child, int type, int *rid, + device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags); @@ -92,7 +92,7 @@ DEVMETHOD(bus_alloc_resource, acpi_pcib_acpi_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), @@ -147,7 +147,7 @@ * Get our base bus number by evaluating _BBN. * If this doesn't work, we assume we're bus number 0. * - * XXX note that it may also not exist in the case where we are + * XXX note that it may also not exist in the case where we are * meant to use a private configuration space mechanism for this bus, * so we should dig out our resources and check to see if we have * anything like that. How do we do this? @@ -264,7 +264,7 @@ static int acpi_pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value) { - struct acpi_hpcib_softc *sc = device_get_softc(dev); + struct acpi_hpcib_softc *sc = device_get_softc(dev); switch (which) { case PCIB_IVAR_BUS: @@ -301,8 +301,8 @@ return (acpi_pcib_route_interrupt(pcib, dev, pin)); } -static int acpi_host_mem_start = 0x80000000; -TUNABLE_INT("hw.acpi.host_mem_start", &acpi_host_mem_start); +static unsigned long acpi_host_mem_start = 0x80000000; +TUNABLE_ULONG("hw.acpi.host_mem_start", &acpi_host_mem_start); struct resource * acpi_pcib_acpi_alloc_resource(device_t dev, device_t child, int type, int *rid, ==== //depot/projects/uart/dev/acpica/acpi_timer.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.36 2004/10/08 17:56:47 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.37 2004/11/03 09:09:13 phk Exp $ */ #include "opt_acpi.h" #include @@ -174,8 +174,12 @@ * the timer multiple times to get a consistent value before returning. */ j = 0; + if (bootverbose) + printf("ACPI timer:"); for (i = 0; i < 10; i++) j += acpi_timer_test(); + if (bootverbose) + printf(" -> %d\n", j); if (j == 10) { acpi_timer_timecounter.tc_name = "ACPI-fast"; acpi_timer_timecounter.tc_get_timecount = acpi_timer_get_timecount; @@ -323,11 +327,8 @@ n = 0; else n = 1; - if (bootverbose) { - printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", - n ? "GOOD" : "BAD ", - min, max, max - min); - } + if (bootverbose) + printf(" %d/%d", n, max-min); return (n); } ==== //depot/projects/uart/dev/bge/if_bge.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.76 2004/10/19 02:42:49 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.79 2004/10/30 22:59:30 des Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -51,7 +51,7 @@ * * The BCM5700 supports the PCI v2.2 and PCI-X v1.0 standards, and will * function in a 32-bit/64-bit 33/66Mhz bus, or a 64-bit/133Mhz bus. - * + * * The BCM5701 is a single-chip solution incorporating both the BCM5700 * MAC and a BCM5401 10/100/1000 PHY. Unlike the BCM5700, the BCM5701 * does not support external SSRAM. @@ -409,7 +409,7 @@ htole32(BGE_ADDR_HI(segs[i].ds_addr)); d->bge_len = htole16(segs[i].ds_len); d->bge_flags = htole16(ctx->bge_flags); - i++; + i++; if (i == nseg) break; BGE_INC(idx, BGE_TX_RING_CNT); @@ -486,8 +486,8 @@ if (res.vr_id != VPD_RES_ID) { printf("bge%d: bad VPD resource id: expected %x got %x\n", sc->bge_unit, VPD_RES_ID, res.vr_id); - return; - } + return; + } pos += sizeof(res); sc->bge_vpd_prodname = malloc(res.vr_len + 1, M_DEVBUF, M_NOWAIT); @@ -557,7 +557,7 @@ /* Get result. */ byte = CSR_READ_4(sc, BGE_EE_DATA); - *dest = (byte >> ((addr % 4) * 8)) & 0xFF; + *dest = (byte >> ((addr % 4) * 8)) & 0xFF; return(0); } @@ -752,7 +752,7 @@ &sc->bge_cdata.bge_jumbo_map); if (error) - return (ENOMEM); + return (ENOMEM); SLIST_INIT(&sc->bge_jfree_listhead); SLIST_INIT(&sc->bge_jinuse_listhead); @@ -765,7 +765,7 @@ for (i = 0; i < BGE_JSLOTS; i++) { sc->bge_cdata.bge_jslots[i] = ptr; ptr += BGE_JLEN; - entry = malloc(sizeof(struct bge_jpool_entry), + entry = malloc(sizeof(struct bge_jpool_entry), M_DEVBUF, M_NOWAIT); if (entry == NULL) { bge_free_jumbo_mem(sc); @@ -784,11 +784,11 @@ static void bge_free_jumbo_mem(sc) - struct bge_softc *sc; + struct bge_softc *sc; { - int i; - struct bge_jpool_entry *entry; - + int i; + struct bge_jpool_entry *entry; + for (i = 0; i < BGE_JSLOTS; i++) { entry = SLIST_FIRST(&sc->bge_jfree_listhead); SLIST_REMOVE_HEAD(&sc->bge_jfree_listhead, jpool_entries); @@ -809,7 +809,7 @@ if (sc->bge_cdata.bge_jumbo_tag) bus_dma_tag_destroy(sc->bge_cdata.bge_jumbo_tag); - return; + return; } /* @@ -820,9 +820,9 @@ struct bge_softc *sc; { struct bge_jpool_entry *entry; - + entry = SLIST_FIRST(&sc->bge_jfree_listhead); - + if (entry == NULL) { printf("bge%d: no free jumbo buffers\n", sc->bge_unit); return(NULL); @@ -1287,9 +1287,9 @@ #ifdef __brokenalpha__ /* * Must insure that we do not cross an 8K (bytes) boundary - * for DMA reads. Our highest limit is 1K bytes. This is a - * restriction on some ALPHA platforms with early revision - * 21174 PCI chipsets, such as the AlphaPC 164lx + * for DMA reads. Our highest limit is 1K bytes. This is a + * restriction on some ALPHA platforms with early revision + * 21174 PCI chipsets, such as the AlphaPC 164lx */ PCI_SETBIT(sc->bge_dev, BGE_PCI_DMA_RW_CTL, BGE_PCI_READ_BNDRY_1024BYTES, 4); @@ -1653,7 +1653,7 @@ /* Turn on write DMA state machine */ CSR_WRITE_4(sc, BGE_WDMA_MODE, BGE_WDMAMODE_ENABLE|BGE_WDMAMODE_ALL_ATTNS); - + /* Turn on read DMA state machine */ CSR_WRITE_4(sc, BGE_RDMA_MODE, BGE_RDMAMODE_ENABLE|BGE_RDMAMODE_ALL_ATTNS); @@ -1700,7 +1700,7 @@ /* Enable PHY auto polling (for MII/GMII only) */ if (sc->bge_tbi) { CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK); - } else { + } else { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16); if (sc->bge_asicrev == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, @@ -1927,7 +1927,7 @@ NULL, NULL, /* filter, filterarg */ MAXBSIZE, BGE_NSEG_NEW, /* maxsize, nsegments */ BUS_SPACE_MAXSIZE_32BIT,/* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ + BUS_DMA_ALLOCNOW, /* flags */ NULL, NULL, /* lockfunc, lockarg */ &sc->bge_cdata.bge_parent_tag); @@ -1984,10 +1984,10 @@ error = bus_dmamem_alloc(sc->bge_cdata.bge_rx_std_ring_tag, (void **)&sc->bge_ldata.bge_rx_std_ring, BUS_DMA_NOWAIT, &sc->bge_cdata.bge_rx_std_ring_map); - if (error) - return (ENOMEM); + if (error) + return (ENOMEM); - bzero((char *)sc->bge_ldata.bge_rx_std_ring, BGE_STD_RX_RING_SZ); + bzero((char *)sc->bge_ldata.bge_rx_std_ring, BGE_STD_RX_RING_SZ); /* Load the address of the standard RX ring */ @@ -2102,10 +2102,10 @@ error = bus_dmamem_alloc(sc->bge_cdata.bge_rx_return_ring_tag, (void **)&sc->bge_ldata.bge_rx_return_ring, BUS_DMA_NOWAIT, &sc->bge_cdata.bge_rx_return_ring_map); - if (error) - return (ENOMEM); + if (error) + return (ENOMEM); - bzero((char *)sc->bge_ldata.bge_rx_return_ring, + bzero((char *)sc->bge_ldata.bge_rx_return_ring, BGE_RX_RTN_RING_SZ(sc)); /* Load the address of the RX return ring */ @@ -2140,10 +2140,10 @@ error = bus_dmamem_alloc(sc->bge_cdata.bge_tx_ring_tag, (void **)&sc->bge_ldata.bge_tx_ring, BUS_DMA_NOWAIT, &sc->bge_cdata.bge_tx_ring_map); - if (error) - return (ENOMEM); + if (error) + return (ENOMEM); - bzero((char *)sc->bge_ldata.bge_tx_ring, BGE_TX_RING_SZ); + bzero((char *)sc->bge_ldata.bge_tx_ring, BGE_TX_RING_SZ); /* Load the address of the TX ring */ @@ -2176,10 +2176,10 @@ error = bus_dmamem_alloc(sc->bge_cdata.bge_status_tag, (void **)&sc->bge_ldata.bge_status_block, BUS_DMA_NOWAIT, &sc->bge_cdata.bge_status_map); - if (error) - return (ENOMEM); + if (error) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 4 04:55:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5960616A4D1; Thu, 4 Nov 2004 04:55:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1676716A4CF for ; Thu, 4 Nov 2004 04:55:13 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF6D743D1F for ; Thu, 4 Nov 2004 04:55:12 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA44tCNP069002 for ; Thu, 4 Nov 2004 04:55:12 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA44tBt6068999 for perforce@freebsd.org; Thu, 4 Nov 2004 04:55:11 GMT (envelope-from marcel@freebsd.org) Date: Thu, 4 Nov 2004 04:55:11 GMT Message-Id: <200411040455.iA44tBt6068999@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 04:55:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=64192 Change 64192 by marcel@marcel_nfs on 2004/11/04 04:54:58 Make uart_intr_break(), uart_intr_overrun(), uart_intr_rxready(), uart_intr_sigchg() and uart_intr_txidle() inlines and change the argument to void* so as to match the prototype of interrupt handlers. Also have them call swi_sched() so that there's no more dependency on uart_intr(). The whole point being that puc(4) or scc(4) can synthesize 5 IRQ resources for uart(4) to attach to with these functions so that puc(4) or scc(4) can poll the hardware and call the specific interrupt handlers for each interrupt source. This gives puc(4) or scc(4) the ability to prioritize across different devices or channels. Affected files ... .. //depot/projects/uart/dev/uart/uart_core.c#36 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_core.c#36 (text+ko) ==== @@ -79,9 +79,10 @@ * the exceptional nature of the break condition, so we permit ourselves * to be sloppy. */ -static void -uart_intr_break(struct uart_softc *sc) +static __inline void +uart_intr_break(void *arg) { + struct uart_softc *sc = arg; #if defined(KDB) && defined(BREAK_TO_DEBUGGER) if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) { @@ -89,8 +90,10 @@ return; } #endif - if (sc->sc_opened) + if (sc->sc_opened) { atomic_set_32(&sc->sc_ttypend, UART_IPEND_BREAK); + swi_sched(sc->sc_softih, 0); + } } /* @@ -108,15 +111,17 @@ * token represents the loss of at least one, but possible more bytes in * the input stream. */ -static void -uart_intr_overrun(struct uart_softc *sc) +static __inline void +uart_intr_overrun(void *arg) { + struct uart_softc *sc = arg; if (sc->sc_opened) { UART_RECEIVE(sc); if (uart_rx_put(sc, UART_STAT_OVERRUN)) sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN; atomic_set_32(&sc->sc_ttypend, UART_IPEND_RXREADY); + swi_sched(sc->sc_softih, 0); } UART_FLUSH(sc, UART_FLUSH_RECEIVER); } @@ -124,9 +129,10 @@ /* * Received data ready. */ -static void -uart_intr_rxready(struct uart_softc *sc) +static __inline void +uart_intr_rxready(void *arg) { + struct uart_softc *sc = arg; int rxp; rxp = sc->sc_rxput; @@ -141,9 +147,10 @@ } } #endif - if (sc->sc_opened) + if (sc->sc_opened) { atomic_set_32(&sc->sc_ttypend, UART_IPEND_RXREADY); - else + swi_sched(sc->sc_softih, 0); + } else sc->sc_rxput = sc->sc_rxget; /* Ignore received data. */ } @@ -154,9 +161,10 @@ * bits. This is to avoid loosing state transitions due to having more * than 1 hardware interrupt between software interrupts. */ -static void -uart_intr_sigchg(struct uart_softc *sc) +static __inline void +uart_intr_sigchg(void *arg) { + struct uart_softc *sc = arg; int new, old, sig; sig = UART_GETSIG(sc); @@ -169,23 +177,37 @@ } } + /* + * Keep track of signal changes, even when the device is not + * opened. This allows us to inform upper layers about a + * possible loss of DCD and thus the existence of a (possibly) + * different connection when we have DCD back, during the time + * that the device was closed. + */ do { old = sc->sc_ttypend; new = old & ~UART_SIGMASK_STATE; new |= sig & UART_IPEND_SIGMASK; new |= UART_IPEND_SIGCHG; } while (!atomic_cmpset_32(&sc->sc_ttypend, old, new)); + if (sc->sc_opened) + swi_sched(sc->sc_softih, 0); } /* * The transmitter can accept more data. */ -static void -uart_intr_txidle(struct uart_softc *sc) +static __inline void +uart_intr_txidle(void *arg) { + struct uart_softc *sc = arg; + if (sc->sc_txbusy) { sc->sc_txbusy = 0; - atomic_set_32(&sc->sc_ttypend, UART_IPEND_TXIDLE); + if (sc->sc_opened) { + atomic_set_32(&sc->sc_ttypend, UART_IPEND_TXIDLE); + swi_sched(sc->sc_softih, 0); + } } } @@ -195,13 +217,7 @@ struct uart_softc *sc = arg; int ipend; - if (sc->sc_leaving) - return; - - do { - ipend = UART_IPEND(sc); - if (ipend == 0) - break; + while (!sc->sc_leaving && (ipend = UART_IPEND(sc)) != 0) { if (ipend & UART_IPEND_OVERRUN) uart_intr_overrun(sc); if (ipend & UART_IPEND_BREAK) @@ -212,10 +228,7 @@ uart_intr_sigchg(sc); if (ipend & UART_IPEND_TXIDLE) uart_intr_txidle(sc); - } while (1); - - if (sc->sc_opened && sc->sc_ttypend != 0) - swi_sched(sc->sc_softih, 0); + } } int From owner-p4-projects@FreeBSD.ORG Thu Nov 4 19:22:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2A7916A4D0; Thu, 4 Nov 2004 19:22:25 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9EB0A16A4CE for ; Thu, 4 Nov 2004 19:22:25 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F72143D1D for ; Thu, 4 Nov 2004 19:22:25 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4JMPE2029268 for ; Thu, 4 Nov 2004 19:22:25 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4JMPtm029265 for perforce@freebsd.org; Thu, 4 Nov 2004 19:22:25 GMT (envelope-from arr@freebsd.org) Date: Thu, 4 Nov 2004 19:22:25 GMT Message-Id: <200411041922.iA4JMPtm029265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 64251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 19:22:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=64251 Change 64251 by arr@arr_audit3_d400laptop on 2004/11/04 19:22:01 Fix syscalls.master and regenerate related files because I completely dorked the recent integration. - Remove duplicate audit system calls - Fix a link/unlink calls to be marked M for MP-safe - Fix thr_*() calls to use a long type instead of thr_id_t - Change wait4 to use wait_args struct Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#8 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#9 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.178 2004/10/23 20:01:32 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.178 2004/10/23 20:00:43 rwatson Exp */ @@ -38,15 +38,15 @@ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ { SYF_MPSAFE | AS(wait_args), (sy_call_t *)wait4, AUE_NULL }, /* 7 = wait4 */ { compat(SYF_MPSAFE | AS(ocreat_args),creat) }, /* 8 = old creat */ - { SYF_MPSAFE | AS(link_args), (sy_call_t *)link }, /* 9 = link */ - { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown }, /* 16 = chown */ - { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak }, /* 17 = break */ + { SYF_MPSAFE | AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ + { SYF_MPSAFE | AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ + { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ + { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ + { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ + { SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ { compat4(AS(freebsd4_getfsstat_args),getfsstat) }, /* 18 = old getfsstat */ { compat(AS(olseek_args),lseek) }, /* 19 = old lseek */ { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ @@ -374,106 +374,106 @@ { compat4(SYF_MPSAFE | AS(freebsd4_sigaction_args),sigaction) }, /* 342 = old sigaction */ { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING }, /* 343 = sigpending */ { compat4(SYF_MPSAFE | AS(freebsd4_sigreturn_args),sigreturn) }, /* 344 = old sigreturn */ - { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait }, /* 345 = sigtimedwait */ - { SYF_MPSAFE | AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo }, /* 346 = sigwaitinfo */ - { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file }, /* 347 = __acl_get_file */ - { SYF_MPSAFE | AS(__acl_set_file_args), (sy_call_t *)__acl_set_file }, /* 348 = __acl_set_file */ - { SYF_MPSAFE | AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd }, /* 349 = __acl_get_fd */ - { SYF_MPSAFE | AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd }, /* 350 = __acl_set_fd */ - { SYF_MPSAFE | AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file }, /* 351 = __acl_delete_file */ - { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd }, /* 352 = __acl_delete_fd */ - { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file }, /* 353 = __acl_aclcheck_file */ - { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file }, /* 358 = extattr_delete_file */ - { AS(aio_waitcomplete_args), (sy_call_t *)lkmressys }, /* 359 = aio_waitcomplete */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid }, /* 360 = getresuid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid }, /* 361 = getresgid */ - { SYF_MPSAFE | 0, (sy_call_t *)kqueue }, /* 362 = kqueue */ - { SYF_MPSAFE | AS(kevent_args), (sy_call_t *)kevent }, /* 363 = kevent */ - { 0, (sy_call_t *)nosys }, /* 364 = __cap_get_proc */ - { 0, (sy_call_t *)nosys }, /* 365 = __cap_set_proc */ - { 0, (sy_call_t *)nosys }, /* 366 = __cap_get_fd */ - { 0, (sy_call_t *)nosys }, /* 367 = __cap_get_file */ - { 0, (sy_call_t *)nosys }, /* 368 = __cap_set_fd */ - { 0, (sy_call_t *)nosys }, /* 369 = __cap_set_file */ - { AS(nosys_args), (sy_call_t *)lkmressys }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd }, /* 373 = extattr_delete_fd */ - { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid }, /* 374 = __setugid */ - { AS(nfsclnt_args), (sy_call_t *)nosys }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess }, /* 376 = eaccess */ - { 0, (sy_call_t *)nosys }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount }, /* 378 = nmount */ - { SYF_MPSAFE | 0, (sy_call_t *)kse_exit }, /* 379 = kse_exit */ - { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup }, /* 380 = kse_wakeup */ - { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create }, /* 381 = kse_create */ - { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt }, /* 382 = kse_thr_interrupt */ - { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release }, /* 383 = kse_release */ - { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc }, /* 384 = __mac_get_proc */ - { SYF_MPSAFE | AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc }, /* 385 = __mac_set_proc */ - { SYF_MPSAFE | AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd }, /* 386 = __mac_get_fd */ - { SYF_MPSAFE | AS(__mac_get_file_args), (sy_call_t *)__mac_get_file }, /* 387 = __mac_get_file */ - { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd }, /* 388 = __mac_set_fd */ - { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ - { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ - { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ - { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ - { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ - { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs }, /* 398 = fhstatfs */ - { 0, (sy_call_t *)nosys }, /* 399 = nosys */ - { SYF_MPSAFE | AS(ksem_close_args), (sy_call_t *)lkmressys }, /* 400 = ksem_close */ - { SYF_MPSAFE | AS(ksem_post_args), (sy_call_t *)lkmressys }, /* 401 = ksem_post */ - { SYF_MPSAFE | AS(ksem_wait_args), (sy_call_t *)lkmressys }, /* 402 = ksem_wait */ - { SYF_MPSAFE | AS(ksem_trywait_args), (sy_call_t *)lkmressys }, /* 403 = ksem_trywait */ - { SYF_MPSAFE | AS(ksem_init_args), (sy_call_t *)lkmressys }, /* 404 = ksem_init */ - { SYF_MPSAFE | AS(ksem_open_args), (sy_call_t *)lkmressys }, /* 405 = ksem_open */ - { SYF_MPSAFE | AS(ksem_unlink_args), (sy_call_t *)lkmressys }, /* 406 = ksem_unlink */ - { SYF_MPSAFE | AS(ksem_getvalue_args), (sy_call_t *)lkmressys }, /* 407 = ksem_getvalue */ - { SYF_MPSAFE | AS(ksem_destroy_args), (sy_call_t *)lkmressys }, /* 408 = ksem_destroy */ - { SYF_MPSAFE | AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid }, /* 409 = __mac_get_pid */ - { SYF_MPSAFE | AS(__mac_get_link_args), (sy_call_t *)__mac_get_link }, /* 410 = __mac_get_link */ - { SYF_MPSAFE | AS(__mac_set_link_args), (sy_call_t *)__mac_set_link }, /* 411 = __mac_set_link */ - { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link }, /* 412 = extattr_set_link */ - { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link }, /* 413 = extattr_get_link */ - { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link }, /* 414 = extattr_delete_link */ - { SYF_MPSAFE | AS(__mac_execve_args), (sy_call_t *)__mac_execve }, /* 415 = __mac_execve */ - { SYF_MPSAFE | AS(sigaction_args), (sy_call_t *)sigaction }, /* 416 = sigaction */ - { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 417 = sigreturn */ - { 0, (sy_call_t *)nosys }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys }, /* 420 = __xlstat */ - { SYF_MPSAFE | AS(getcontext_args), (sy_call_t *)getcontext }, /* 421 = getcontext */ - { SYF_MPSAFE | AS(setcontext_args), (sy_call_t *)setcontext }, /* 422 = setcontext */ - { SYF_MPSAFE | AS(swapcontext_args), (sy_call_t *)swapcontext }, /* 423 = swapcontext */ - { SYF_MPSAFE | AS(swapoff_args), (sy_call_t *)swapoff }, /* 424 = swapoff */ - { SYF_MPSAFE | AS(__acl_get_link_args), (sy_call_t *)__acl_get_link }, /* 425 = __acl_get_link */ - { SYF_MPSAFE | AS(__acl_set_link_args), (sy_call_t *)__acl_set_link }, /* 426 = __acl_set_link */ - { SYF_MPSAFE | AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link }, /* 427 = __acl_delete_link */ - { SYF_MPSAFE | AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link }, /* 428 = __acl_aclcheck_link */ - { SYF_MPSAFE | AS(sigwait_args), (sy_call_t *)sigwait }, /* 429 = sigwait */ - { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create }, /* 430 = thr_create */ - { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit }, /* 431 = thr_exit */ - { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self }, /* 432 = thr_self */ - { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill }, /* 433 = thr_kill */ - { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock }, /* 434 = _umtx_lock */ - { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock }, /* 435 = _umtx_unlock */ - { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach }, /* 436 = jail_attach */ - { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd }, /* 437 = extattr_list_fd */ - { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file }, /* 438 = extattr_list_file */ - { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link }, /* 439 = extattr_list_link */ - { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin }, /* 440 = kse_switchin */ - { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys }, /* 441 = ksem_timedwait */ - { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ - { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ - { SYF_MPSAFE | AS(kldunloadf_args), (sy_call_t *)kldunloadf }, /* 444 = kldunloadf */ + { SYF_MPSAFE | AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_NULL }, /* 345 = sigtimedwait */ + { SYF_MPSAFE | AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL }, /* 346 = sigwaitinfo */ + { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL }, /* 347 = __acl_get_file */ + { SYF_MPSAFE | AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL }, /* 348 = __acl_set_file */ + { SYF_MPSAFE | AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL }, /* 349 = __acl_get_fd */ + { SYF_MPSAFE | AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL }, /* 350 = __acl_set_fd */ + { SYF_MPSAFE | AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL }, /* 351 = __acl_delete_file */ + { SYF_MPSAFE | AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ + { SYF_MPSAFE | AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ + { SYF_MPSAFE | AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ + { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ + { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ + { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ + { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ + { AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 359 = aio_waitcomplete */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 360 = getresuid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 361 = getresgid */ + { SYF_MPSAFE | 0, (sy_call_t *)kqueue, AUE_NULL }, /* 362 = kqueue */ + { SYF_MPSAFE | AS(kevent_args), (sy_call_t *)kevent, AUE_NULL }, /* 363 = kevent */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 364 = __cap_get_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 365 = __cap_set_proc */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 366 = __cap_get_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 367 = __cap_get_file */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ + { AS(nosys_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 370 = lkmressys */ + { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ + { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ + { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ + { SYF_MPSAFE | AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ + { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ + { AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL }, /* 376 = eaccess */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ + { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL }, /* 378 = nmount */ + { SYF_MPSAFE | 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ + { SYF_MPSAFE | AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ + { SYF_MPSAFE | AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ + { SYF_MPSAFE | AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL }, /* 382 = kse_thr_interrupt */ + { SYF_MPSAFE | AS(kse_release_args), (sy_call_t *)kse_release, AUE_NULL }, /* 383 = kse_release */ + { SYF_MPSAFE | AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL }, /* 384 = __mac_get_proc */ + { SYF_MPSAFE | AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL }, /* 385 = __mac_set_proc */ + { SYF_MPSAFE | AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL }, /* 386 = __mac_get_fd */ + { SYF_MPSAFE | AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL }, /* 387 = __mac_get_file */ + { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL }, /* 388 = __mac_set_fd */ + { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL }, /* 389 = __mac_set_file */ + { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL }, /* 390 = kenv */ + { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS }, /* 391 = lchflags */ + { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL }, /* 392 = uuidgen */ + { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile, AUE_NULL }, /* 393 = sendfile */ + { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL }, /* 394 = mac_syscall */ + { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT }, /* 395 = getfsstat */ + { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS }, /* 396 = statfs */ + { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS }, /* 397 = fstatfs */ + { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL }, /* 398 = fhstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 399 = nosys */ + { SYF_MPSAFE | AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 400 = ksem_close */ + { SYF_MPSAFE | AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 401 = ksem_post */ + { SYF_MPSAFE | AS(ksem_wait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 402 = ksem_wait */ + { SYF_MPSAFE | AS(ksem_trywait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 403 = ksem_trywait */ + { SYF_MPSAFE | AS(ksem_init_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 404 = ksem_init */ + { SYF_MPSAFE | AS(ksem_open_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 405 = ksem_open */ + { SYF_MPSAFE | AS(ksem_unlink_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 406 = ksem_unlink */ + { SYF_MPSAFE | AS(ksem_getvalue_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 407 = ksem_getvalue */ + { SYF_MPSAFE | AS(ksem_destroy_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 408 = ksem_destroy */ + { SYF_MPSAFE | AS(__mac_get_pid_args), (sy_call_t *)__mac_get_pid, AUE_NULL }, /* 409 = __mac_get_pid */ + { SYF_MPSAFE | AS(__mac_get_link_args), (sy_call_t *)__mac_get_link, AUE_NULL }, /* 410 = __mac_get_link */ + { SYF_MPSAFE | AS(__mac_set_link_args), (sy_call_t *)__mac_set_link, AUE_NULL }, /* 411 = __mac_set_link */ + { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_NULL }, /* 412 = extattr_set_link */ + { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_NULL }, /* 413 = extattr_get_link */ + { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_NULL }, /* 414 = extattr_delete_link */ + { SYF_MPSAFE | AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL }, /* 415 = __mac_execve */ + { SYF_MPSAFE | AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION }, /* 416 = sigaction */ + { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN }, /* 417 = sigreturn */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 418 = __xstat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 419 = __xfstat */ + { 0, (sy_call_t *)nosys, AUE_NULL }, /* 420 = __xlstat */ + { SYF_MPSAFE | AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL }, /* 421 = getcontext */ + { SYF_MPSAFE | AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL }, /* 422 = setcontext */ + { SYF_MPSAFE | AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL }, /* 423 = swapcontext */ + { SYF_MPSAFE | AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF }, /* 424 = swapoff */ + { SYF_MPSAFE | AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL }, /* 425 = __acl_get_link */ + { SYF_MPSAFE | AS(__acl_set_link_args), (sy_call_t *)__acl_set_link, AUE_NULL }, /* 426 = __acl_set_link */ + { SYF_MPSAFE | AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL }, /* 427 = __acl_delete_link */ + { SYF_MPSAFE | AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL }, /* 428 = __acl_aclcheck_link */ + { SYF_MPSAFE | AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT }, /* 429 = sigwait */ + { SYF_MPSAFE | AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL }, /* 430 = thr_create */ + { SYF_MPSAFE | AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL }, /* 431 = thr_exit */ + { SYF_MPSAFE | AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL }, /* 432 = thr_self */ + { SYF_MPSAFE | AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL }, /* 433 = thr_kill */ + { SYF_MPSAFE | AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL }, /* 434 = _umtx_lock */ + { SYF_MPSAFE | AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL }, /* 435 = _umtx_unlock */ + { SYF_MPSAFE | AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL }, /* 436 = jail_attach */ + { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_NULL }, /* 437 = extattr_list_fd */ + { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_NULL }, /* 438 = extattr_list_file */ + { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_NULL }, /* 439 = extattr_list_link */ + { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin, AUE_NULL }, /* 440 = kse_switchin */ + { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 441 = ksem_timedwait */ + { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL }, /* 442 = thr_suspend */ + { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL }, /* 443 = thr_wake */ + { SYF_MPSAFE | AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL }, /* 444 = kldunloadf */ { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit, AUE_AUDIT }, /* 445 = audit */ { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON }, /* 446 = auditon */ { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID }, /* 447 = getauid */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.164 2004/10/23 20:01:32 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.178 2004/10/23 20:00:43 rwatson Exp */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#8 (text+ko) ==== @@ -62,10 +62,10 @@ ; XXX man page says `mode_t mode'. 6 MSTD { int close(int fd); } AUE_CLOSE 7 MSTD { int wait4(int pid, int *status, int options, \ - struct rusage *rusage); } AUE_NULL wait4 wait4_args int + struct rusage *rusage); } AUE_NULL wait4 wait_args int 8 MCOMPAT { int creat(char *path, int mode); } AUE_CREAT -9 STD { int link(char *path, char *link); } AUE_LINK -10 STD { int unlink(char *path); } AUE_UNLINK +9 MSTD { int link(char *path, char *link); } AUE_LINK +10 MSTD { int unlink(char *path); } AUE_UNLINK 11 OBSOL execv 12 STD { int chdir(char *path); } AUE_CHDIR 13 STD { int fchdir(int fd); } AUE_FCHDIR @@ -675,11 +675,11 @@ 428 MSTD { int __acl_aclcheck_link(const char *path, \ acl_type_t type, struct acl *aclp); } AUE_NULL 429 MSTD { int sigwait(const sigset_t *set, int *sig); } AUE_SIGWAIT -430 MSTD { int thr_create(ucontext_t *ctx, thr_id_t *id, int flags); } \ +430 MSTD { int thr_create(ucontext_t *ctx, long *id, int flags); } \ AUE_NULL -431 MSTD { void thr_exit(void); } AUE_NULL -432 MSTD { int thr_self(thr_id_t *id); } AUE_NULL -433 MSTD { int thr_kill(thr_id_t id, int sig); } AUE_NULL +431 MSTD { void thr_exit(long *state); } AUE_NULL +432 MSTD { int thr_self(long *id); } AUE_NULL +433 MSTD { int thr_kill(long id, int sig); } AUE_NULL 434 MSTD { int _umtx_lock(struct umtx *umtx); } AUE_NULL 435 MSTD { int _umtx_unlock(struct umtx *umtx); } AUE_NULL 436 MSTD { int jail_attach(int jid); } AUE_NULL @@ -706,16 +706,5 @@ 452 MSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } AUE_SETAUDIT_ADDR 453 MSTD { int auditctl(int cmd, char *path); } AUE_AUDITCTL -445 MSTD { int audit(const void *record, u_int length); } -446 MSTD { int auditon(int cmd, void *data, u_int length); } -447 MSTD { int getauid(uid_t *auid); } -448 MSTD { int setauid(uid_t *auid); } -449 MSTD { int getaudit(struct auditinfo *auditinfo); } -450 MSTD { int setaudit(struct auditinfo *auditinfo); } -451 MSTD { int getaudit_addr(struct auditinfo_addr \ - *auditinfo_addr, u_int length); } -452 MSTD { int setaudit_addr(struct auditinfo_addr \ - *auditinfo_addr, u_int length); } -453 MSTD { int auditctl(int cmd, char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.162 2004/10/23 20:01:32 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.178 2004/10/23 20:00:43 rwatson Exp */ ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#9 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.117 2004/10/23 20:01:32 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.178 2004/10/23 20:00:43 rwatson Exp MIASM = \ syscall.o \ ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.161 2004/10/23 20:01:32 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.178 2004/10/23 20:00:43 rwatson Exp */ From owner-p4-projects@FreeBSD.ORG Thu Nov 4 21:08:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEF9616A4D0; Thu, 4 Nov 2004 21:08:40 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90A4B16A4CE for ; Thu, 4 Nov 2004 21:08:40 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A4A743D31 for ; Thu, 4 Nov 2004 21:08:40 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4L8eEs038966 for ; Thu, 4 Nov 2004 21:08:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4L8d7x038963 for perforce@freebsd.org; Thu, 4 Nov 2004 21:08:39 GMT (envelope-from jhb@freebsd.org) Date: Thu, 4 Nov 2004 21:08:39 GMT Message-Id: <200411042108.iA4L8d7x038963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 21:08:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=64257 Change 64257 by jhb@jhb_slimer on 2004/11/04 21:07:58 IFC @64254 (loop back some merges). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/db_trace.c#15 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#43 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#31 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#11 integrate .. //depot/projects/smpng/sys/arm/arm/db_trace.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/smpng/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#2 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#3 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/smpng/sys/arm/include/endian.h#6 integrate .. //depot/projects/smpng/sys/arm/include/param.h#6 integrate .. //depot/projects/smpng/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/smpng/sys/arm/include/reg.h#2 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/arc/lib/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#8 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biospci.c#3 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#6 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/conf.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#4 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#25 integrate .. //depot/projects/smpng/sys/conf/NOTES#84 integrate .. //depot/projects/smpng/sys/conf/files#126 integrate .. //depot/projects/smpng/sys/conf/files.i386#69 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#44 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#41 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#36 integrate .. //depot/projects/smpng/sys/conf/options#88 integrate .. //depot/projects/smpng/sys/contrib/dev/hptmv/access601.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/array.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/atapi.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/command.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/hptproc.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/ioctl.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvSata.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/raid5n.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/readme.txt#1 branch .. //depot/projects/smpng/sys/contrib/dev/hptmv/vdevice.h#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/smpng/sys/crypto/rijndael/Makefile#2 integrate .. //depot/projects/smpng/sys/ddb/db_output.c#14 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#29 integrate .. //depot/projects/smpng/sys/ddb/db_thread.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_variables.c#6 integrate .. //depot/projects/smpng/sys/ddb/ddb.h#13 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#33 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#20 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#10 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#12 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#48 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#25 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons.h#4 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#39 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#8 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/global.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/hptintf.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/mv.c#1 branch .. //depot/projects/smpng/sys/dev/hptmv/mvOs.h#1 branch .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#1 branch .. //depot/projects/smpng/sys/dev/mcd/mcd.c#10 integrate .. //depot/projects/smpng/sys/dev/md/md.c#58 integrate .. //depot/projects/smpng/sys/dev/patm/genrtab/Makefile#4 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#45 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/smpng/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/smpng/sys/dev/usb/ehci.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#34 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#65 integrate .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#27 integrate .. //depot/projects/smpng/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/smpng/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/smpng/sys/dev/vinum/request.h#3 delete .. //depot/projects/smpng/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/smpng/sys/dev/vinum/vinum.c#19 delete .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#22 delete .. //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#8 delete .. //depot/projects/smpng/sys/dev/vinum/vinumext.h#13 delete .. //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#6 delete .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#21 delete .. //depot/projects/smpng/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#19 delete .. //depot/projects/smpng/sys/dev/vinum/vinumkw.h#4 delete .. //depot/projects/smpng/sys/dev/vinum/vinumlock.c#5 delete .. //depot/projects/smpng/sys/dev/vinum/vinummemory.c#10 delete .. //depot/projects/smpng/sys/dev/vinum/vinumobj.h#8 delete .. //depot/projects/smpng/sys/dev/vinum/vinumparser.c#6 delete .. //depot/projects/smpng/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#17 delete .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#11 delete .. //depot/projects/smpng/sys/dev/vinum/vinumstate.c#5 delete .. //depot/projects/smpng/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/smpng/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/smpng/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#10 delete .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#34 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs.h#8 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#22 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#17 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#34 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#11 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs.h#7 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#18 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#23 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#16 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#40 delete .. //depot/projects/smpng/sys/fs/udf/udf.h#6 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#17 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#20 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#18 integrate .. //depot/projects/smpng/sys/geom/geom.h#40 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#14 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#35 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#27 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#45 integrate .. //depot/projects/smpng/sys/geom/geom_vfs.c#1 branch .. //depot/projects/smpng/sys/geom/geom_vfs.h#1 branch .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#8 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#14 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#5 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#37 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#25 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#7 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#20 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#58 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#91 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#30 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#81 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#74 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#76 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#24 integrate .. //depot/projects/smpng/sys/ia64/ia64/db_trace.c#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#16 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#12 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#5 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#14 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#7 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#32 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#19 integrate .. //depot/projects/smpng/sys/isofs/cd9660/iso.h#8 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#87 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#36 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#16 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#45 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#43 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#73 integrate .. //depot/projects/smpng/sys/kern/subr_unit.c#2 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#47 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#48 integrate .. //depot/projects/smpng/sys/kern/sysv_ipc.c#13 integrate .. //depot/projects/smpng/sys/kern/tty.c#52 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#11 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#60 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#38 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#61 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#52 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#70 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#34 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#29 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#52 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#18 integrate .. //depot/projects/smpng/sys/modules/Makefile#85 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahd/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/hptmv/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/smbfs/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/smpng/sys/modules/vinum/Makefile#4 delete .. //depot/projects/smpng/sys/net/if.c#57 integrate .. //depot/projects/smpng/sys/net/if_tap.c#30 integrate .. //depot/projects/smpng/sys/net/if_tun.c#37 integrate .. //depot/projects/smpng/sys/net/if_var.h#32 integrate .. //depot/projects/smpng/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#8 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_var.h#5 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#5 integrate .. //depot/projects/smpng/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#26 integrate .. //depot/projects/smpng/sys/netgraph/ng_cisco.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#22 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#40 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#44 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#32 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_seq.h#8 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#57 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#35 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#19 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#30 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#51 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#18 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#8 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vnops.c#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#41 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#43 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#10 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#36 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#49 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#10 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#72 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#39 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#17 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#17 integrate .. //depot/projects/smpng/sys/pci/agp.c#23 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#17 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#36 integrate .. //depot/projects/smpng/sys/pci/if_skreg.h#8 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#32 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/powerpc/include/elf.h#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#11 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#30 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#14 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#25 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#48 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#10 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebusreg.h#1 branch .. //depot/projects/smpng/sys/sparc64/isa/isa_dma.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#53 integrate .. //depot/projects/smpng/sys/sys/buf.h#31 integrate .. //depot/projects/smpng/sys/sys/bufobj.h#2 integrate .. //depot/projects/smpng/sys/sys/conf.h#35 integrate .. //depot/projects/smpng/sys/sys/kernel.h#26 integrate .. //depot/projects/smpng/sys/sys/ktr.h#16 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#26 integrate .. //depot/projects/smpng/sys/sys/mount.h#33 integrate .. //depot/projects/smpng/sys/sys/param.h#74 integrate .. //depot/projects/smpng/sys/sys/proc.h#133 integrate .. //depot/projects/smpng/sys/sys/syscall.h#47 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#47 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#49 integrate .. //depot/projects/smpng/sys/sys/systm.h#57 integrate .. //depot/projects/smpng/sys/sys/ttydefaults.h#6 integrate .. //depot/projects/smpng/sys/sys/vnode.h#50 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#31 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#41 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#36 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#61 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#35 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#41 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#11 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#50 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#49 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#28 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#31 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#59 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#58 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#27 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#50 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#21 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#43 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#15 (text+ko) ==== @@ -42,7 +42,7 @@ #include /* RCS ID & Copyright macro defns */ /*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#43 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $ machine alpha cpu EV4 @@ -66,7 +66,7 @@ options GEOM_GPT #GUID Partition Tables. options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.11 2004/11/03 18:03:06 scottl Exp $ */ /* @@ -166,8 +166,8 @@ * argument for counting hardware interrupts when they're * processed too. */ - atomic_add_long(isrc->is_count, 1); - atomic_add_int(&cnt.v_intr, 1); + (*isrc->is_count)++; + cnt.v_intr++; it = isrc->is_ithread; if (it == NULL) @@ -219,7 +219,7 @@ error = ithread_schedule(it); } if (error == EINVAL) { - atomic_add_long(isrc->is_straycount, 1); + (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) log(LOG_ERR, "stray irq%d\n", vector); else if (*isrc->is_straycount == MAX_STRAY_LOG) ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#31 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.621 2004/09/24 01:11:11 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.622 2004/10/28 12:16:03 simokawa Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -823,6 +823,7 @@ char *cp; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; + quad_t dcons_addr, dcons_size; bzero(physmap, sizeof(physmap)); basemem = 0; @@ -968,6 +969,13 @@ pte = CMAP1; /* + * Get dcons buffer address + */ + if (getenv_quad("dcons.addr", &dcons_addr) == 0 || + getenv_quad("dcons.size", &dcons_size) == 0) + dcons_addr = 0; + + /* * physmap is in bytes, so when converting to page boundaries, * round up the start address and round down the end address. */ @@ -987,6 +995,14 @@ if (pa >= 0x100000 && pa < first) continue; + /* + * block out dcons buffer + */ + if (dcons_addr > 0 + && pa >= trunc_page(dcons_addr) + && pa < dcons_addr + dcons_size) + continue; + page_bad = FALSE; /* ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#25 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $ machine amd64 cpu HAMMER @@ -48,7 +48,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#7 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.44 2003/12/07 04:51:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $ */ @@ -57,7 +57,7 @@ #define DFLDSIZ (128UL*1024*1024) /* initial data size limit */ #endif #ifndef MAXDSIZ -#define MAXDSIZ (8192UL*1024*1024) /* max data size */ +#define MAXDSIZ (32768UL*1024*1024) /* max data size */ #endif #ifndef DFLSSIZ #define DFLSSIZ (8UL*1024*1024) /* initial stack size limit */ ==== //depot/projects/smpng/sys/amd64/pci/pci_bus.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.112 2004/10/31 15:50:32 des Exp $"); #include "opt_cpu.h" @@ -117,7 +117,7 @@ * via some other means. If we have, bail since otherwise * we're going to end up duplicating it. */ - if ((pci_devclass = devclass_find("pci")) && + if ((pci_devclass = devclass_find("pci")) && devclass_get_device(pci_devclass, 0)) return; @@ -136,7 +136,7 @@ */ if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) continue; - if ((hdrtype & PCIM_MFDEV) && + if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) pcifunchigh = PCI_FUNCMAX; else @@ -266,10 +266,9 @@ SYSCTL_DECL(_hw_pci); -static int legacy_host_mem_start = 0x80000000; -/* No TUNABLE_ULONG :-( */ -TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start); -SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, +static unsigned long legacy_host_mem_start = 0x80000000; +TUNABLE_ULONG("hw.pci.host_mem_start", &legacy_host_mem_start); +SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &legacy_host_mem_start, 0x80000000, "Limit the host bridge memory to being above this address. Must be\n\ set at boot via a tunable."); @@ -394,12 +393,12 @@ /* * Install placeholder to claim the resources owned by the - * PCI bus interface. This could be used to extract the + * PCI bus interface. This could be used to extract the * config space registers in the extreme case where the PnP * ID is available and the PCI BIOS isn't, but for now we just * eat the PnP ID and do nothing else. * - * XXX we should silence this probe, as it will generally confuse + * XXX we should silence this probe, as it will generally confuse * people. */ static struct isa_pnp_id pcibus_pnp_ids[] = { @@ -411,7 +410,7 @@ pcibus_pnp_probe(device_t dev) { int result; - + if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0) device_quiet(dev); return(result); ==== //depot/projects/smpng/sys/arm/arm/db_trace.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $"); #include #include ==== //depot/projects/smpng/sys/arm/arm/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.4 2004/09/23 22:03:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.5 2004/11/04 18:48:52 cognet Exp $"); #include #include @@ -155,13 +155,13 @@ case R_ARM_NONE: /* none */ break; - case R_ARM_PC24: /* S + A - P */ + case R_ARM_ABS32: addr = lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend - (Elf_Addr)where; if (*where != addr) *where = addr; + break; case R_ARM_COPY: /* none */ @@ -173,14 +173,13 @@ return -1; break; - case R_ARM_GLOB_DAT: /* S */ + case R_ARM_JUMP_SLOT: addr = lookup(lf, symidx, 1); - if (addr == 0) - return -1; - if (*where != addr) + if (addr) { *where = addr; - break; - + return (0); + } + return (-1); case R_ARM_RELATIVE: break; @@ -212,6 +211,8 @@ elf_cpu_load_file(linker_file_t lf __unused) { + cpu_idcache_wbinv_all(); + cpu_tlb_flushID(); return (0); } ==== //depot/projects/smpng/sys/arm/arm/machdep.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.6 2004/09/23 22:12:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.7 2004/11/04 19:04:30 cognet Exp $"); #include #include @@ -90,17 +90,6 @@ int cold = 1; vm_offset_t vector_page; -static void * -getframe(struct thread *td, int sig, int *onstack) -{ - struct trapframe *tf = td->td_frame; - - *onstack = sigonstack(tf->tf_usr_sp); - if (*onstack) - return (void*)(td->td_sigstk.ss_sp + td->td_sigstk.ss_size); - return (void*)(tf->tf_usr_sp); -} - void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -115,7 +104,16 @@ struct sigacts *psp = td->td_proc->p_sigacts; int onstack; - fp = getframe(td, sig, &onstack); + onstack = sigonstack(td->td_frame->tf_usr_sp); + + if ((td->td_flags & TDP_ALTSTACK) && + !(onstack) && + SIGISMEMBER(td->td_proc->p_sigacts->ps_sigonstack, sig)) { + fp = (void*)(td->td_sigstk.ss_sp + td->td_sigstk.ss_size); + td->td_sigstk.ss_flags |= SS_ONSTACK; + } else + fp = (void*)td->td_frame->tf_usr_sp; + /* make room on the stack */ fp--; @@ -126,12 +124,11 @@ frame.sf_si.si_code = code; frame.sf_uc.uc_sigmask = *mask; frame.sf_uc.uc_link = NULL; - frame.sf_uc.uc_flags |= td->td_sigstk.ss_flags & SS_ONSTACK ? - _UC_SETSTACK : _UC_CLRSTACK; + frame.sf_uc.uc_flags = (td->td_pflags & TDP_ALTSTACK ) + ? ((onstack) ? SS_ONSTACK : 0) : SS_DISABLE; frame.sf_uc.uc_stack = td->td_sigstk; memset(&frame.sf_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack)); - get_mcontext(td, &frame.sf_uc.uc_mcontext, - (uint32_t)&frame.sf_uc.uc_flags); + get_mcontext(td, &frame.sf_uc.uc_mcontext, 0); PROC_UNLOCK(td->td_proc); mtx_unlock(&psp->ps_mtx); if (copyout(&frame, (void*)fp, sizeof(frame)) != 0) @@ -152,8 +149,6 @@ tf->tf_pc = (int)catcher; tf->tf_usr_sp = (int)fp; tf->tf_usr_lr = (int)(PS_STRINGS - *(p->p_sysent->sv_szsigcode)); - if (onstack) - td->td_sigstk.ss_flags |= SS_ONSTACK; PROC_LOCK(td->td_proc); mtx_lock(&psp->ps_mtx); } @@ -221,6 +216,7 @@ cpu_startup(void *dummy) { struct pcb *pcb = thread0.td_pcb; + vm_ksubmap_init(&kmi); bufinit(); vm_pager_bufferinit(); @@ -229,11 +225,11 @@ pcb->un_32.pcb32_sp = (u_int)thread0.td_kstack + USPACE_SVC_STACK_TOP; vector_page_setprot(VM_PROT_READ); - pmap_update(pmap_kernel()); pmap_set_pcb_pagedir(pmap_kernel(), pcb); cpu_setup(""); identify_arm_cpu(); thread0.td_frame = (struct trapframe *)pcb->un_32.pcb32_sp - 1; + } SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) @@ -241,6 +237,7 @@ void cpu_idle(void) { + cpu_sleep(0); } int @@ -266,7 +263,7 @@ { struct trapframe *tf = td->td_frame; - bcopy(regs->r, &tf->tf_r0, sizeof(*regs->r)); + bcopy(regs->r, &tf->tf_r0, sizeof(regs->r)); tf->tf_usr_sp = regs->r_sp; tf->tf_usr_lr = regs->r_lr; tf->tf_pc = regs->r_pc; @@ -340,7 +337,9 @@ void cpu_thread_siginfo(int sig, u_long code, siginfo_t *si) { - printf("cpu_thread_siginfo\n"); + bzero(si, sizeof(*si)); + si->si_signo = sig; + si->si_code = code; } /* @@ -352,8 +351,10 @@ struct trapframe *tf = td->td_frame; __greg_t *gr = mcp->__gregs; - /* Save General Register context. */ - gr[_REG_R0] = tf->tf_r0; + if (clear_ret & GET_MC_CLEAR_RET) + gr[_REG_R0] = 0; + else + gr[_REG_R0] = tf->tf_r0; gr[_REG_R1] = tf->tf_r1; gr[_REG_R2] = tf->tf_r2; gr[_REG_R3] = tf->tf_r3; @@ -383,7 +384,27 @@ int set_mcontext(struct thread *td, const mcontext_t *mcp) { - panic("SET_MCONTEXT AHAHAH\n"); + struct trapframe *tf = td->td_frame; + __greg_t *gr = mcp->__gregs; + + tf->tf_r0 = gr[_REG_R0]; + tf->tf_r1 = gr[_REG_R1]; + tf->tf_r2 = gr[_REG_R2]; + tf->tf_r3 = gr[_REG_R3]; + tf->tf_r4 = gr[_REG_R4]; + tf->tf_r5 = gr[_REG_R5]; + tf->tf_r6 = gr[_REG_R6]; + tf->tf_r7 = gr[_REG_R7]; + tf->tf_r8 = gr[_REG_R8]; + tf->tf_r9 = gr[_REG_R9]; + tf->tf_r10 = gr[_REG_R10]; + tf->tf_r11 = gr[_REG_R11]; + tf->tf_r12 = gr[_REG_R12]; + tf->tf_usr_sp = gr[_REG_SP]; + tf->tf_usr_lr = gr[_REG_LR]; + tf->tf_pc = gr[_REG_PC]; + tf->tf_spsr = gr[_REG_CPSR]; + return (0); } @@ -416,35 +437,7 @@ return (EINVAL); /* Restore register context. */ tf = td->td_frame; - memcpy((register_t *)tf + 1, &sf.sf_uc.uc_mcontext, sizeof(*tf) - - 4 * sizeof(register_t)); -#if 0 - tf->tf_r0 = context.sc_r0; - tf->tf_r1 = context.sc_r1; - tf->tf_r2 = context.sc_r2; - tf->tf_r3 = context.sc_r3; - tf->tf_r4 = context.sc_r4; - tf->tf_r5 = context.sc_r5; - tf->tf_r6 = context.sc_r6; - tf->tf_r7 = context.sc_r7; - tf->tf_r8 = context.sc_r8; - tf->tf_r9 = context.sc_r9; - tf->tf_r10 = context.sc_r10; - tf->tf_r11 = context.sc_r11; - tf->tf_r12 = context.sc_r12; - tf->tf_usr_sp = context.sc_usr_sp; - tf->tf_usr_lr = context.sc_usr_lr; - tf->tf_svc_lr = context.sc_svc_lr; - tf->tf_pc = context.sc_pc; -#endif - tf->tf_pc = sf.sf_uc.uc_mcontext.__gregs[_REG_PC]; - tf->tf_spsr = spsr; - - /* Restore signal stack. */ - if (sf.sf_uc.uc_flags & _UC_SETSTACK) - td->td_sigstk.ss_flags |= SS_ONSTACK; - else - td->td_sigstk.ss_flags &= ~SS_ONSTACK; + set_mcontext(td, &sf.sf_uc.uc_mcontext); /* Restore signal mask. */ PROC_LOCK(p); ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#5 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.4 2004/09/23 22:24:12 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.5 2004/11/04 18:59:02 cognet Exp $"); #include #include @@ -289,7 +289,21 @@ void cpu_set_upcall(struct thread *td, struct thread *td0) { - panic("set upcall\n"); + struct trapframe *tf; + struct switchframe *sf; + + bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe)); + bcopy(td0->td_pcb, td->td_pcb, sizeof(struct pcb)); + tf = td->td_frame; + sf = (struct switchframe *)tf - 1; + sf->sf_r4 = (u_int)fork_return; + sf->sf_r5 = (u_int)td; + sf->sf_pc = (u_int)fork_trampoline; + tf->tf_spsr &= ~PSR_C_bit; + tf->tf_r0 = 0; + td->td_pcb->un_32.pcb32_sp = (u_int)sf; + td->td_pcb->un_32.pcb32_und_sp = td->td_kstack + td->td_kstack_pages + * PAGE_SIZE - USPACE + USPACE_UNDEF_STACK_TOP; } /* @@ -300,7 +314,13 @@ void cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { - panic("setupcallkse\n"); + struct trapframe *tf = td->td_frame; + + tf->tf_usr_sp = ((int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size + - sizeof(struct trapframe)) & ~7; + tf->tf_pc = (int)ku->ku_func; + tf->tf_r0 = (int)ku->ku_mailbox; + tf->tf_spsr = PSR_USR32_MODE; } void @@ -311,10 +331,15 @@ void cpu_thread_setup(struct thread *td) { - td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * + td->td_pcb = (struct pcb *)(td->td_kstack + td->td_kstack_pages * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *) - ((u_int)td->td_kstack + USPACE_SVC_STACK_TOP) - 1; + ((u_int)td->td_kstack + td->td_kstack_pages * PAGE_SIZE - USPACE + + USPACE_SVC_STACK_TOP - sizeof(struct pcb)) - 1; +#ifdef __XSCALE__ + pmap_use_minicache(td->td_kstack, td->td_kstack_pages * PAGE_SIZE); +#endif + } void cpu_thread_clean(struct thread *td) ==== //depot/projects/smpng/sys/arm/conf/IQ31244#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.2 2004/10/01 16:51:37 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.3 2004/11/02 20:57:19 andre Exp $ machine arm ident IQ31244 @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/arm/conf/SIMICS#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.5 2004/11/02 20:57:19 andre Exp $ machine arm ident SIMICS @@ -50,7 +50,7 @@ #options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI #options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/arm/include/atomic.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.1 2004/05/14 11:46:44 cognet Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.2 2004/11/04 19:14:50 cognet Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -71,127 +71,116 @@ : "cc" ); \ } while(0) -static __inline void -atomic_set_32(volatile uint32_t *address, uint32_t setmask) +static __inline uint32_t +__swp(uint32_t val, volatile uint32_t *ptr) { - __with_interrupts_disabled( *address |= setmask); + __asm __volatile("swp %0, %1, [%2]" + : "=r" (val) : "r" (val) , "r" (ptr) : "memory"); + return (val); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:10:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C7BD16A4D0; Thu, 4 Nov 2004 22:10:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00C4D16A4CF for ; Thu, 4 Nov 2004 22:10:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D68E643D60 for ; Thu, 4 Nov 2004 22:10:04 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4MA4oO041020 for ; Thu, 4 Nov 2004 22:10:04 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4MA4fP041017 for perforce@freebsd.org; Thu, 4 Nov 2004 22:10:04 GMT (envelope-from arr@freebsd.org) Date: Thu, 4 Nov 2004 22:10:04 GMT Message-Id: <200411042210.iA4MA4fP041017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 64264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:10:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=64264 Change 64264 by arr@arr_audit3_d400laptop on 2004/11/04 22:09:20 auditctl(2) should be called via syscall(2) for now until we add libc support for AUDIT. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#2 (text+ko) ==== @@ -38,6 +38,8 @@ #include #include #include +#include +#include static void usage(void) @@ -59,7 +61,8 @@ path = NULL; else path = argv[1]; - if (auditctl(AC_SETLOGFILE, path) == -1) + /* if (auditctl(AC_SETLOGFILE, path) == -1) */ + if (syscall(SYS_auditctl, AC_SETLOGFILE, path) == -1) errx(-1, "%s: %s", path, strerror(errno)); exit(0); } From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:36:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B92E16A4D0; Thu, 4 Nov 2004 22:36:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 609C216A4CF for ; Thu, 4 Nov 2004 22:36:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 385EC43D5D for ; Thu, 4 Nov 2004 22:36:38 +0000 (GMT) (envelope-from arr@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4Mac30042042 for ; Thu, 4 Nov 2004 22:36:38 GMT (envelope-from arr@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4Mabsh042039 for perforce@freebsd.org; Thu, 4 Nov 2004 22:36:37 GMT (envelope-from arr@freebsd.org) Date: Thu, 4 Nov 2004 22:36:37 GMT Message-Id: <200411042236.iA4Mabsh042039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" To: Perforce Change Reviews Subject: PERFORCE change 64266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:36:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=64266 Change 64266 by arr@arr_audit3_d400laptop on 2004/11/04 22:36:02 - Roll back auditon.c change to use Audit API instead of syscall(2) hack. Robert pointed out that the stubs are auto- generated. - Modify auditd code to use the Audit API instead of syscall(2). Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#7 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#7 (text+ko) ==== @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -187,8 +186,7 @@ if (open(fn, O_RDONLY | O_CREAT, S_IRUSR | S_IRGRP) < 0) { perror("File open"); } - /* else if (auditctl(AC_SETLOGFILE, fn)) != 0) { */ - else if (syscall(SYS_auditctl, AC_SETLOGFILE, fn) != 0) { + else if (auditctl(AC_SETLOGFILE, fn) != 0) { syslog(LOG_ERR, "auditctl failed setting log file! : %s\n", strerror(errno)); @@ -265,15 +263,13 @@ syslog(LOG_INFO, "min free = %d\n", minval); - /* if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { */ - if (syscall(SYS_auditon, A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { + if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, "could not get audit queue settings\n"); return -1; } qctrl.aq_minfree = minval; - /* if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { */ - if (syscall(SYS_auditon, A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { + if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, "could not set audit queue settings\n"); return -1; @@ -308,8 +304,7 @@ } /* flush contents */ - /* err_ret = auditctl(NULL); */ - err_ret = syscall(SYS_auditctl, AC_SETLOGFILE, NULL); + err_ret = auditctl(AC_SETLOGFILE, NULL); if (err_ret != 0) { syslog(LOG_ERR, "auditctl failed! : %s\n", strerror(errno)); @@ -563,9 +558,8 @@ while((ev = getauevent()) != NULL) { evc_map.ec_number = ev->ae_number; evc_map.ec_class = ev->ae_class; - /* if (auditon(A_SETCLASS, &evc_map, sizeof(au_evclass_map_t)) != 0) { */ - if (syscall(SYS_auditon, A_SETCLASS, &evc_map, - sizeof(au_evclass_map_t)) != 0) { + if (auditon(A_SETCLASS, &evc_map, + sizeof(au_evclass_map_t)) != 0) { syslog(LOG_ERR, "Failed to register class mapping for event %s", ev->ae_name); @@ -588,8 +582,7 @@ if ((getacna(naeventstr, NA_EVENT_STR_SIZE) == 0) && ( getauditflagsbin(naeventstr, &aumask) == 0)) { - /* if (auditon(A_SETKMASK, &aumask, sizeof(au_mask_t))){ */ - if (syscall(SYS_auditon,A_SETKMASK, &aumask, sizeof(au_mask_t))){ + if (auditon(A_SETKMASK, &aumask, sizeof(au_mask_t))){ syslog(LOG_ERR, "Failed to register non-attributable event mask."); } else { @@ -603,8 +596,7 @@ /* * Set the audit policy flags based on passed in parameter values. */ - /* if (auditon(A_SETPOLICY, &flags, sizeof(flags))) { */ - if (syscall(SYS_auditon,A_SETPOLICY, &flags, sizeof(flags))) { + if (auditon(A_SETPOLICY, &flags, sizeof(flags))) { syslog(LOG_ERR, "Failed to set audit policy."); } @@ -660,8 +652,7 @@ return -1; } /* Tell the kernel the name of the auditd control file */ - /*if (auditctl(AC_SETCTLFILE, fn) != 0) { */ - if (syscall(SYS_auditctl, AC_SETCTLFILE, AUDITD_CTL_FILE) != 0) { + if (auditctl(AC_SETCTLFILE, AUDITD_CTL_FILE) != 0) { syslog(LOG_ERR, "config_auditd_ipc() : failed sending control file " "name to the kernel: %s\n", ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#3 (text+ko) ==== @@ -38,8 +38,6 @@ #include #include #include -#include -#include static void usage(void) @@ -61,8 +59,7 @@ path = NULL; else path = argv[1]; - /* if (auditctl(AC_SETLOGFILE, path) == -1) */ - if (syscall(SYS_auditctl, AC_SETLOGFILE, path) == -1) + if (auditctl(AC_SETLOGFILE, path) == -1) errx(-1, "%s: %s", path, strerror(errno)); exit(0); } From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:49:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E852516A4DE; Thu, 4 Nov 2004 22:49:56 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 680A116A51D for ; Thu, 4 Nov 2004 22:49:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F85343D1F for ; Thu, 4 Nov 2004 22:49:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4MntjO042556 for ; Thu, 4 Nov 2004 22:49:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4Mns1C042553 for perforce@freebsd.org; Thu, 4 Nov 2004 22:49:54 GMT (envelope-from sam@freebsd.org) Date: Thu, 4 Nov 2004 22:49:54 GMT Message-Id: <200411042249.iA4Mns1C042553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:49:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=64268 Change 64268 by sam@sam_ebb on 2004/11/04 22:48:54 whitespace fix Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#7 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -3873,7 +3873,7 @@ error = sysctl_handle_int(oidp, &slottime, 0, req); if (error || !req->newptr) return error; - return !ath_hal_setslottime(sc->sc_ah, slottime)? EINVAL : 0; + return !ath_hal_setslottime(sc->sc_ah, slottime) ? EINVAL : 0; } static int @@ -3886,7 +3886,7 @@ error = sysctl_handle_int(oidp, &acktimeout, 0, req); if (error || !req->newptr) return error; - return !ath_hal_setacktimeout(sc->sc_ah, acktimeout)? EINVAL : 0; + return !ath_hal_setacktimeout(sc->sc_ah, acktimeout) ? EINVAL : 0; } static int @@ -3899,7 +3899,7 @@ error = sysctl_handle_int(oidp, &ctstimeout, 0, req); if (error || !req->newptr) return error; - return !ath_hal_setctstimeout(sc->sc_ah, ctstimeout)? EINVAL : 0; + return !ath_hal_setctstimeout(sc->sc_ah, ctstimeout) ? EINVAL : 0; } static int @@ -3947,7 +3947,7 @@ if (error || !req->newptr) return error; sc->sc_diversity = diversity; - return !ath_hal_setdiversity(sc->sc_ah, diversity)? EINVAL : 0; + return !ath_hal_setdiversity(sc->sc_ah, diversity) ? EINVAL : 0; } static void From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:49:59 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 400D316A4E2; Thu, 4 Nov 2004 22:49:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE78F16A525 for ; Thu, 4 Nov 2004 22:49:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8031243D48 for ; Thu, 4 Nov 2004 22:49:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4MntOd042562 for ; Thu, 4 Nov 2004 22:49:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4Mntxx042559 for perforce@freebsd.org; Thu, 4 Nov 2004 22:49:55 GMT (envelope-from sam@freebsd.org) Date: Thu, 4 Nov 2004 22:49:55 GMT Message-Id: <200411042249.iA4Mntxx042559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:50:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=64269 Change 64269 by sam@sam_ebb on 2004/11/04 22:49:22 move ieee80211_announce under bootverbose Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#8 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#8 (text+ko) ==== @@ -506,7 +506,8 @@ ath_bpfattach(sc); - ieee80211_announce(ic); + if (bootverbose) + ieee80211_announce(ic); ath_announce(sc); return 0; bad2: From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:53:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB4E416A4D0; Thu, 4 Nov 2004 22:52:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C512416A4CE for ; Thu, 4 Nov 2004 22:52:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9A3B43D48 for ; Thu, 4 Nov 2004 22:52:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4Mqx8w042709 for ; Thu, 4 Nov 2004 22:52:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4MqxiO042706 for perforce@freebsd.org; Thu, 4 Nov 2004 22:52:59 GMT (envelope-from sam@freebsd.org) Date: Thu, 4 Nov 2004 22:52:59 GMT Message-Id: <200411042252.iA4MqxiO042706@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:53:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=64270 Change 64270 by sam@sam_ebb on 2004/11/04 22:52:53 mark tx descriptors for non-data frames with TXDESCINT so they are reaped more quickly; this potentially helps reclaim node state sooner since the last reference is typically reclaimed when reaping the tx of the deauth/deassoc frame Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#9 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#9 (text+ko) ==== @@ -2869,7 +2869,8 @@ * NB: use >= to deal with sc_txintrperiod changing * dynamically through sysctl. */ - if (++txq->axq_intrcnt >= sc->sc_txintrperiod) { + if (atype != HAL_PKT_TYPE_NORMAL || + ++txq->axq_intrcnt >= sc->sc_txintrperiod) { flags |= HAL_TXDESC_INTREQ; txq->axq_intrcnt = 0; } From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:55:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02E2016A4D0; Thu, 4 Nov 2004 22:55:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D201916A4CE for ; Thu, 4 Nov 2004 22:55:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C37F943D54 for ; Thu, 4 Nov 2004 22:55:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4Mt2hZ042780 for ; Thu, 4 Nov 2004 22:55:02 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4Mt2uJ042777 for perforce@freebsd.org; Thu, 4 Nov 2004 22:55:02 GMT (envelope-from sam@freebsd.org) Date: Thu, 4 Nov 2004 22:55:02 GMT Message-Id: <200411042255.iA4Mt2uJ042777@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:55:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64271 Change 64271 by sam@sam_ebb on 2004/11/04 22:54:53 add mib variable to control the diagnostic register so folks have an example of how to disable h/w acks and the like Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#10 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#10 (text+ko) ==== @@ -3952,6 +3952,21 @@ return !ath_hal_setdiversity(sc->sc_ah, diversity) ? EINVAL : 0; } +static int +ath_sysctl_diag(SYSCTL_HANDLER_ARGS) +{ + struct ath_softc *sc = arg1; + u_int32_t diag; + int error; + + if (!ath_hal_getdiag(sc->sc_ah, &diag)) + return EINVAL; + error = sysctl_handle_int(oidp, &diag, 0, req); + if (error || !req->newptr) + return error; + return !ath_hal_setdiag(sc->sc_ah, diag) ? EINVAL : 0; +} + static void ath_sysctlattach(struct ath_softc *sc) { @@ -4000,6 +4015,9 @@ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "txintrperiod", CTLFLAG_RW, &sc->sc_txintrperiod, 0, "tx descriptor batching"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "diag", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + ath_sysctl_diag, "I", "h/w diagnostic control"); } static void ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#3 (text+ko) ==== @@ -396,6 +396,10 @@ (ath_hal_getcapability(_ah, HAL_CAP_DIVERSITY, 1, NULL) == HAL_OK) #define ath_hal_setdiversity(_ah, _v) \ ath_hal_setcapability(_ah, HAL_CAP_DIVERSITY, 1, _v, NULL) +#define ath_hal_getdiag(_ah, _pv) \ + (ath_hal_getcapability(_ah, HAL_CAP_DIAG, 0, _pv) == HAL_OK) +#define ath_hal_setdiag(_ah, _v) \ + ath_hal_setcapability(_ah, HAL_CAP_DIAG, 0, _v, NULL) #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:57:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEF1816A4D0; Thu, 4 Nov 2004 22:57:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A69E216A4CE for ; Thu, 4 Nov 2004 22:57:06 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82D4A43D5E for ; Thu, 4 Nov 2004 22:57:06 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4Mv6dC042868 for ; Thu, 4 Nov 2004 22:57:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4Mv6lY042865 for perforce@freebsd.org; Thu, 4 Nov 2004 22:57:06 GMT (envelope-from sam@freebsd.org) Date: Thu, 4 Nov 2004 22:57:06 GMT Message-Id: <200411042257.iA4Mv6lY042865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:57:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64272 Change 64272 by sam@sam_ebb on 2004/11/04 22:57:06 use ieee80211_getrssi when filling in the data for SIOCGATHSTATS so the rssi makes more sense when operating in non-station mode Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#11 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#11 (text+ko) ==== @@ -3834,8 +3834,7 @@ ath_mode_init(sc); break; case SIOCGATHSTATS: - sc->sc_stats.ast_rx_rssi = - ic->ic_node_getrssi(ic, ic->ic_bss); + sc->sc_stats.ast_rx_rssi = ieee80211_getrssi(ic); ATH_UNLOCK(sc); /* * NB: Drop the softc lock in case of a page fault; From owner-p4-projects@FreeBSD.ORG Thu Nov 4 22:58:08 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92D9816A4D0; Thu, 4 Nov 2004 22:58:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F2F616A4CE for ; Thu, 4 Nov 2004 22:58:08 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E4AE43D2F for ; Thu, 4 Nov 2004 22:58:08 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA4Mw8ts042907 for ; Thu, 4 Nov 2004 22:58:08 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA4Mw8Lp042904 for perforce@freebsd.org; Thu, 4 Nov 2004 22:58:08 GMT (envelope-from sam@freebsd.org) Date: Thu, 4 Nov 2004 22:58:08 GMT Message-Id: <200411042258.iA4Mw8Lp042904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Nov 2004 22:58:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=64273 Change 64273 by sam@sam_ebb on 2004/11/04 22:57:37 move ieee80211_announce under bootverbose Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#3 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#3 (text+ko) ==== @@ -499,7 +499,8 @@ sc->sc_rx_th.wr_ihdr.it_present = htole32(WI_RX_RADIOTAP_PRESENT); #endif - ieee80211_announce(ic); + if (bootverbose) + ieee80211_announce(ic); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Nov 5 00:29:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77AE616A4D0; Fri, 5 Nov 2004 00:29:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BC0416A4CE for ; Fri, 5 Nov 2004 00:29:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20AF843D64 for ; Fri, 5 Nov 2004 00:29:02 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA50T1iw046025 for ; Fri, 5 Nov 2004 00:29:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA50T1vh046022 for perforce@freebsd.org; Fri, 5 Nov 2004 00:29:01 GMT (envelope-from sam@freebsd.org) Date: Fri, 5 Nov 2004 00:29:01 GMT Message-Id: <200411050029.iA50T1vh046022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 64280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 00:29:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=64280 Change 64280 by sam@sam_ebb on 2004/11/05 00:28:12 Handle forthcoming parts that have few h/w tx queues. When we don't have enough queues to handle all the WME classes we fallback to sticking them all in the same h/w queue. We could do better here if we're more intelligent about managing the queues, like allocating+freeing them based on operation mode changes (since the only issue is when operating in ap or ibss mode). To be revisited. Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#12 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#4 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#12 (text+ko) ==== @@ -249,6 +249,7 @@ struct ath_hal *ah; HAL_STATUS status; int error = 0, i; + u_int32_t numqs; DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, devid); @@ -376,14 +377,35 @@ error = EIO; goto bad2; } - /* NB: insure BK queue is h/w queue 0 */ - if (!ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BK) || - !ath_tx_setup(sc, WME_AC_BE, HAL_WME_AC_BE) || - !ath_tx_setup(sc, WME_AC_VI, HAL_WME_AC_VI) || - !ath_tx_setup(sc, WME_AC_VO, HAL_WME_AC_VO)) { - error = EIO; - goto bad2; + (void) ath_hal_getnumtxqueues(ah, &numqs); + if (numqs < 5) { + int qnum; + /* + * Not enough hardware tx queues to properly do WME; + * just punt and assign them all to the same h/w queue. + * We could do a better job of this if, for example, + * we allocate queues when we switch from station + * to AP mode. + */ + if (!ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BK)) { + error = EIO; + goto bad2; + } + qnum = sc->sc_txq[WME_AC_BK].axq_qnum; + sc->sc_ac2q[WME_AC_BE] = &sc->sc_txq[qnum]; + sc->sc_ac2q[WME_AC_VI] = &sc->sc_txq[qnum]; + sc->sc_ac2q[WME_AC_VO] = &sc->sc_txq[qnum]; + } else { + /* NB: insure BK queue is h/w queue 0 */ + if (!ath_tx_setup(sc, WME_AC_BK, HAL_WME_AC_BK) || + !ath_tx_setup(sc, WME_AC_BE, HAL_WME_AC_BE) || + !ath_tx_setup(sc, WME_AC_VI, HAL_WME_AC_VI) || + !ath_tx_setup(sc, WME_AC_VO, HAL_WME_AC_VO)) { + error = EIO; + goto bad2; + } } + /* * Special case certain configurations. */ @@ -511,13 +533,13 @@ ath_announce(sc); return 0; bad2: - if (sc->sc_txq[WME_AC_BK].axq_qnum != (u_int) -1) + if (ATH_TXQ_SETUP(sc, WME_AC_BK)) ATH_TXQ_LOCK_DESTROY(&sc->sc_txq[WME_AC_BK]); - if (sc->sc_txq[WME_AC_BE].axq_qnum != (u_int) -1) + if (ATH_TXQ_SETUP(sc, WME_AC_BE)) ATH_TXQ_LOCK_DESTROY(&sc->sc_txq[WME_AC_BE]); - if (sc->sc_txq[WME_AC_VI].axq_qnum != (u_int) -1) + if (ATH_TXQ_SETUP(sc, WME_AC_VI)) ATH_TXQ_LOCK_DESTROY(&sc->sc_txq[WME_AC_VI]); - if (sc->sc_txq[WME_AC_VO].axq_qnum != (u_int) -1) + if (ATH_TXQ_SETUP(sc, WME_AC_VO)) ATH_TXQ_LOCK_DESTROY(&sc->sc_txq[WME_AC_VO]); ath_desc_free(sc); bad: ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#4 (text+ko) ==== @@ -400,6 +400,8 @@ (ath_hal_getcapability(_ah, HAL_CAP_DIAG, 0, _pv) == HAL_OK) #define ath_hal_setdiag(_ah, _v) \ ath_hal_setcapability(_ah, HAL_CAP_DIAG, 0, _v, NULL) +#define ath_hal_getnumtxqueues(_ah, _pv) \ + (ath_hal_getcapability(_ah, HAL_CAP_NUM_TXQUEUES, 0, _pv) == HAL_OK) #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) From owner-p4-projects@FreeBSD.ORG Fri Nov 5 00:43:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFB1E16A4D1; Fri, 5 Nov 2004 00:43:20 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83C6516A4CE for ; Fri, 5 Nov 2004 00:43:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75DD443D54 for ; Fri, 5 Nov 2004 00:43:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA50hKrm046468 for ; Fri, 5 Nov 2004 00:43:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA50hKYW046464 for perforce@freebsd.org; Fri, 5 Nov 2004 00:43:20 GMT (envelope-from jhb@freebsd.org) Date: Fri, 5 Nov 2004 00:43:20 GMT Message-Id: <200411050043.iA50hKYW046464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 00:43:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=64282 Change 64282 by jhb@jhb_slimer on 2004/11/05 00:42:44 Update. Affected files ... .. //depot/projects/smpng/sys/notes#23 edit Differences ... ==== //depot/projects/smpng/sys/notes#23 (text+ko) ==== @@ -54,15 +54,11 @@ - Optimize spin locks on UP such that they don't do atomic operations - Untested - Unbenchmarked -- Add support for disabling CPUs on x86 via APIC ID (hint.lapic.X.disabled) - - need to separate mp_ncpus a bit, maybe mp_ncpus stays as count of - present CPUs, but a separate mp_activecpus is count of CPUs actually in - use. Hmm, CPUs really should just not show up when they are disabled - maybe, but that means fudging with mp_ncpus. - Fix boot_cpu_id to be a logical FreeBSD cpuid that is the BSP on all archs - Maybe hardcode FreeBSD cpuid 0 as BSP instead - Change alpha to use logical FreeBSD cpuid's rather than mapping 1:1 to physical IDs -- Revert bde's changes to the interrupt storm code. +- Split critical sections from spinlocks some, create spinlock_enter/exit() + MD API to replace cpu_critical_*. Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Fri Nov 5 01:42:38 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 965C516A4D0; Fri, 5 Nov 2004 01:42:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 531DA16A4CE; Fri, 5 Nov 2004 01:42:37 +0000 (GMT) Received: from mail.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3200E43D2F; Fri, 5 Nov 2004 01:42:36 +0000 (GMT) (envelope-from julian@elischer.org) Received: from elischer.org (julian.vicor-nb.com [208.206.78.97]) by mail.vicor-nb.com (Postfix) with ESMTP id D994E7A424; Thu, 4 Nov 2004 17:42:35 -0800 (PST) Message-ID: <418ADA8B.6070809@elischer.org> Date: Thu, 04 Nov 2004 17:42:35 -0800 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.3.1) Gecko/20030516 X-Accept-Language: en, hu MIME-Version: 1.0 To: John Baldwin References: <200411050043.iA50hKYW046464@repoman.freebsd.org> In-Reply-To: <200411050043.iA50hKYW046464@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: Perforce Change Reviews Subject: Re: PERFORCE change 64282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 01:42:38 -0000 John Baldwin wrote: >http://perforce.freebsd.org/chv.cgi?CH=64282 > >Change 64282 by jhb@jhb_slimer on 2004/11/05 00:42:44 > > Update. > >Affected files ... > >.. //depot/projects/smpng/sys/notes#23 edit > >Differences ... > >==== //depot/projects/smpng/sys/notes#23 (text+ko) ==== > >@@ -54,15 +54,11 @@ > - Optimize spin locks on UP such that they don't do atomic operations > Is this a "done" list or a "to do" list? Either way, I'm glad to see this because I've been pushing for it for a while.. also means '386' machines could be compiled as they wouldn't require all teh extra atomic stuff. > - Untested > - Unbenchmarked >-- Add support for disabling CPUs on x86 via APIC ID (hint.lapic.X.disabled) >- - need to separate mp_ncpus a bit, maybe mp_ncpus stays as count of >- present CPUs, but a separate mp_activecpus is count of CPUs actually in >- use. Hmm, CPUs really should just not show up when they are disabled >- maybe, but that means fudging with mp_ncpus. > - Fix boot_cpu_id to be a logical FreeBSD cpuid that is the BSP on all archs > - Maybe hardcode FreeBSD cpuid 0 as BSP instead > - Change alpha to use logical FreeBSD cpuid's rather than mapping 1:1 to > physical IDs >-- Revert bde's changes to the interrupt storm code. >+- Split critical sections from spinlocks some, create spinlock_enter/exit() >+ MD API to replace cpu_critical_*. > > Space reserved for child branches: > > From owner-p4-projects@FreeBSD.ORG Fri Nov 5 03:07:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE7616A4D0; Fri, 5 Nov 2004 03:07:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EDC116A4CE for ; Fri, 5 Nov 2004 03:07:16 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1830643D46 for ; Fri, 5 Nov 2004 03:07:16 +0000 (GMT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA537FN9057190 for ; Fri, 5 Nov 2004 03:07:15 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA537FZU057187 for perforce@freebsd.org; Fri, 5 Nov 2004 03:07:15 GMT (envelope-from marcel@freebsd.org) Date: Fri, 5 Nov 2004 03:07:15 GMT Message-Id: <200411050307.iA537FZU057187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 64284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 03:07:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=64284 Change 64284 by marcel@marcel_nfs on 2004/11/05 03:07:01 The scc(4) driver provides as many (subordinate) busses as there are channels and as many children on each of the busses as there are serial modes. Attach an ivar for the mode to each child so that drivers that can handle the mode can attach to the child. Affected files ... .. //depot/projects/uart/dev/scc/scc_bus.h#2 edit .. //depot/projects/uart/dev/uart/uart_bus_scc.c#3 edit Differences ... ==== //depot/projects/uart/dev/scc/scc_bus.h#2 (text+ko) ==== @@ -32,9 +32,16 @@ #define SCC_IVAR_CHANNEL 0 #define SCC_IVAR_CLASS 1 #define SCC_IVAR_CLOCK 2 -#define SCC_IVAR_REGSHFT 3 +#define SCC_IVAR_MODE 3 +#define SCC_IVAR_REGSHFT 4 +/* Hardware class -- the SCC type. */ #define SCC_CLASS_SAB82532 0 #define SCC_CLASS_Z8530 1 +/* The possible modes supported by the SCC. */ +#define SCC_MODE_ASYNC 0 +#define SCC_MODE_BISYNC 1 +#define SCC_MODE_HDLC 2 + #endif /* _DEV_SCC_BUS_H_ */ ==== //depot/projects/uart/dev/uart/uart_bus_scc.c#3 (text+ko) ==== @@ -64,12 +64,15 @@ { device_t parent; struct uart_softc *sc; - uintptr_t ch, cl, rs; + uintptr_t ch, cl, md, rs; parent = device_get_parent(dev); sc = device_get_softc(dev); - if (BUS_READ_IVAR(parent, dev, SCC_IVAR_CLASS, &cl)) + if (BUS_READ_IVAR(parent, dev, SCC_IVAR_MODE, &md) || + BUS_READ_IVAR(parent, dev, SCC_IVAR_CLASS, &cl)) + return (ENXIO); + if (md != SCC_MODE_ASYNC) return (ENXIO); switch (cl) { case SCC_CLASS_SAB82532: @@ -81,12 +84,11 @@ default: return (ENXIO); } - if (BUS_READ_IVAR(parent, dev, SCC_IVAR_CHANNEL, &ch)) - ch = 0; - if (BUS_READ_IVAR(parent, dev, SCC_IVAR_CLOCK, &cl)) - cl = 0; - if (BUS_READ_IVAR(parent, dev, SCC_IVAR_REGSHFT, &rs)) - rs = 0; + if (BUS_READ_IVAR(parent, dev, SCC_IVAR_CHANNEL, &ch) || + BUS_READ_IVAR(parent, dev, SCC_IVAR_CLOCK, &cl) || + BUS_READ_IVAR(parent, dev, SCC_IVAR_REGSHFT, &rs)) + return (ENXIO); + return (uart_bus_probe(dev, rs, cl, 0, ch)); } From owner-p4-projects@FreeBSD.ORG Fri Nov 5 17:27:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EE0B16A4D0; Fri, 5 Nov 2004 17:27:45 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C828B16A4CE for ; Fri, 5 Nov 2004 17:27:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75D5843D58 for ; Fri, 5 Nov 2004 17:27:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5HRiaq020154 for ; Fri, 5 Nov 2004 17:27:44 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5HRhHb020151 for perforce@freebsd.org; Fri, 5 Nov 2004 17:27:43 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 17:27:43 GMT Message-Id: <200411051727.iA5HRhHb020151@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 17:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=64338 Change 64338 by peter@peter_daintree on 2004/11/05 17:27:23 IFC @64337 Affected files ... .. //depot/projects/hammer/bin/rcp/Makefile#3 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#41 integrate .. //depot/projects/hammer/etc/mtree/BIND.chroot.dist#3 integrate .. //depot/projects/hammer/etc/namedb/named.conf#7 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#29 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#14 integrate .. //depot/projects/hammer/etc/rc.d/swap1#7 integrate .. //depot/projects/hammer/etc/rc.d/vinum#4 delete .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#14 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#18 integrate .. //depot/projects/hammer/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#10 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#13 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_ustar.c#9 integrate .. //depot/projects/hammer/lib/libbegemot/Makefile#2 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.c#6 integrate .. //depot/projects/hammer/lib/libc/stdtime/strftime.3#6 integrate .. //depot/projects/hammer/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#20 integrate .. //depot/projects/hammer/libexec/rtld-aout/Makefile#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/Makefile#14 integrate .. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#3 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#18 integrate .. //depot/projects/hammer/sbin/Makefile#30 integrate .. //depot/projects/hammer/sbin/geom/class/concat/gconcat.8#7 integrate .. //depot/projects/hammer/sbin/geom/class/label/glabel.8#6 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#7 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/gstripe.8#8 integrate .. //depot/projects/hammer/sbin/geom/core/geom.8#7 integrate .. //depot/projects/hammer/sbin/init/Makefile#4 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#32 integrate .. //depot/projects/hammer/sbin/route/route.8#7 integrate .. //depot/projects/hammer/sbin/vinum/Makefile#4 delete .. //depot/projects/hammer/sbin/vinum/commands.c#14 delete .. //depot/projects/hammer/sbin/vinum/list.c#7 delete .. //depot/projects/hammer/sbin/vinum/v.c#7 delete .. //depot/projects/hammer/sbin/vinum/vext.h#5 delete .. //depot/projects/hammer/sbin/vinum/vinum.8#11 delete .. //depot/projects/hammer/share/examples/etc/make.conf#29 integrate .. //depot/projects/hammer/share/man/man4/Makefile#54 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#4 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#4 integrate .. //depot/projects/hammer/share/man/man4/route.4#5 integrate .. //depot/projects/hammer/share/man/man4/vinumdebug.4#2 delete .. //depot/projects/hammer/share/man/man5/make.conf.5#27 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#42 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#29 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#2 integrate .. //depot/projects/hammer/sys/arm/include/cpu.h#3 integrate .. //depot/projects/hammer/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/hammer/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/hammer/sys/arm/include/endian.h#6 integrate .. //depot/projects/hammer/sys/arm/include/param.h#5 integrate .. //depot/projects/hammer/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/hammer/sys/arm/include/reg.h#2 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#12 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#32 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ehcireg.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/usbdivar.h#5 integrate .. //depot/projects/hammer/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/hammer/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/hammer/sys/dev/vinum/request.h#3 delete .. //depot/projects/hammer/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/hammer/sys/dev/vinum/vinum.c#13 delete .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#15 delete .. //depot/projects/hammer/sys/dev/vinum/vinumdaemon.c#7 delete .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#10 delete .. //depot/projects/hammer/sys/dev/vinum/vinumhdr.h#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinuminterrupt.c#8 delete .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#17 delete .. //depot/projects/hammer/sys/dev/vinum/vinumio.h#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#13 delete .. //depot/projects/hammer/sys/dev/vinum/vinumkw.h#5 delete .. //depot/projects/hammer/sys/dev/vinum/vinumlock.c#6 delete .. //depot/projects/hammer/sys/dev/vinum/vinummemory.c#8 delete .. //depot/projects/hammer/sys/dev/vinum/vinumobj.h#6 delete .. //depot/projects/hammer/sys/dev/vinum/vinumparser.c#7 delete .. //depot/projects/hammer/sys/dev/vinum/vinumraid5.c#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#13 delete .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#9 delete .. //depot/projects/hammer/sys/dev/vinum/vinumstate.c#4 delete .. //depot/projects/hammer/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/hammer/sys/dev/vinum/vinumutil.c#6 delete .. //depot/projects/hammer/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/hammer/sys/dev/vinum/vinumvar.h#7 delete .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#4 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#9 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#14 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#18 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#3 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_asus.c#8 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#32 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#70 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#29 integrate .. //depot/projects/hammer/sys/kern/tty.c#32 integrate .. //depot/projects/hammer/sys/kern/uipc_jumbo.c#7 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#37 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#21 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#60 integrate .. //depot/projects/hammer/sys/modules/vinum/Makefile#3 delete .. //depot/projects/hammer/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/hammer/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_var.h#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#7 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#15 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#26 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_bio.c#24 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#28 integrate .. //depot/projects/hammer/sys/sys/buf.h#18 integrate .. //depot/projects/hammer/sys/sys/param.h#49 integrate .. //depot/projects/hammer/sys/sys/syslog.h#4 integrate .. //depot/projects/hammer/sys/sys/ttydefaults.h#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#31 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#33 integrate .. //depot/projects/hammer/sys/vm/vm_contig.c#22 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#35 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#43 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#38 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#32 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#15 integrate .. //depot/projects/hammer/tools/debugscripts/dot.gdbinit#4 integrate .. //depot/projects/hammer/tools/debugscripts/gdbinit.vinum#3 delete .. //depot/projects/hammer/tools/tools/nanobsd/make.conf#7 integrate .. //depot/projects/hammer/usr.bin/cut/cut.c#4 integrate .. //depot/projects/hammer/usr.bin/ee/ee.c#3 integrate .. //depot/projects/hammer/usr.bin/login/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/make/config.h#3 integrate .. //depot/projects/hammer/usr.bin/make/job.c#11 integrate .. //depot/projects/hammer/usr.bin/make/job.h#8 integrate .. //depot/projects/hammer/usr.bin/make/main.c#16 integrate .. //depot/projects/hammer/usr.bin/newgrp/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/opieinfo/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/opiepasswd/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/rlogin/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/rsh/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/su/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/tail/extern.h#2 integrate .. //depot/projects/hammer/usr.bin/tail/forward.c#4 integrate .. //depot/projects/hammer/usr.bin/tail/misc.c#2 integrate .. //depot/projects/hammer/usr.bin/tail/read.c#3 integrate .. //depot/projects/hammer/usr.bin/tail/reverse.c#2 integrate .. //depot/projects/hammer/usr.bin/tail/tail.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#7 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#12 integrate .. //depot/projects/hammer/usr.sbin/ancontrol/ancontrol.c#7 integrate .. //depot/projects/hammer/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/moused/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/sliplogin/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#18 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/index.c#6 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.8#7 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#16 integrate Differences ... ==== //depot/projects/hammer/bin/rcp/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/bin/rcp/Makefile,v 1.22 2002/10/16 16:06:46 markm Exp $ +# $FreeBSD: src/bin/rcp/Makefile,v 1.23 2004/11/03 18:01:18 ru Exp $ PROG= rcp SRCS= rcp.c util.c @@ -7,6 +7,6 @@ BINOWN= root BINMODE=4555 -INSTALLFLAGS=-fschg +PRECIOUSPROG= .include ==== //depot/projects/hammer/etc/defaults/rc.conf#41 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.228 2004/11/01 18:05:40 mtm Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.229 2004/11/04 13:33:29 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -449,7 +449,6 @@ kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure lomac_enable="NO" # start lomac(4) security module at boot update_motd="YES" # update version info in /etc/motd (or NO) -start_vinum="NO" # set to YES to start vinum unaligned_print="YES" # print unaligned access warnings on the alpha (or NO). entropy_file="/entropy" # Set to NO to disable caching entropy through reboots. # /var/db/entropy is preferred if / is not available. ==== //depot/projects/hammer/etc/mtree/BIND.chroot.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.5 2004/09/29 03:43:10 dougb Exp $ +# $FreeBSD: src/etc/mtree/BIND.chroot.dist,v 1.6 2004/11/04 05:24:29 gshapiro Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -9,6 +9,8 @@ .. etc namedb + dynamic uname=bind + .. master .. slave uname=bind ==== //depot/projects/hammer/etc/namedb/named.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/etc/namedb/named.conf,v 1.19 2004/09/30 09:57:36 dougb Exp $ +// $FreeBSD: src/etc/namedb/named.conf,v 1.20 2004/11/04 05:24:29 gshapiro Exp $ // // Refer to the named.conf(5) and named(8) man pages, and the documentation // in /usr/share/doc/bind9 for more details. @@ -102,6 +102,20 @@ }; }; +// An example dynamic zone +key "exampleorgkey" { + algorithm hmac-md5; + secret "sf87HJqjkqh8ac87a02lla=="; +}; + +zone "example.org" { + type master; + allow-update { + key "exampleorgkey"; + }; + file "dynamic/example.org"; +}; + zone "0.168.192.in-addr.arpa" { type slave; file "slave/0.168.192.in-addr.arpa"; ==== //depot/projects/hammer/etc/rc.d/Makefile#29 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.45 2004/11/02 12:35:54 pjd Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.46 2004/11/04 12:59:16 phk Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -35,7 +35,7 @@ syscons sysctl syslogd \ timed tmp \ ugidfw usbd \ - var vinum virecover \ + var virecover \ watchdogd \ ypbind yppasswdd ypserv \ ypset ypupdated ypxfrd ==== //depot/projects/hammer/etc/rc.d/initdiskless#14 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.39 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.40 2004/11/05 07:35:31 mtm Exp $ # +# PROVIDE: initdiskless # REQUIRE: preseedrandom -# PROVIDE: initdiskless +# BEFORE: rcconf # KEYWORD: nojail -# BEFORE: ipfw # On entry to this script the entire system consists of a read-only root ==== //depot/projects/hammer/etc/rc.d/swap1#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.8 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ # # PROVIDE: localswap @@ -12,7 +12,7 @@ name="swap1" start_cmd='swapon -a' -stop_cmd='swapoff -a' +stop_cmd=':' load_rc_config swap run_rc_command "$1" ==== //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.13 2004/02/05 18:51:52 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.14 2004/11/03 18:01:18 ru Exp $ PROG= ksu .if defined(ENABLE_SUID_K5SU) BINMODE=4555 -INSTALLFLAGS=-fschg +PRECIOUSPROG= .endif NOMAN= SRCS= su.c ==== //depot/projects/hammer/lib/libarchive/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.23 2004/10/11 22:04:05 obrien Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.26 2004/11/05 05:38:15 kientzle Exp $ # # Use "make distfile" to build a conventional tar.gz archive @@ -7,7 +7,7 @@ LIB= archive -VERSION= 1.01.013 +VERSION= 1.01.015 ARCHIVE_API_FEATURE= 2 ARCHIVE_API_VERSION= 1 SHLIB_MAJOR= ${ARCHIVE_API_VERSION} @@ -146,6 +146,7 @@ MLINKS+= archive_util.3 archive_error_string.3 MLINKS+= archive_util.3 archive_format.3 MLINKS+= archive_util.3 archive_format_name.3 +MLINKS+= archive_util.3 archive_set_error.3 MLINKS+= archive_write.3 archive_write_data.3 MLINKS+= archive_write.3 archive_write_finish.3 MLINKS+= archive_write.3 archive_write_header.3 @@ -194,7 +195,7 @@ mkdir ${DIST_WORK_DIR} for f in ${DIST_FILES}; \ do \ - cat ${.CURDIR}/$$f >${DIST_WORK_DIR}/$$f; \ + cat ${.CURDIR}/$$f >${DIST_WORK_DIR}/$$f || true; \ done cat ${.CURDIR}/configure.ac.in | \ sed 's/@VERSION@/${VERSION}/' | \ ==== //depot/projects/hammer/lib/libarchive/archive_read_extract.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.35 2004/08/27 03:40:48 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.36 2004/11/05 05:16:40 kientzle Exp $"); #include #ifdef HAVE_SYS_ACL_H @@ -488,6 +488,7 @@ if (extract->pst != NULL) { extract->pst = &extract->st; + /* If dir already exists, don't reset permissions. */ if (S_ISDIR(extract->pst->st_mode)) return (ARCHIVE_OK); /* It exists but isn't a dir. */ ==== //depot/projects/hammer/lib/libarchive/archive_string.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.3 2004/05/03 01:40:34 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_string.h,v 1.4 2004/11/05 05:32:04 kientzle Exp $ * */ @@ -104,9 +104,4 @@ va_list); #define archive_string_vsprintf __archive_string_vsprintf -/* Like 'sprintf', but resizes the underlying string as necessary. */ -void __archive_string_sprintf(struct archive_string *, const char *, ...); -#define archive_string_sprintf __archive_string_sprintf - - #endif ==== //depot/projects/hammer/lib/libarchive/archive_string_sprintf.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.5 2004/08/26 03:33:53 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_string_sprintf.c,v 1.6 2004/11/05 05:32:04 kientzle Exp $"); /* * This uses 'printf' family functions, which can cause issues @@ -64,16 +64,3 @@ as->length = l; va_end(ap1); } - -/* - * Corresponding 'sprintf' interface. - */ -void -__archive_string_sprintf(struct archive_string *as, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - __archive_string_vsprintf(as, fmt, ap); - va_end(ap); -} ==== //depot/projects/hammer/lib/libarchive/archive_write.3#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.7 2004/08/07 19:22:50 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_write.3,v 1.8 2004/11/05 05:26:30 kientzle Exp $ .\" .Dd October 1, 2003 .Dt archive_write 3 @@ -190,6 +190,7 @@ structure. .It Fn archive_write_data Write data corresponding to the header just written. +Returns number of bytes written or -1 on error. .It Fn archive_write_close Complete the archive and invoke the close callback. .It Fn archive_write_finish @@ -321,20 +322,19 @@ .Fn archive_error_string functions will return appropriate values. Note that if the client-provided write callback function -returns -1, that error will be propagated back to the caller +returns a non-zero value, that error will be propagated back to the caller through whatever API function resulted in that call, which may include .Fn archive_write_header , .Fn archive_write_data , or .Fn archive_write_close . -In such a case, the +The client callback can call +.Fn archive_set_error +to provide values that can then be retrieved by .Fn archive_errno -or -.Fn archive_error_string -fields will not return useful information; you should use -client-private data to return error information -back to your mainline code. +and +.Fn archive_error_string . .Sh SEE ALSO .Xr tar 1 , .Xr libarchive 3 , ==== //depot/projects/hammer/lib/libarchive/archive_write.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.12 2004/08/14 03:43:35 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.13 2004/11/05 05:26:30 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -215,9 +215,12 @@ /* * Note that the compressor is responsible for blocking. */ +/* Should be "ssize_t", but that breaks the ABI. */ int archive_write_data(struct archive *a, const void *buff, size_t s) { + int ret; archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA); - return (a->format_write_data(a, buff, s)); + ret = (a->format_write_data)(a, buff, s); + return (ret == ARCHIVE_OK ? (ssize_t)s : -1); } ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#6 (text+ko) ==== @@ -29,9 +29,10 @@ /* Don't compile this if we don't have bzlib. */ #if HAVE_BZLIB_H -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.5 2004/07/30 04:14:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_bzip2.c,v 1.6 2004/11/05 05:26:30 kientzle Exp $"); #include +#include #include #include #include @@ -153,15 +154,17 @@ /* * Write data to the compressed stream. + * + * Returns ARCHIVE_OK if all data written, error otherwise. */ -static ssize_t +static int archive_compressor_bzip2_write(struct archive *a, const void *buff, size_t length) { struct private_data *state; state = a->compression_data; - if (!a->client_writer) { + if (a->client_writer == NULL) { archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, "No write callback is registered? " "This is probably an internal programming error."); @@ -175,9 +178,9 @@ SET_NEXT_IN(state, buff); state->stream.avail_in = length; if (drive_compressor(a, state, 0)) - return (-1); + return (ARCHIVE_FATAL); a->file_position += length; - return (length); + return (ARCHIVE_OK); } @@ -191,6 +194,7 @@ int ret; struct private_data *state; ssize_t target_block_length; + ssize_t bytes_written; unsigned tocopy; state = a->compression_data; @@ -246,12 +250,16 @@ } /* Write the last block */ - ret = (a->client_writer)(a, a->client_data, state->compressed, - block_length); + bytes_written = (a->client_writer)(a, a->client_data, + state->compressed, block_length); - a->raw_position += ret; - if (ret != 0) - goto cleanup; + /* TODO: Handle short write of final block. */ + if (bytes_written <= 0) + ret = ARCHIVE_FATAL; + else { + a->raw_position += ret; + ret = ARCHIVE_OK; + } /* Cleanup: shut down compressor, release memory, etc. */ cleanup: @@ -284,27 +292,28 @@ static int drive_compressor(struct archive *a, struct private_data *state, int finishing) { - size_t ret; + ssize_t bytes_written; + int ret; for (;;) { if (state->stream.avail_out == 0) { - ret = (a->client_writer)(a, a->client_data, + bytes_written = (a->client_writer)(a, a->client_data, state->compressed, state->compressed_buffer_size); - if (ret <= 0) { + if (bytes_written <= 0) { /* TODO: Handle this write failure */ return (ARCHIVE_FATAL); - } else if (ret < state->compressed_buffer_size) { + } else if ((size_t)bytes_written < state->compressed_buffer_size) { /* Short write: Move remainder to * front and keep filling */ memmove(state->compressed, - state->compressed + ret, - state->compressed_buffer_size - ret); + state->compressed + bytes_written, + state->compressed_buffer_size - bytes_written); } - a->raw_position += ret; + a->raw_position += bytes_written; state->stream.next_out = state->compressed + - state->compressed_buffer_size - ret; - state->stream.avail_out = ret; + state->compressed_buffer_size - bytes_written; + state->stream.avail_out = bytes_written; } ret = BZ2_bzCompress(&(state->stream), ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ /* Don't compile this if we don't have zlib. */ #if HAVE_ZLIB_H -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.7 2004/08/07 19:21:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_gzip.c,v 1.8 2004/11/05 05:26:30 kientzle Exp $"); #include #include @@ -179,7 +179,7 @@ /* * Write data to the compressed stream. */ -static ssize_t +static int archive_compressor_gzip_write(struct archive *a, const void *buff, size_t length) { @@ -187,7 +187,7 @@ int ret; state = a->compression_data; - if (!a->client_writer) { + if (a->client_writer == NULL) { archive_set_error(a, ARCHIVE_ERRNO_PROGRAMMER, "No write callback is registered? " "This is probably an internal programming error."); @@ -205,7 +205,7 @@ return (ret); a->file_position += length; - return (length); + return (ARCHIVE_OK); } @@ -215,7 +215,7 @@ static int archive_compressor_gzip_finish(struct archive *a) { - ssize_t block_length, target_block_length; + ssize_t block_length, target_block_length, bytes_written; int ret; struct private_data *state; unsigned tocopy; @@ -273,9 +273,13 @@ /* If it overflowed, flush and start a new block. */ if (tocopy < 8) { - ret = (a->client_writer)(a, a->client_data, state->compressed, - state->compressed_buffer_size); - a->raw_position += ret; + bytes_written = (a->client_writer)(a, a->client_data, + state->compressed, state->compressed_buffer_size); + if (bytes_written <= 0) { + ret = ARCHIVE_FATAL; + goto cleanup; + } + a->raw_position += bytes_written; state->stream.next_out = state->compressed; state->stream.avail_out = state->compressed_buffer_size; memcpy(state->stream.next_out, trailer + tocopy, 8-tocopy); @@ -306,9 +310,13 @@ } /* Write the last block */ - ret = (a->client_writer)(a, a->client_data, state->compressed, - block_length); - a->raw_position += ret; + bytes_written = (a->client_writer)(a, a->client_data, + state->compressed, block_length); + if (bytes_written <= 0) { + ret = ARCHIVE_FATAL; + goto cleanup; + } + a->raw_position += bytes_written; /* Cleanup: shut down compressor, release memory, etc. */ cleanup: @@ -340,27 +348,28 @@ static int drive_compressor(struct archive *a, struct private_data *state, int finishing) { - size_t ret; + ssize_t bytes_written; + int ret; for (;;) { if (state->stream.avail_out == 0) { - ret = (a->client_writer)(a, a->client_data, + bytes_written = (a->client_writer)(a, a->client_data, state->compressed, state->compressed_buffer_size); - if (ret <= 0) { + if (bytes_written <= 0) { /* TODO: Handle this write failure */ return (ARCHIVE_FATAL); - } else if (ret < state->compressed_buffer_size) { + } else if ((size_t)bytes_written < state->compressed_buffer_size) { /* Short write: Move remaining to * front of block and keep filling */ memmove(state->compressed, - state->compressed + ret, - state->compressed_buffer_size - ret); + state->compressed + bytes_written, + state->compressed_buffer_size - bytes_written); } - a->raw_position += ret; + a->raw_position += bytes_written; state->stream.next_out = state->compressed + - state->compressed_buffer_size - ret; - state->stream.avail_out = ret; + state->compressed_buffer_size - bytes_written; + state->stream.avail_out = bytes_written; } ret = deflate(&(state->stream), ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.5 2004/08/07 19:21:18 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_compression_none.c,v 1.6 2004/11/05 05:26:30 kientzle Exp $"); #include #include @@ -104,13 +104,13 @@ /* * Write data to the stream. */ -static ssize_t +static int archive_compressor_none_write(struct archive *a, const void *vbuff, size_t length) { const char *buff; ssize_t remaining, to_copy; - int ret; + ssize_t bytes_written; struct archive_none *state; state = a->compression_data; @@ -129,10 +129,12 @@ * output buffer. */ if (state->avail == 0) { - ret = (a->client_writer)(a, a->client_data, + bytes_written = (a->client_writer)(a, a->client_data, state->buffer, state->buffer_size); - /* XXX TODO: if ret < state->buffer_size XXX */ - a->raw_position += ret; + if (bytes_written <= 0) + return (ARCHIVE_FATAL); + /* XXX TODO: if bytes_written < state->buffer_size */ + a->raw_position += bytes_written; state->next = state->buffer; state->avail = state->buffer_size; } @@ -147,7 +149,7 @@ remaining -= to_copy; } a->file_position += length; - return (length); + return (ARCHIVE_OK); } @@ -159,6 +161,7 @@ { ssize_t block_length; ssize_t target_block_length; + ssize_t bytes_written; int ret; int ret2; struct archive_none *state; @@ -193,9 +196,14 @@ target_block_length - block_length); block_length = target_block_length; } - ret = (a->client_writer)(a, a->client_data, state->buffer, - block_length); - a->raw_position += ret; + bytes_written = (a->client_writer)(a, a->client_data, + state->buffer, block_length); + if (bytes_written <= 0) + ret = ARCHIVE_FATAL; + else { + a->raw_position += bytes_written; + ret = ARCHIVE_OK; + } } /* Close the output */ ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_cpio.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.4 2004/04/13 23:45:37 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.5 2004/11/05 05:26:30 kientzle Exp $"); #include #include @@ -99,7 +99,7 @@ { struct cpio *cpio; const char *p, *path; - int pathlength, ret, written; + int pathlength, ret; const struct stat *st; struct cpio_header h; @@ -142,19 +142,19 @@ else format_octal(st->st_size, &h.c_filesize, sizeof(h.c_filesize)); - written = (a->compression_write)(a, &h, sizeof(h)); - if (written < (int)sizeof(h)) + ret = (a->compression_write)(a, &h, sizeof(h)); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - written = (a->compression_write)(a, path, pathlength); - if (written < (int)pathlength) + ret = (a->compression_write)(a, path, pathlength); + if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); cpio->entry_bytes_remaining = st->st_size; /* Write the symlink now. */ if (p != NULL && *p != '\0') - (a->compression_write)(a, p, strlen(p)); + ret = (a->compression_write)(a, p, strlen(p)); return (ret); } @@ -233,13 +233,13 @@ int to_write, ret; cpio = a->format_data; - ret = 0; + ret = ARCHIVE_OK; while (cpio->entry_bytes_remaining > 0) { to_write = cpio->entry_bytes_remaining < a->null_length ? cpio->entry_bytes_remaining : a->null_length; ret = (a->compression_write)(a, a->nulls, to_write); - if (ret < to_write) - return (-1); + if (ret != ARCHIVE_OK) + return (ret); cpio->entry_bytes_remaining -= to_write; } return (ret); ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.18 2004/09/17 04:39:07 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.19 2004/11/05 05:26:30 kientzle Exp $"); #include #include @@ -622,7 +622,7 @@ __archive_write_format_header_ustar(a, ustarbuff, entry_main, -1, 0); /* If we built any extended attributes, write that entry first. */ - ret = 0; + ret = ARCHIVE_OK; if (archive_strlen(&(pax->pax_header)) > 0) { struct stat st; struct archive_entry *pax_attr_entry; @@ -663,7 +663,7 @@ exit(1); } r = (a->compression_write)(a, paxbuff, 512); - if (r < 512) { + if (r != ARCHIVE_OK) { pax->entry_bytes_remaining = 0; pax->entry_padding = 0; return (ARCHIVE_FATAL); @@ -677,7 +677,7 @@ r = archive_write_data(a, pax->pax_header.s, archive_strlen(&(pax->pax_header))); a->state = oldstate; - if (r < (int)archive_strlen(&(pax->pax_header))) { + if (r != ARCHIVE_OK) { /* If a write fails, we're pretty much toast. */ return (ARCHIVE_FATAL); } @@ -687,8 +687,8 @@ /* Write the header for main entry. */ r = (a->compression_write)(a, ustarbuff, 512); - if (ret != ARCHIVE_OK) - ret = (r < 512) ? ARCHIVE_FATAL : ARCHIVE_OK; + if (r != ARCHIVE_OK) + return (r); /* * Inform the client of the on-disk size we're using, so @@ -839,9 +839,9 @@ while (padding > 0) { to_write = padding < a->null_length ? padding : a->null_length; ret = (a->compression_write)(a, a->nulls, to_write); - if (ret <= 0) - return (ARCHIVE_FATAL); - padding -= ret; + if (ret != ARCHIVE_OK) + return (ret); + padding -= to_write; } return (ARCHIVE_OK); } ==== //depot/projects/hammer/lib/libarchive/archive_write_set_format_shar.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.10 2004/06/27 18:38:13 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.11 2004/11/05 05:26:30 kientzle Exp $"); #include #include @@ -50,8 +50,7 @@ int uuavail; char uubuffer[3]; int wrote_header; - char *work; - size_t work_len; + struct archive_string work; }; static int archive_write_shar_finish(struct archive *); @@ -70,23 +69,13 @@ { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 5 17:35:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73C2E16A4D0; Fri, 5 Nov 2004 17:35:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E73116A4CE for ; Fri, 5 Nov 2004 17:35:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E88643D31 for ; Fri, 5 Nov 2004 17:35:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5HZs27020453 for ; Fri, 5 Nov 2004 17:35:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5HZsUD020450 for perforce@freebsd.org; Fri, 5 Nov 2004 17:35:54 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 17:35:54 GMT Message-Id: <200411051735.iA5HZsUD020450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 17:35:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=64339 Change 64339 by peter@peter_daintree on 2004/11/05 17:34:55 Integrate i386 changes Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#105 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#75 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#61 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#49 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#26 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#19 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -534,11 +535,11 @@ * the starting segment on entrace, and the ending segment on exit. * first indicates if this is the first invocation of this function. */ -static int +static __inline int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, - struct thread *td, + pmap_t pmap, int flags, bus_addr_t *lastaddrp, int *segp, @@ -551,23 +552,22 @@ bus_addr_t paddr; int needbounce = 0; int seg; - pmap_t pmap; segs = dmat->segments; if (map == NULL) map = &nobounce_dmamap; - if (td != NULL) - pmap = vmspace_pmap(td->td_proc->p_vmspace); - else - pmap = NULL; - - if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) - || dmat->boundary > 0 || dmat->alignment > 1) - && map != &nobounce_dmamap && map->pagesneeded == 0) { + if ((map != &nobounce_dmamap && map->pagesneeded == 0) + && (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) + || dmat->boundary > 0 || dmat->alignment > 1)) { vm_offset_t vendaddr; + CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " + "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), + dmat->boundary, dmat->alignment); + CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", + map, &nobounce_dmamap, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -583,10 +583,9 @@ } vaddr += PAGE_SIZE; } + CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } - vaddr = (vm_offset_t)buf; - /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { mtx_lock(&bounce_lock); @@ -610,6 +609,7 @@ mtx_unlock(&bounce_lock); } + vaddr = (vm_offset_t)buf; lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); @@ -773,17 +773,18 @@ int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; - struct thread *td = NULL; + pmap_t pmap; flags |= BUS_DMA_NOWAIT; resid = uio->uio_resid; iov = uio->uio_iov; if (uio->uio_segflg == UIO_USERSPACE) { - td = uio->uio_td; - KASSERT(td != NULL, + KASSERT(uio->uio_td != NULL, ("bus_dmamap_load_uio: USERSPACE but no proc")); - } + pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace); + } else + pmap = NULL; nsegs = 0; error = 0; @@ -800,7 +801,7 @@ if (minlen > 0) { error = _bus_dmamap_load_buffer(dmat, map, addr, minlen, - td, flags, &lastaddr, &nsegs, first); + pmap, flags, &lastaddr, &nsegs, first); first = 0; resid -= minlen; ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#30 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#105 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#75 (text+ko) ==== @@ -127,6 +127,7 @@ struct cpu_info { int cpu_present:1; int cpu_bsp:1; + int cpu_disabled:1; } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; @@ -350,7 +351,11 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x < MAXCPU; x++) { - if (cpu_info[x].cpu_present && !cpu_info[x].cpu_bsp) { + if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + continue; + if (cpu_info[x].cpu_disabled) + printf(" cpu (AP): APIC ID: %2d (disabled)\n", x); + else { KASSERT(i < mp_ncpus, ("mp_ncpus and actual cpus are out of whack")); printf(" cpu%d (AP): APIC ID: %2d\n", i++, x); @@ -582,9 +587,19 @@ /* start each AP */ cpu = 0; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { + + /* Ignore non-existent CPUs and the BSP. */ if (!cpu_info[apic_id].cpu_present || cpu_info[apic_id].cpu_bsp) continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", apic_id)) { + cpu_info[apic_id].cpu_disabled = 1; + mp_ncpus--; + continue; + } + cpu++; /* save APIC ID for this logical ID */ ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#61 (text+ko) ==== @@ -123,6 +123,7 @@ device amr # AMI MegaRAID device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options +#device hptmv # Highpoint RocketRAID 182x device iir # Intel Integrated RAID device ips # IBM (Adaptec) ServeRAID device mly # Mylex AcceleRAID/eXtremeRAID ==== //depot/projects/hammer/sys/amd64/conf/NOTES#49 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1173) +# (XXX from i386:NOTES,v 1.1174) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.20 2004/09/22 01:04:54 peter Exp $ # @@ -276,6 +276,11 @@ device aacp # SCSI Passthrough interface (optional, CAM required) # +# Highpoint RocketRAID 182x. This is really just software RAID on a +# Marvell SATA chip. +#device hptmv # Broken, i386-only binary. + +# # IBM (now Adaptec) ServeRAID controllers device ips ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#26 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Nov 5 18:44:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DE9D16A4E0; Fri, 5 Nov 2004 18:44:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC84B16A4DC for ; Fri, 5 Nov 2004 18:44:57 +0000 (GMT) Received: from mail1.speakeasy.net (mail1.speakeasy.net [216.254.0.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3E3D43D2D for ; Fri, 5 Nov 2004 18:44:57 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 17130 invoked from network); 5 Nov 2004 18:44:57 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 5 Nov 2004 18:44:57 -0000 Received: from [10.50.41.235] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id iA5Iim5g096153; Fri, 5 Nov 2004 13:44:53 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Julian Elischer Date: Fri, 5 Nov 2004 13:08:06 -0500 User-Agent: KMail/1.6.2 References: <200411050043.iA50hKYW046464@repoman.freebsd.org> <418ADA8B.6070809@elischer.org> In-Reply-To: <418ADA8B.6070809@elischer.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200411051308.06426.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 64282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 18:44:59 -0000 On Thursday 04 November 2004 08:42 pm, Julian Elischer wrote: > John Baldwin wrote: > >http://perforce.freebsd.org/chv.cgi?CH=64282 > > > >Change 64282 by jhb@jhb_slimer on 2004/11/05 00:42:44 > > > > Update. > > > >Affected files ... > > > >.. //depot/projects/smpng/sys/notes#23 edit > > > >Differences ... > > > >==== //depot/projects/smpng/sys/notes#23 (text+ko) ==== > > > >@@ -54,15 +54,11 @@ > > - Optimize spin locks on UP such that they don't do atomic operations > > Is this a "done" list or a "to do" list? > Either way, I'm glad to see this because I've been pushing for it for a > while.. > also means '386' machines could be compiled as they wouldn't require all > teh extra atomic stuff. It's some of both, this one has been done in this branch for a while though. Things marked as 'untested' are usually done but lightly tested. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri Nov 5 19:14:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8737E16A4D5; Fri, 5 Nov 2004 19:14:06 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 894C716A4E0 for ; Fri, 5 Nov 2004 19:14:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5911D43D4C for ; Fri, 5 Nov 2004 19:14:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5JE4kb024485 for ; Fri, 5 Nov 2004 19:14:04 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5JE4a2024482 for perforce@freebsd.org; Fri, 5 Nov 2004 19:14:04 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 19:14:04 GMT Message-Id: <200411051914.iA5JE4a2024482@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 19:14:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=64354 Change 64354 by peter@peter_daintree on 2004/11/05 19:13:46 Fix (I think) the int vs ssize_t mess. Affected files ... .. //depot/projects/hammer/lib/libarchive/archive_private.h#14 edit .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#7 edit .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#8 edit .. //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#7 edit Differences ... ==== //depot/projects/hammer/lib/libarchive/archive_private.h#14 (text+ko) ==== @@ -123,7 +123,7 @@ void *compression_data; /* Data for (de)compressor. */ int (*compression_init)(struct archive *); /* Initialize. */ int (*compression_finish)(struct archive *); - ssize_t (*compression_write)(struct archive *, const void *, size_t); + int (*compression_write)(struct archive *, const void *, size_t); /* * Read uses a peek/consume I/O model: the decompression code * returns a pointer to the requested block and advances the ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_bzip2.c#7 (text+ko) ==== @@ -57,7 +57,7 @@ static int archive_compressor_bzip2_finish(struct archive *); static int archive_compressor_bzip2_init(struct archive *); -static ssize_t archive_compressor_bzip2_write(struct archive *, const void *, +static int archive_compressor_bzip2_write(struct archive *, const void *, size_t); static int drive_compressor(struct archive *, struct private_data *, int finishing); ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_gzip.c#8 (text+ko) ==== @@ -58,7 +58,7 @@ static int archive_compressor_gzip_finish(struct archive *); static int archive_compressor_gzip_init(struct archive *); -static ssize_t archive_compressor_gzip_write(struct archive *, const void *, +static int archive_compressor_gzip_write(struct archive *, const void *, size_t); static int drive_compressor(struct archive *, struct private_data *, int finishing); ==== //depot/projects/hammer/lib/libarchive/archive_write_set_compression_none.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static int archive_compressor_none_finish(struct archive *a); static int archive_compressor_none_init(struct archive *); -static ssize_t archive_compressor_none_write(struct archive *, const void *, +static int archive_compressor_none_write(struct archive *, const void *, size_t); struct archive_none { From owner-p4-projects@FreeBSD.ORG Fri Nov 5 19:19:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB9CB16A4D0; Fri, 5 Nov 2004 19:19:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B88C716A4CE for ; Fri, 5 Nov 2004 19:19:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE1AD43D2F for ; Fri, 5 Nov 2004 19:19:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5JJBA8024699 for ; Fri, 5 Nov 2004 19:19:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5JJBmW024696 for perforce@freebsd.org; Fri, 5 Nov 2004 19:19:11 GMT (envelope-from jhb@freebsd.org) Date: Fri, 5 Nov 2004 19:19:11 GMT Message-Id: <200411051919.iA5JJBmW024696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 19:19:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=64356 Change 64356 by jhb@jhb_slimer on 2004/11/05 19:18:17 Update. Affected files ... .. //depot/projects/smpng/sys/notes#24 edit Differences ... ==== //depot/projects/smpng/sys/notes#24 (text+ko) ==== @@ -54,11 +54,5 @@ - Optimize spin locks on UP such that they don't do atomic operations - Untested - Unbenchmarked -- Fix boot_cpu_id to be a logical FreeBSD cpuid that is the BSP on all archs - - Maybe hardcode FreeBSD cpuid 0 as BSP instead -- Change alpha to use logical FreeBSD cpuid's rather than mapping 1:1 to - physical IDs -- Split critical sections from spinlocks some, create spinlock_enter/exit() - MD API to replace cpu_critical_*. Space reserved for child branches: From owner-p4-projects@FreeBSD.ORG Fri Nov 5 19:23:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49B7516A4CE; Fri, 5 Nov 2004 19:23:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0857116A4CE for ; Fri, 5 Nov 2004 19:23:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C78C743D3F for ; Fri, 5 Nov 2004 19:23:17 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5JNHNT024861 for ; Fri, 5 Nov 2004 19:23:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5JNHEG024858 for perforce@freebsd.org; Fri, 5 Nov 2004 19:23:17 GMT (envelope-from jhb@freebsd.org) Date: Fri, 5 Nov 2004 19:23:17 GMT Message-Id: <200411051923.iA5JNHEG024858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 19:23:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=64358 Change 64358 by jhb@jhb_slimer on 2004/11/05 19:22:55 IFC @64357 (loop back some changes). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#72 integrate .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#30 integrate .. //depot/projects/smpng/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/smpng/sys/alpha/include/smp.h#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/critical.c#2 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#19 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#6 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#72 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#27 integrate .. //depot/projects/smpng/sys/sys/syslog.h#5 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#51 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#60 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#51 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#22 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#72 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.223 2004/09/05 02:09:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.224 2004/11/05 19:16:43 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#30 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.53 2004/11/05 19:16:43 jhb Exp $"); #include "opt_kstack_pages.h" ==== //depot/projects/smpng/sys/alpha/include/pcpu.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.14 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ ==== //depot/projects/smpng/sys/alpha/include/smp.h#4 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/alpha/include/smp.h,v 1.6 2001/08/13 22:41:15 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/smp.h,v 1.7 2004/11/05 19:16:44 jhb Exp $ * */ ==== //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.58 2004/09/08 04:54:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.59 2004/11/05 18:24:01 peter Exp $"); #include #include @@ -33,12 +33,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -218,8 +220,11 @@ *dmat = NULL; newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT); - if (newtag == NULL) + if (newtag == NULL) { + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag " + "flags 0x%x error %d", newtag, 0, error); return (ENOMEM); + } newtag->parent = parent; newtag->alignment = alignment; @@ -296,16 +301,26 @@ } else { *dmat = newtag; } + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag flags 0x%x " + "error %d", newtag, (newtag != NULL ? newtag->flags : 0), error); return (error); } int bus_dma_tag_destroy(bus_dma_tag_t dmat) { + bus_dma_tag_t dmat_copy; + int error; + + error = 0; + dmat_copy = dmat; + if (dmat != NULL) { - if (dmat->map_count != 0) - return (EBUSY); + if (dmat->map_count != 0) { + error = EBUSY; + goto out; + } while (dmat != NULL) { bus_dma_tag_t parent; @@ -326,7 +341,10 @@ dmat = NULL; } } - return (0); +out: + CTR2(KTR_BUSDMA, "bus_dma_tag_destroy tag %p error %d", dmat_copy, + error); + return (error); } /* @@ -344,8 +362,11 @@ dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); - if (dmat->segments == NULL) + if (dmat->segments == NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", + dmat, ENOMEM); return (ENOMEM); + } } /* @@ -360,8 +381,11 @@ *mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO); - if (*mapp == NULL) + if (*mapp == NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", + dmat, ENOMEM); return (ENOMEM); + } /* Initialize the new map */ STAILQ_INIT(&((*mapp)->bpages)); @@ -400,6 +424,8 @@ } if (error == 0) dmat->map_count++; + CTR3(KTR_BUSDMA, "bus_dmamap_create: tag %p tag flags 0x%x error %d", + dmat, dmat->flags, error); return (error); } @@ -411,11 +437,15 @@ bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) { if (map != NULL && map != &nobounce_dmamap) { - if (STAILQ_FIRST(&map->bpages) != NULL) + if (STAILQ_FIRST(&map->bpages) != NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error %d", + dmat, EBUSY); return (EBUSY); + } free(map, M_DEVBUF); } dmat->map_count--; + CTR1(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error 0", dmat); return (0); } @@ -445,8 +475,11 @@ dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); - if (dmat->segments == NULL) + if (dmat->segments == NULL) { + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag " + "flags 0x%x error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); + } } if ((dmat->maxsize <= PAGE_SIZE) && @@ -463,8 +496,13 @@ 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); } - if (*vaddr == NULL) + if (*vaddr == NULL) { + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); + } + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x error %d", + dmat, dmat->flags, ENOMEM); return (0); } @@ -487,6 +525,8 @@ else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); } + CTR2(KTR_BUSDMA, "bus_dmamem_free: tag %p flags 0x%x", dmat, + dmat->flags); } /* @@ -495,11 +535,11 @@ * the starting segment on entrace, and the ending segment on exit. * first indicates if this is the first invocation of this function. */ -static int +static __inline int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, - struct thread *td, + pmap_t pmap, int flags, bus_addr_t *lastaddrp, int *segp, @@ -512,23 +552,22 @@ bus_addr_t paddr; int needbounce = 0; int seg; - pmap_t pmap; segs = dmat->segments; if (map == NULL) map = &nobounce_dmamap; - if (td != NULL) - pmap = vmspace_pmap(td->td_proc->p_vmspace); - else - pmap = NULL; - - if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) - || dmat->boundary > 0 || dmat->alignment > 1) - && map != &nobounce_dmamap && map->pagesneeded == 0) { + if ((map != &nobounce_dmamap && map->pagesneeded == 0) + && (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) + || dmat->boundary > 0 || dmat->alignment > 1)) { vm_offset_t vendaddr; + CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " + "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), + dmat->boundary, dmat->alignment); + CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", + map, &nobounce_dmamap, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -544,10 +583,9 @@ } vaddr += PAGE_SIZE; } + CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } - vaddr = (vm_offset_t)buf; - /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { mtx_lock(&bounce_lock); @@ -571,6 +609,7 @@ mtx_unlock(&bounce_lock); } + vaddr = (vm_offset_t)buf; lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); @@ -658,14 +697,19 @@ error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags, &lastaddr, &nsegs, 1); - if (error == EINPROGRESS) + if (error == EINPROGRESS) { + CTR3(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); + } if (error) (*callback)(callback_arg, dmat->segments, 0, error); else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); + CTR2(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x error 0", + dmat, dmat->flags); return (0); } @@ -711,6 +755,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } + CTR3(KTR_BUSDMA, "bus_dmamap_load_mbuf: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); } @@ -727,17 +773,18 @@ int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; - struct thread *td = NULL; + pmap_t pmap; flags |= BUS_DMA_NOWAIT; resid = uio->uio_resid; iov = uio->uio_iov; if (uio->uio_segflg == UIO_USERSPACE) { - td = uio->uio_td; - KASSERT(td != NULL, + KASSERT(uio->uio_td != NULL, ("bus_dmamap_load_uio: USERSPACE but no proc")); - } + pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace); + } else + pmap = NULL; nsegs = 0; error = 0; @@ -754,7 +801,7 @@ if (minlen > 0) { error = _bus_dmamap_load_buffer(dmat, map, addr, minlen, - td, flags, &lastaddr, &nsegs, first); + pmap, flags, &lastaddr, &nsegs, first); first = 0; resid -= minlen; @@ -768,6 +815,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } + CTR3(KTR_BUSDMA, "bus_dmamap_load_uio: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); } @@ -797,6 +846,8 @@ * the caches on broken hardware */ total_bounced++; + CTR3(KTR_BUSDMA, "_bus_dmamap_sync: tag %p tag flags 0x%x " + "op 0x%x performing bounce", op, dmat, dmat->flags); if (op & BUS_DMASYNC_PREWRITE) { while (bpage != NULL) { ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.247 2004/09/29 01:59:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.248 2004/11/05 18:25:22 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -127,6 +127,7 @@ struct cpu_info { int cpu_present:1; int cpu_bsp:1; + int cpu_disabled:1; } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; @@ -350,7 +351,11 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x < MAXCPU; x++) { - if (cpu_info[x].cpu_present && !cpu_info[x].cpu_bsp) { + if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + continue; + if (cpu_info[x].cpu_disabled) + printf(" cpu (AP): APIC ID: %2d (disabled)\n", x); + else { KASSERT(i < mp_ncpus, ("mp_ncpus and actual cpus are out of whack")); printf(" cpu%d (AP): APIC ID: %2d\n", i++, x); @@ -582,9 +587,19 @@ /* start each AP */ cpu = 0; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { + + /* Ignore non-existent CPUs and the BSP. */ if (!cpu_info[apic_id].cpu_present || cpu_info[apic_id].cpu_bsp) continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", apic_id)) { + cpu_info[apic_id].cpu_disabled = 1; + mp_ncpus--; + continue; + } + cpu++; /* save APIC ID for this logical ID */ ==== //depot/projects/smpng/sys/arm/arm/critical.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/critical.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/critical.c,v 1.2 2004/11/05 18:29:45 cognet Exp $"); #include #include #include @@ -46,5 +46,7 @@ void cpu_critical_fork_exit(void) { + + curthread->td_md.md_savecrit = __set_cpsr_c(0, 0) &~ I32_bit; } ==== //depot/projects/smpng/sys/dev/snp/snp.c#19 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.94 2004/09/24 08:12:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snp/snp.c,v 1.95 2004/11/05 18:32:14 cognet Exp $"); #include #include @@ -119,7 +119,20 @@ static int snp_down(struct snoop *snp); static int snp_in(struct snoop *snp, char *buf, int n); static int snp_modevent(module_t mod, int what, void *arg); +static struct snoop *ttytosnp(struct tty *); +static struct snoop * +ttytosnp(struct tty *tp) +{ + struct snoop *snp; + + LIST_FOREACH(snp, &snp_sclist, snp_list) { + if (snp->snp_tty == tp) + return (snp); + } + return (NULL); +} + static int snplclose(tp, flag) struct tty *tp; @@ -128,7 +141,7 @@ struct snoop *snp; int error; - snp = tp->t_sc; + snp = ttytosnp(tp); error = snp_down(snp); if (error != 0) return (error); @@ -150,7 +163,7 @@ error = 0; ibuf = NULL; - snp = tp->t_sc; + snp = ttytosnp(tp); while (uio->uio_resid > 0) { ilen = imin(512, uio->uio_resid); ibuf = malloc(ilen, M_SNP, M_WAITOK); @@ -217,8 +230,7 @@ tp = snp->snp_tty; if (tp == NULL) return (EIO); - if ((tp->t_sc == snp) && (tp->t_state & TS_SNOOP) && - tp->t_line == snooplinedisc) + if ((tp->t_state & TS_SNOOP) && tp->t_line == snooplinedisc) goto tty_input; printf("snp%d: attempt to write to bad tty\n", snp->snp_unit); @@ -442,9 +454,7 @@ if (tp == NULL) goto detach_notty; - if (tp && (tp->t_sc == snp) && (tp->t_state & TS_SNOOP) && - tp->t_line == snooplinedisc) { - tp->t_sc = NULL; + if ((tp->t_state & TS_SNOOP) && tp->t_line == snooplinedisc) { tp->t_state &= ~TS_SNOOP; tp->t_line = snp->snp_olddisc; } else @@ -530,7 +540,6 @@ tpo->t_state &= ~TS_SNOOP; } - tp->t_sc = (caddr_t)snp; tp->t_state |= TS_SNOOP; snp->snp_olddisc = tp->t_line; tp->t_line = snooplinedisc; ==== //depot/projects/smpng/sys/geom/mirror/g_mirror.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.38 2004/10/14 07:55:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/mirror/g_mirror.c,v 1.43 2004/11/05 17:18:39 pjd Exp $"); #include #include @@ -37,9 +37,8 @@ #include #include #include -#include +#include #include -#include #include #include #include @@ -58,6 +57,10 @@ TUNABLE_INT("kern.geom.mirror.timeout", &g_mirror_timeout); SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, timeout, CTLFLAG_RW, &g_mirror_timeout, 0, "Time to wait on all mirror components"); +static u_int g_mirror_idletime = 5; +TUNABLE_INT("kern.geom.mirror.idletime", &g_mirror_idletime); +SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, idletime, CTLFLAG_RW, + &g_mirror_idletime, 0, "Mark components as clean when idling"); static u_int g_mirror_reqs_per_sync = 5; SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, reqs_per_sync, CTLFLAG_RW, &g_mirror_reqs_per_sync, 0, @@ -73,17 +76,22 @@ G_MIRROR_DEBUG(4, "%s: Woken up %p.", __func__, (ident)); \ } while (0) +static eventhandler_tag g_mirror_ehtag = NULL; static int g_mirror_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp); static g_taste_t g_mirror_taste; +static void g_mirror_init(struct g_class *mp); +static void g_mirror_fini(struct g_class *mp); struct g_class g_mirror_class = { .name = G_MIRROR_CLASS_NAME, .version = G_VERSION, .ctlreq = g_mirror_config, .taste = g_mirror_taste, - .destroy_geom = g_mirror_destroy_geom + .destroy_geom = g_mirror_destroy_geom, + .init = g_mirror_init, + .fini = g_mirror_fini }; @@ -291,7 +299,7 @@ g_mirror_is_busy(struct g_mirror_softc *sc, struct g_consumer *cp) { - if (cp->nstart != cp->nend) { + if (cp->index > 0) { G_MIRROR_DEBUG(2, "I/O requests for %s exist, can't destroy it now.", cp->provider->name); @@ -331,6 +339,7 @@ disk->d_consumer = g_new_consumer(disk->d_softc->sc_geom); disk->d_consumer->private = disk; + disk->d_consumer->index = 0; error = g_attach(disk->d_consumer, pp); if (error != 0) return (error); @@ -451,6 +460,8 @@ g_mirror_destroy_provider(sc); for (disk = LIST_FIRST(&sc->sc_disks); disk != NULL; disk = LIST_FIRST(&sc->sc_disks)) { + disk->d_flags &= ~G_MIRROR_DISK_FLAG_DIRTY; + g_mirror_update_metadata(disk); g_mirror_destroy_disk(disk); } while ((ep = g_mirror_event_get(sc)) != NULL) { @@ -705,6 +716,68 @@ } } +static void +g_mirror_idle(struct g_mirror_softc *sc) +{ + struct g_mirror_disk *disk; + + if (sc->sc_provider == NULL || sc->sc_provider->acw == 0) + return; + sc->sc_idle = 1; + g_topology_lock(); + LIST_FOREACH(disk, &sc->sc_disks, d_next) { + if (disk->d_state != G_MIRROR_DISK_STATE_ACTIVE) + continue; + G_MIRROR_DEBUG(1, "Disk %s (device %s) marked as clean.", + g_mirror_get_diskname(disk), sc->sc_name); + disk->d_flags &= ~G_MIRROR_DISK_FLAG_DIRTY; + g_mirror_update_metadata(disk); + } + g_topology_unlock(); +} + +static void +g_mirror_unidle(struct g_mirror_softc *sc) +{ + struct g_mirror_disk *disk; + + sc->sc_idle = 0; + g_topology_lock(); + LIST_FOREACH(disk, &sc->sc_disks, d_next) { + if (disk->d_state != G_MIRROR_DISK_STATE_ACTIVE) + continue; + G_MIRROR_DEBUG(1, "Disk %s (device %s) marked as dirty.", + g_mirror_get_diskname(disk), sc->sc_name); + disk->d_flags |= G_MIRROR_DISK_FLAG_DIRTY; + g_mirror_update_metadata(disk); + } + g_topology_unlock(); +} + +/* + * Return 1 if we should check if mirror is idling. + */ +static int +g_mirror_check_idle(struct g_mirror_softc *sc) +{ + struct g_mirror_disk *disk; + + if (sc->sc_idle) + return (0); + if (sc->sc_provider != NULL && sc->sc_provider->acw == 0) + return (0); + /* + * Check if there are no in-flight requests. + */ + LIST_FOREACH(disk, &sc->sc_disks, d_next) { + if (disk->d_state != G_MIRROR_DISK_STATE_ACTIVE) + continue; + if (disk->d_consumer->index > 0) + return (0); + } + return (1); +} + static __inline int bintime_cmp(struct bintime *bt1, struct bintime *bt2) { @@ -752,6 +825,7 @@ g_topology_assert_not(); + bp->bio_from->index--; pbp = bp->bio_parent; sc = pbp->bio_to->geom->softc; disk = bp->bio_from->private; @@ -907,6 +981,7 @@ disk->d_sync.ds_offset += bp->bio_length; bp->bio_to = sc->sc_provider; G_MIRROR_LOGREQ(3, bp, "Sending synchronization request."); + disk->d_sync.ds_consumer->index++; g_io_request(bp, disk->d_sync.ds_consumer); } @@ -916,6 +991,7 @@ struct g_mirror_softc *sc; struct g_mirror_disk *disk; + bp->bio_from->index--; sc = bp->bio_from->geom->softc; disk = bp->bio_from->private; if (disk == NULL) { @@ -941,13 +1017,15 @@ g_destroy_bio(bp); return; } + G_MIRROR_LOGREQ(3, bp, + "Synchronization request half-finished."); bp->bio_cmd = BIO_WRITE; bp->bio_cflags = 0; - G_MIRROR_LOGREQ(3, bp, "Synchronization request finished."); cp = disk->d_consumer; KASSERT(cp->acr == 0 && cp->acw == 1 && cp->ace == 1, ("Consumer %s not opened (r%dw%de%d).", cp->provider->name, cp->acr, cp->acw, cp->ace)); + cp->index++; g_io_request(bp, cp); return; } @@ -1031,6 +1109,7 @@ KASSERT(cp->acr > 0 && cp->ace > 0, ("Consumer %s not opened (r%dw%de%d).", cp->provider->name, cp->acr, cp->acw, cp->ace)); + cp->index++; g_io_request(cbp, cp); } @@ -1065,6 +1144,7 @@ KASSERT(cp->acr > 0 && cp->ace > 0, ("Consumer %s not opened (r%dw%de%d).", cp->provider->name, cp->acr, cp->acw, cp->ace)); + cp->index++; g_io_request(cbp, cp); } @@ -1112,6 +1192,7 @@ KASSERT(cp->acr > 0 && cp->ace > 0, ("Consumer %s not opened (r%dw%de%d).", cp->provider->name, cp->acr, cp->acw, cp->ace)); + cp->index++; g_io_request(cbp, cp); } @@ -1180,6 +1261,7 @@ KASSERT(cp->acr > 0 && cp->ace > 0, ("Consumer %s not opened (r%dw%de%d).", cp->provider->name, cp->acr, cp->acw, cp->ace)); + disk->d_consumer->index++; g_io_request(cbp, disk->d_consumer); } } @@ -1216,6 +1298,8 @@ struct g_consumer *cp; struct bio *cbp; + if (sc->sc_idle) + g_mirror_unidle(sc); /* * Allocate all bios before sending any request, so we can * return ENOMEM in nice and clean way. @@ -1267,6 +1351,7 @@ G_MIRROR_LOGREQ(3, cbp, "Sending request."); cp = cbp->bio_caller1; cbp->bio_caller1 = NULL; + cp->index++; g_io_request(cbp, cp); } /* @@ -1445,8 +1530,29 @@ goto sleep; } if (bp == NULL) { - MSLEEP(sc, &sc->sc_queue_mtx, PRIBIO | PDROP, "m:w1", 0); - G_MIRROR_DEBUG(5, "%s: I'm here 3.", __func__); + if (g_mirror_check_idle(sc)) { + u_int idletime; + + idletime = g_mirror_idletime; + if (idletime == 0) + idletime = 1; + idletime *= hz; + if (msleep(sc, &sc->sc_queue_mtx, PRIBIO | PDROP, + "m:w1", idletime) == EWOULDBLOCK) { + G_MIRROR_DEBUG(5, "%s: I'm here 3.", + __func__); + /* + * No I/O requests in 'idletime' seconds, + * so mark components as clean. + */ + g_mirror_idle(sc); + } + G_MIRROR_DEBUG(5, "%s: I'm here 4.", __func__); + } else { + MSLEEP(sc, &sc->sc_queue_mtx, PRIBIO | PDROP, + "m:w2", 0); + G_MIRROR_DEBUG(5, "%s: I'm here 5.", __func__); + } continue; } nreqs++; @@ -1460,26 +1566,26 @@ g_mirror_sync_request(bp); sleep: - sps = atomic_load_acq_int(&g_mirror_syncs_per_sec); + sps = g_mirror_syncs_per_sec; if (sps == 0) { - G_MIRROR_DEBUG(5, "%s: I'm here 5.", __func__); + G_MIRROR_DEBUG(5, "%s: I'm here 6.", __func__); continue; } mtx_lock(&sc->sc_queue_mtx); if (bioq_first(&sc->sc_queue) != NULL) { mtx_unlock(&sc->sc_queue_mtx); - G_MIRROR_DEBUG(5, "%s: I'm here 4.", __func__); + G_MIRROR_DEBUG(5, "%s: I'm here 7.", __func__); continue; } timeout = hz / sps; if (timeout == 0) timeout = 1; - MSLEEP(sc, &sc->sc_queue_mtx, PRIBIO | PDROP, "m:w2", + MSLEEP(sc, &sc->sc_queue_mtx, PRIBIO | PDROP, "m:w3", timeout); } else { g_mirror_register_request(bp); } - G_MIRROR_DEBUG(5, "%s: I'm here 6.", __func__); + G_MIRROR_DEBUG(5, "%s: I'm here 8.", __func__); } } @@ -1565,6 +1671,7 @@ sc->sc_name, g_mirror_get_diskname(disk))); disk->d_sync.ds_consumer = g_new_consumer(sc->sc_sync.ds_geom); disk->d_sync.ds_consumer->private = disk; + disk->d_sync.ds_consumer->index = 0; error = g_attach(disk->d_sync.ds_consumer, disk->d_softc->sc_provider); KASSERT(error == 0, ("Cannot attach to %s (error=%d).", disk->d_softc->sc_name, error)); @@ -1911,20 +2018,15 @@ break; } case G_MIRROR_DEVICE_STATE_RUNNING: - if (g_mirror_ndisks(sc, -1) == 0) { - /* - * No disks at all, we need to destroy device. - */ - sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY; - break; - } else if (g_mirror_ndisks(sc, - G_MIRROR_DISK_STATE_ACTIVE) == 0 && + if (g_mirror_ndisks(sc, G_MIRROR_DISK_STATE_ACTIVE) == 0 && g_mirror_ndisks(sc, G_MIRROR_DISK_STATE_NEW) == 0) { /* - * No active disks, destroy provider. + * No active disks or no disks at all, + * so destroy device. */ if (sc->sc_provider != NULL) g_mirror_destroy_provider(sc); + sc->sc_flags |= G_MIRROR_DEVICE_FLAG_DESTROY; break; } else if (g_mirror_ndisks(sc, G_MIRROR_DISK_STATE_ACTIVE) > 0 && @@ -2410,6 +2512,7 @@ sc->sc_ndisks = md->md_all; sc->sc_flags = md->md_mflags; sc->sc_bump_syncid = 0; + sc->sc_idle = 0; bioq_init(&sc->sc_queue); mtx_init(&sc->sc_queue_mtx, "gmirror:queue", NULL, MTX_DEF); LIST_INIT(&sc->sc_disks); @@ -2446,8 +2549,8 @@ /* * Run timeout. */ - timeout = atomic_load_acq_int(&g_mirror_timeout); - callout_reset(&sc->sc_callout, timeout * hz, g_mirror_go, sc); + timeout = g_mirror_timeout * hz; + callout_reset(&sc->sc_callout, timeout, g_mirror_go, sc); return (sc->sc_geom); } @@ -2694,6 +2797,44 @@ } } +static void +g_mirror_shutdown(void *arg, int howto) +{ + struct g_class *mp; + struct g_geom *gp, *gp2; + + mp = arg; + g_topology_lock(); + LIST_FOREACH_SAFE(gp, &mp->geom, geom, gp2) { + if (gp->softc == NULL) + continue; + g_mirror_destroy(gp->softc, 1); + } + g_topology_unlock(); +#if 0 + tsleep(&gp, PRIBIO, "m:shutdown", hz * 20); +#endif +} + +static void +g_mirror_init(struct g_class *mp) +{ + + g_mirror_ehtag = EVENTHANDLER_REGISTER(shutdown_post_sync, + g_mirror_shutdown, mp, SHUTDOWN_PRI_FIRST); + if (g_mirror_ehtag == NULL) + G_MIRROR_DEBUG(0, "Warning! Cannot register shutdown event."); +} + +static void +g_mirror_fini(struct g_class *mp) +{ + + if (g_mirror_ehtag == NULL) + return; + EVENTHANDLER_DEREGISTER(shutdown_post_sync, g_mirror_ehtag); +} + static int g_mirror_can_go(void) { ==== //depot/projects/smpng/sys/geom/mirror/g_mirror.h#4 (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/geom/mirror/g_mirror.h,v 1.10 2004/09/28 07:33:37 pjd Exp $ + * $FreeBSD: src/sys/geom/mirror/g_mirror.h,v 1.11 2004/11/05 09:05:15 pjd Exp $ */ #ifndef _G_MIRROR_H_ @@ -174,6 +174,7 @@ u_int sc_syncid; /* Synchronization ID. */ int sc_bump_syncid; struct g_mirror_device_sync sc_sync; + int sc_idle; /* DIRTY flags removed. */ TAILQ_HEAD(, g_mirror_event) sc_events; struct mtx sc_events_mtx; ==== //depot/projects/smpng/sys/geom/raid3/g_raid3.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.18 2004/09/28 07:33:37 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/raid3/g_raid3.c,v 1.22 2004/11/05 17:18:39 pjd Exp $"); #include #include @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,8 +55,13 @@ SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, debug, CTLFLAG_RW, &g_raid3_debug, 0, "Debug level"); static u_int g_raid3_timeout = 4; +TUNABLE_INT("kern.geom.raid3.timeout", &g_raid3_timeout); SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, timeout, CTLFLAG_RW, &g_raid3_timeout, 0, "Time to wait on all raid3 components"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 5 19:59:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5D2316A4D0; Fri, 5 Nov 2004 19:59:05 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7507916A4CE for ; Fri, 5 Nov 2004 19:59:05 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6613343D2D for ; Fri, 5 Nov 2004 19:59:05 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5Jx5WU026639 for ; Fri, 5 Nov 2004 19:59:05 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5Jx5g7026636 for perforce@freebsd.org; Fri, 5 Nov 2004 19:59:05 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 19:59:05 GMT Message-Id: <200411051959.iA5Jx5g7026636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 19:59:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=64367 Change 64367 by peter@peter_overcee on 2004/11/05 19:58:26 Try and make objc build ok Affected files ... .. //depot/projects/hammer/Makefile.inc1#68 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#68 (text+ko) ==== @@ -205,20 +205,23 @@ # 32 bit world CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ CC="cc ${CCARGS}" \ CXX="c++ ${CXXARGS}" \ + OBJC="cc ${OBJCARGS}" \ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ CC="cc ${CCARGS}" \ CXX="c++ ${CXXARGS}" \ + OBJC="cc ${OBJCARGS}" \ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ From owner-p4-projects@FreeBSD.ORG Fri Nov 5 20:24:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CA8916A4D0; Fri, 5 Nov 2004 20:24:39 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C78216A4CF for ; Fri, 5 Nov 2004 20:24:39 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0F0F43D55 for ; Fri, 5 Nov 2004 20:24:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5KOcJh027547 for ; Fri, 5 Nov 2004 20:24:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5KOcLW027544 for perforce@freebsd.org; Fri, 5 Nov 2004 20:24:38 GMT (envelope-from jhb@freebsd.org) Date: Fri, 5 Nov 2004 20:24:38 GMT Message-Id: <200411052024.iA5KOcLW027544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 64372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 20:24:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=64372 Change 64372 by jhb@jhb_slimer on 2004/11/05 20:23:43 IFC @64371 (more merges). Affected files ... .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#4 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/smpng/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#12 integrate Differences ... ==== //depot/projects/smpng/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.3 2004/09/23 21:59:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.4 2004/11/05 19:48:40 cognet Exp $"); #include @@ -973,7 +973,11 @@ cpufuncs = arm9_cpufuncs; cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ get_cachetype_cp15(); +#ifdef ARM9_CACHE_WRITE_THROUGH pmap_pte_init_arm9(); +#else + pmap_pte_init_generic(); +#endif return 0; } #endif /* CPU_ARM9 */ ==== //depot/projects/smpng/sys/arm/arm/fusu.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.2 2004/09/28 14:39:26 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.3 2004/11/05 19:50:48 cognet Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -52,6 +52,56 @@ * Fetch an int from the user's address space. */ +ENTRY(casuptr) +#ifdef MULTIPROCESSOR + /* XXX Probably not appropriate for non-Hydra SMPs */ + stmfd sp!, {r0, r14} + bl _C_LABEL(cpu_number) + ldr r2, .Lcpu_info + ldr r2, [r2, r0, lsl #2] + ldr r2, [r2, #CI_CURPCB] + ldmfd sp!, {r0, r14} +#else + ldr r3, .Lcurpcb + ldr r3, [r3] +#endif + +#ifdef DIAGNOSTIC + teq r3, #0x00000000 + beq .Lfusupcbfault +#endif + stmfd sp!, {r4} + adr r4, .Lfusufault + str r4, [r3, #PCB_ONFAULT] + ldmfd sp!, {r4} + ldrt r3, [r0] + cmp r3, r1 + movne r0, r3 + movne pc, lr + strt r2, [r0] + mov r0, r1 +#ifdef MULTIPROCESSOR + /* XXX Probably not appropriate for non-Hydra SMPs */ + stmfd sp!, {r0, r14} + bl _C_LABEL(cpu_number) + ldr r2, .Lcpu_info + ldr r2, [r2, r0, lsl #2] + ldr r2, [r2, #CI_CURPCB] + ldmfd sp!, {r0, r14} +#else + ldr r3, .Lcurpcb + ldr r3, [r3] +#endif + mov r1, #0x00000000 + str r1, [r3, #PCB_ONFAULT] + mov pc, lr + + +/* + * fuword(caddr_t uaddr); + * Fetch an int from the user's address space. + */ + ENTRY(fuword32) ENTRY(fuword) #ifdef MULTIPROCESSOR @@ -254,6 +304,7 @@ * Store an int in the user's address space. */ +ENTRY(suword32) ENTRY(suword) #ifdef MULTIPROCESSOR /* XXX Probably not appropriate for non-Hydra SMPs */ @@ -282,8 +333,6 @@ str r0, [r2, #PCB_ONFAULT] mov pc, lr -ENTRY(suword32) - adr pc, _C_LABEL(suword) /* * suswintr(caddr_t uaddr, short x); * Store a short in the user's address space. Can be called during an ==== //depot/projects/smpng/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.2 2004/09/23 22:11:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.3 2004/11/05 19:51:23 cognet Exp $"); #include #include #include @@ -277,7 +277,6 @@ * The remaining fields in the cpu structure are filled in appropriately. */ -#if 0 static const char * const wtnames[] = { "write-through", "write-back", @@ -296,7 +295,6 @@ "**unknown 14**", "**unknown 15**", }; -#endif extern int ctrl; void @@ -365,6 +363,24 @@ if (ctrl & CPU_CONTROL_BPRD_ENABLE) printf(" branch prediction enabled"); + /* Print cache info. */ + if (arm_picache_line_size == 0 && arm_pdcache_line_size == 0) + return; + + if (arm_pcache_unified) { + printf("%dKB/%dB %d-way %s unified cache\n", + arm_pdcache_size / 1024, + arm_pdcache_line_size, arm_pdcache_ways, + wtnames[arm_pcache_type]); + } else { + printf("%dKB/%dB %d-way Instruction cache\n", + arm_picache_size / 1024, + arm_picache_line_size, arm_picache_ways); + printf("%dKB/%dB %d-way %s Data cache\n", + arm_pdcache_size / 1024, + arm_pdcache_line_size, arm_pdcache_ways, + wtnames[arm_pcache_type]); + } printf("\n"); } ==== //depot/projects/smpng/sys/arm/arm/locore.S#4 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.4 2004/09/28 14:37:08 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.5 2004/11/05 19:52:55 cognet Exp $"); /* What size should this really be ? It is only used by init_arm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -157,6 +157,19 @@ subs r2, r2, #4 bgt .L1 + ldr r4, =KERNVIRTADDR + cmp pc, r4 +#if KERNVIRTADDR > KERNPHYSADDR + ldrlt r4, =KERNVIRTADDR + ldrlt r5, =KERNPHYSADDR + sublt r4, r4, r5 + addlt pc, pc, r4 +#else + ldrgt r4, =KERNPHYSADDR + ldrgt r5, =KERNVIRTADDR + subgt r4, r4, r5 + sublt pc, pc, r4 +#endif ldr fp, =KERNVIRTADDR /* trace back starts here */ bl _C_LABEL(initarm) /* Off we go */ ==== //depot/projects/smpng/sys/arm/arm/support.S#5 (text+ko) ==== @@ -26,14 +26,10 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.5 2004/09/23 22:18:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.6 2004/11/05 19:50:48 cognet Exp $"); #include "assym.s" -ENTRY(casuptr) - mov r1, r2 - bl suword - /* * memset: Sets a block of memory to the specified value * ==== //depot/projects/smpng/sys/arm/arm/swtch.S#3 (text+ko) ==== @@ -78,12 +78,13 @@ * */ +#include "assym.s" + #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.3 2004/09/28 14:37:39 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.4 2004/11/05 19:54:13 cognet Exp $"); -#include "assym.s" /* * New experimental definitions of IRQdisable and IRQenable @@ -118,8 +119,6 @@ bic r14, r14, #(I32_bit | F32_bit) ; \ msr cpsr_c, r14 -.Lpcpu: - .word _C_LABEL(__pcpu) .Lcurpcb: .word _C_LABEL(__pcpu) + PC_CURPCB .Lcpufuncs: @@ -130,35 +129,22 @@ .word _C_LABEL(cpu_do_powersave) ENTRY(cpu_throw) mov r4, r0 - ldr r0, .Lcurthread mov r5, r1 /* - * r4 = lwp - * r5 = lwp0 + * r4 = oldtd + * r5 = newtd */ - mov r2, #0x00000000 /* curthread = NULL */ - str r2, [r0] - - /* - * We're about to clear both the cache and the TLB. - * Make sure to zap the 'last cache state' pointer since the - * pmap might be about to go away. Also ensure the outgoing - * VM space's cache state is marked as NOT resident in the - * cache, and that lwp0's cache state IS resident. - */ - ldr r7, [r4, #(TD_PCB)] /* r7 = old lwp's PCB */ + ldr r7, [r5, #(TD_PCB)] /* r7 = new thread's PCB */ /* Switch to lwp0 context */ ldr r9, .Lcpufuncs mov lr, pc ldr pc, [r9, #CF_IDCACHE_WBINV_ALL] - ldr r0, [r7, #(PCB_PL1VEC)] ldr r1, [r7, #(PCB_DACR)] - /* * r0 = Pointer to L1 slot for vector_page (or NULL) * r1 = lwp0's DACR @@ -201,8 +187,6 @@ mov lr, pc ldr pc, [r9, #CF_CONTEXT_SWITCH] - ldr r0, .Lcurpcb - /* Restore all the save registers */ #ifndef __XSCALE__ add r1, r7, #PCB_R8 @@ -215,46 +199,35 @@ ldr r12, [r7, #(PCB_R12)] ldr r13, [r7, #(PCB_SP)] #endif - str r7, [r0] /* curpcb = lwp0's PCB */ - mov r1, #0x00000000 /* r5 = old lwp = NULL */ - mov r6, r5 + mov r0, #0x00000000 /* r5 = old lwp = NULL */ + mov r1, r5 b .Lswitch_resume ENTRY(cpu_switch) stmfd sp!, {r4-r7, lr} - mov r6, r1 - mov r1, r0 .Lswitch_resume: - /* rem: r1 = old lwp */ - /* rem: r4 = return value [not used if came from cpu_switchto()] */ - /* rem: r6 = new process */ + /* rem: r0 = old lwp */ /* rem: interrupts are disabled */ #ifdef MULTIPROCESSOR /* XXX use curcpu() */ - ldr r0, .Lcpu_info_store - str r0, [r6, #(L_CPU)] + ldr r2, .Lcpu_info_store + str r2, [r6, #(L_CPU)] #endif /* Process is now on a processor. */ /* We have a new curthread now so make a note it */ ldr r7, .Lcurthread - str r6, [r7] + str r1, [r7] /* Hook in a new pcb */ ldr r7, .Lcurpcb - ldr r0, [r6, #(TD_PCB)] - str r0, [r7] - - /* rem: r1 = old lwp */ - /* rem: r4 = return value */ - /* rem: r6 = new process */ + ldr r2, [r1, #TD_PCB] + str r2, [r7] - /* Remember the old thread in r0 */ - mov r0, r1 /* * If the old lwp on entry to cpu_switch was zero then the @@ -263,26 +236,24 @@ * straight to restoring the context for the new process. */ teq r0, #0x00000000 - beq .Lswitch_exited + beq .Lswitch_return - /* rem: r0 = old lwp */ - /* rem: r4 = return value */ - /* rem: r6 = new process */ + /* rem: r1 = new process */ /* rem: interrupts are enabled */ /* Stage two : Save old context */ /* Get the user structure for the old lwp. */ - ldr r1, [r0, #(TD_PCB)] + ldr r2, [r0, #(TD_PCB)] /* Save all the registers in the old lwp's pcb */ #ifndef __XSCALE__ - add r7, r1, #(PCB_R8) + add r7, r2, #(PCB_R8) stmia r7, {r8-r13} #else - strd r8, [r1, #(PCB_R8)] - strd r10, [r1, #(PCB_R10)] - strd r12, [r1, #(PCB_R12)] + strd r8, [r2, #(PCB_R8)] + strd r10, [r2, #(PCB_R10)] + strd r12, [r2, #(PCB_R12)] #endif /* @@ -291,12 +262,13 @@ */ /* Remember the old PCB. */ - mov r8, r1 + mov r8, r2 - /* r1 now free! */ /* Get the user structure for the new process in r9 */ - ldr r9, [r6, #(TD_PCB)] + ldr r9, [r1, #(TD_PCB)] + + /* r1 now free! */ /* * This can be optimised... We know we want to go from SVC32 @@ -310,9 +282,6 @@ str sp, [r8, #(PCB_UND_SP)] msr cpsr_c, r3 /* Restore the old mode */ - /* rem: r0 = old lwp */ - /* rem: r4 = return value */ - /* rem: r6 = new process */ /* rem: r8 = old PCB */ /* rem: r9 = new PCB */ /* rem: interrupts are enabled */ @@ -321,9 +290,6 @@ /* Third phase : restore saved context */ - /* rem: r0 = old lwp */ - /* rem: r4 = return value */ - /* rem: r6 = new lwp */ /* rem: r8 = old PCB */ /* rem: r9 = new PCB */ /* rem: interrupts are enabled */ @@ -342,16 +308,18 @@ ldr r0, [r8, #(PCB_DACR)] /* r0 = old DACR */ - ldr r1, [r9, #(PCB_DACR)] /* r1 = new DACR */ + ldr r5, [r9, #(PCB_DACR)] /* r1 = new DACR */ teq r10, r11 /* Same L1? */ - cmpeq r0, r1 /* Same DACR? */ + cmpeq r0, r5 /* Same DACR? */ beq .Lcs_context_switched /* yes! */ - ldr r3, .Lblock_userspace_access + ldr r4, .Lblock_userspace_access - mov r2, #DOMAIN_CLIENT - cmp r1, r2, lsl #(PMAP_DOMAIN_KERNEL * 2) /* Sw to kernel thread? */ - beq .Lcs_cache_purge_skipped /* Yup. Don't flush cache */ + mov r2, #DOMAIN_CLIENT + cmp r5, r2, lsl #(PMAP_DOMAIN_KERNEL * 2) /* Sw to kernel thread? */ + + beq .Lcs_cache_purge_skipped /* Yup. Don't flush cache */ + /* * Definately need to flush the cache. */ @@ -360,17 +328,13 @@ * Don't allow user space access between the purge and the switch. */ mov r2, #0x00000001 - str r2, [r3] + str r2, [r4] - stmfd sp!, {r0-r3} ldr r1, .Lcpufuncs mov lr, pc ldr pc, [r1, #CF_IDCACHE_WBINV_ALL] - ldmfd sp!, {r0-r3} .Lcs_cache_purge_skipped: - /* rem: r1 = new DACR */ - /* rem: r3 = &block_userspace_access */ - /* rem: r4 = return value */ + /* rem: r4 = &block_userspace_access */ /* rem: r6 = new lwp */ /* rem: r9 = new PCB */ /* rem: r10 = old L1 */ @@ -384,7 +348,7 @@ * as none will occur until interrupts are re-enabled after the * switch. */ - str r2, [r3] + str r2, [r4] /* * Ensure the vector table is accessible by fixing up the L1 @@ -392,7 +356,7 @@ cmp r7, #0 /* No need to fixup vector table? */ ldrne r2, [r7] /* But if yes, fetch current value */ ldrne r0, [r9, #(PCB_L1VEC)] /* Fetch new vector_page value */ - mcr p15, 0, r1, c3, c0, 0 /* Update DACR for new context */ + mcr p15, 0, r5, c3, c0, 0 /* Update DACR for new context */ cmpne r2, r0 /* Stuffing the same value? */ #ifndef PMAP_INCLUDE_PTE_SYNC strne r0, [r7] /* Nope, update it */ @@ -440,8 +404,6 @@ /* XXXSCW: Safe to re-enable FIQs here */ - /* rem: r4 = return value */ - /* rem: r6 = new lwp */ /* rem: r9 = new PCB */ /* @@ -471,8 +433,6 @@ ldr r13, [r7, #(PCB_SP)] #endif - /* rem: r4 = return value */ - /* rem: r5 = new lwp's proc */ /* rem: r6 = new lwp */ /* rem: r7 = new pcb */ @@ -482,7 +442,6 @@ bl _C_LABEL(arm_fpe_core_changecontext) #endif - /* rem: r4 = return value */ /* rem: r5 = new lwp's proc */ /* rem: r6 = new lwp */ /* rem: r7 = new PCB */ @@ -494,19 +453,6 @@ * cpu_switch() was called and return. */ ldmfd sp!, {r4-r7, pc} -.Lswitch_exited: - /* - * We skip the cache purge because cpu_throw() already did it. - * Load up registers the way .Lcs_cache_purge_skipped expects. - * Userspace access already blocked by cpu_throw(). - */ - ldr r9, [r6, #(TD_PCB)] /* r9 = new PCB */ - ldr r3, .Lblock_userspace_access - mrc p15, 0, r10, c2, c0, 0 /* r10 = old L1 */ - mov r5, #0 /* No previous cache state */ - ldr r1, [r9, #(PCB_DACR)] /* r1 = new DACR */ - ldr r11, [r9, #(PCB_PAGEDIR)] /* r11 = new L1 */ - b .Lcs_cache_purge_skipped #ifdef DIAGNOSTIC .Lswitch_bogons: adr r0, .Lswitch_panic_str ==== //depot/projects/smpng/sys/arm/arm/trap.c#3 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.2 2004/09/23 22:22:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.3 2004/11/05 19:57:10 cognet Exp $"); #include @@ -215,7 +215,6 @@ #endif /* CPU_ABORT_FIXUP_REQUIRED */ } -extern int curpid; void data_abort_handler(trapframe_t *tf) { @@ -229,6 +228,8 @@ u_int sticks = 0; int error = 0; struct ksig ksig; + struct proc *p; + /* Grab FAR/FSR before enabling interrupts */ far = cpu_faultaddress(); @@ -244,13 +245,17 @@ #endif td = curthread; + p = td->td_proc; /* Data abort came from user mode? */ user = TRAP_USERMODE(tf); if (user) { + sticks = td->td_sticks; td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); + if (td->td_pflags & TDP_SA) + thread_user_enter(td); } /* Grab the current pcb */ @@ -289,10 +294,6 @@ return; } - if (user) { - sticks = td->td_sticks; - td->td_frame = tf; - } /* * Make sure the Program Counter is sane. We could fall foul of * someone executing Thumb code, in which case the PC might not @@ -408,6 +409,11 @@ onfault = pcb->pcb_onfault; pcb->pcb_onfault = NULL; + if (map != kernel_map) { + PROC_LOCK(p); + p->p_lock++; + PROC_UNLOCK(p); + } error = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); pcb->pcb_onfault = onfault; @@ -415,6 +421,11 @@ goto out; } + if (map != kernel_map) { + PROC_LOCK(p); + p->p_lock++; + PROC_UNLOCK(p); + } if (user == 0) { if (pcb->pcb_onfault) { tf->tf_r0 = error; @@ -518,8 +529,13 @@ { /* Alignment faults are always fatal if they occur in kernel mode */ - if (!TRAP_USERMODE(tf)) - dab_fatal(tf, fsr, far, td, ksig); + if (!TRAP_USERMODE(tf)) { + if (!td || !td->td_pcb->pcb_onfault) + dab_fatal(tf, fsr, far, td, ksig); + tf->tf_r0 = EFAULT; + tf->tf_pc = (int)td->td_pcb->pcb_onfault; + return (0); + } /* pcb_onfault *must* be NULL at this point */ @@ -676,12 +692,14 @@ prefetch_abort_handler(trapframe_t *tf) { struct thread *td; + struct proc * p; struct vm_map *map; vm_offset_t fault_pc, va; int error = 0; u_int sticks = 0; struct ksig ksig; + #if 0 /* Update vmmeter statistics */ uvmexp.traps++; @@ -692,11 +710,14 @@ #endif td = curthread; + p = td->td_proc; if (TRAP_USERMODE(tf)) { + td->td_frame = tf; if (td->td_ucred != td->td_proc->p_ucred) cred_update_thread(td); - + if (td->td_proc->p_flag & P_SA) + thread_user_enter(td); } fault_pc = tf->tf_pc; if (td->td_critnest == 0 && @@ -721,8 +742,6 @@ /* Prefetch aborts cannot happen in kernel mode */ if (__predict_false(!TRAP_USERMODE(tf))) dab_fatal(tf, 0, tf->tf_pc, NULL, &ksig); - /* Get fault address */ - td->td_frame = tf; sticks = td->td_sticks; @@ -746,8 +765,20 @@ if (pmap_fault_fixup(map->pmap, va, VM_PROT_READ, 1)) goto out; + if (map != kernel_map) { + PROC_LOCK(p); + p->p_lock++; + PROC_UNLOCK(p); + } + error = vm_fault(map, va, VM_PROT_READ | VM_PROT_EXECUTE, VM_FAULT_NORMAL); + if (map != kernel_map) { + PROC_LOCK(p); + p->p_lock--; + PROC_UNLOCK(p); + } + if (__predict_true(error == 0)) goto out; @@ -861,16 +892,14 @@ else callp = &p->p_sysent->sv_table[code]; nargs = callp->sy_narg & SYF_ARGMASK; - if (nargs <= nap) - args = ap; - else { - memcpy(copyargs, ap, nap * sizeof(register_t)); + memcpy(copyargs, ap, nap * sizeof(register_t)); + if (nargs > nap) { error = copyin((void *)frame->tf_usr_sp, copyargs + nap, (nargs - nap) * sizeof(register_t)); if (error) goto bad; - args = copyargs; } + args = copyargs; error = 0; #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) @@ -927,14 +956,10 @@ struct thread *td = curthread; uint32_t insn; - /* - * Enable interrupts if they were enabled before the exception. - * Since all syscalls *should* come from user mode it will always - * be safe to enable them, but check anyway. - */ + td->td_frame = frame; - if (td->td_critnest == 0 && !(frame->tf_spsr & I32_bit)) - enable_interrupts(I32_bit); + if (td->td_proc->p_flag & P_SA) + thread_user_enter(td); /* * Make sure the program counter is correctly aligned so we * don't take an alignment fault trying to read the opcode. @@ -945,7 +970,14 @@ return; } insn = *(u_int32_t *)(frame->tf_pc - INSN_SIZE); - td->td_frame = frame; + /* + * Enable interrupts if they were enabled before the exception. + * Since all syscalls *should* come from user mode it will always + * be safe to enable them, but check anyway. + */ + if (td->td_critnest == 0 && !(frame->tf_spsr & I32_bit)) + enable_interrupts(I32_bit); + syscall(td, frame, insn); } ==== //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.1 2004/09/23 22:45:36 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq31244_machdep.c,v 1.2 2004/11/05 19:52:55 cognet Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -116,8 +116,6 @@ #else #define UND_STACK_SIZE 1 #endif -#define KERNEL_VM_BASE (KERNBASE + 0x00c00000) -#define KERNEL_VM_SIZE 0x05000000 extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; @@ -183,16 +181,7 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, -#if 0 { - 0x80000000, - 0x80000000, - 0x08000000, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, -#endif - { 0, 0, 0, @@ -202,17 +191,14 @@ }; #define SDRAM_START 0xa0000000 -void DO_corb(void); extern vm_offset_t xscale_cache_clean_addr; void * initarm(void *arg, void *arg2) { - struct pcpu *pc; struct pv_addr kernel_l1pt; struct pv_addr proc0_uarea; - struct pv_addr altkern[KERNEL_PT_KERNEL_NUM]; int loop; u_int kerneldatasize, symbolsize; u_int l1pagetable; @@ -224,6 +210,7 @@ i80321_calibrate_delay(); cninit(); + i = 0; set_cpufuncs(); /* * Fetch the SDRAM start/size from the i80321 SDRAM configration @@ -241,17 +228,17 @@ i += 2; fake_preload[i++] = MODINFO_ADDR; fake_preload[i++] = sizeof(vm_offset_t); - fake_preload[i++] = KERNBASE; + fake_preload[i++] = KERNBASE + 0x00200000; fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); - fake_preload[i++] = (uint32_t)&end - KERNBASE; + fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000; fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; physmem = memsize / PAGE_SIZE; - pc = &__pcpu; - pcpu_init(pc, 0, sizeof(struct pcpu)); + + pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); physical_start = (vm_offset_t) SDRAM_START; @@ -279,10 +266,6 @@ L2_TABLE_SIZE / PAGE_SIZE); } - for (loop = 0; loop < KERNEL_PT_KERNEL_NUM; loop++) { - valloc_pages(altkern[loop], L2_TABLE_SIZE / PAGE_SIZE); - } - /* * Allocate a page for the system page mapped to V0x00000000 * This page will just contain the system vectors and can be @@ -314,7 +297,7 @@ * We start by mapping the L2 page tables into the L1. * This means that we can replace L1 mappings later on if necessary */ - l1pagetable = kernel_l1pt.pv_pa; + l1pagetable = kernel_l1pt.pv_va; /* Map the L2 pages tables in the L1 page table */ @@ -323,19 +306,15 @@ for (i = 0; i < KERNEL_PT_KERNEL_NUM; i++) { pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x00400000, &kernel_pt_table[KERNEL_PT_KERNEL + i]); - pmap_link_l2pt(l1pagetable, 0xa0000000 + i * 0x00400000, - &altkern[i]); } for (loop = 0; loop < KERNEL_PT_VMDATA_NUM; ++loop) - pmap_link_l2pt(l1pagetable, KERNBASE + (KERNEL_PT_KERNEL_NUM + loop) * 0x00400000, + pmap_link_l2pt(l1pagetable, KERNBASE + (i + loop) * 0x00400000, &kernel_pt_table[KERNEL_PT_VMDATA + loop]); pmap_link_l2pt(l1pagetable, IQ80321_IOPXS_VBASE, &kernel_pt_table[KERNEL_PT_IOPXS]); pmap_map_chunk(l1pagetable, KERNBASE + 0x200000, SDRAM_START + 0x200000, (((uint32_t)(&end) - KERNBASE - 0x200000) + PAGE_SHIFT) & ~PAGE_SHIFT, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - pmap_map_chunk(l1pagetable, KERNPHYSADDR, KERNPHYSADDR, - (((uint32_t)(&end) - KERNBASE - 0x200000) + PAGE_SHIFT) & ~PAGE_SHIFT, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); /* Map the stack pages */ pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa, IRQ_STACK_SIZE * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); @@ -358,11 +337,6 @@ kernel_pt_table[loop].pv_pa, L2_TABLE_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); } - for (loop = 0; loop < 4; loop++) { - pmap_map_chunk(l1pagetable, altkern[loop].pv_va, - altkern[loop].pv_pa, L2_TABLE_SIZE, - VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); - } /* Map the Mini-Data cache clean area. */ xscale_setup_minidata(l1pagetable, minidataclean.pv_va, minidataclean.pv_pa); ==== //depot/projects/smpng/sys/dev/random/randomdev_soft.c#6 (text+ko) ==== @@ -208,7 +208,8 @@ * Command the hash/reseed thread to end and wait for it to finish */ random_kthread_control = -1; - tsleep((void *)&random_kthread_control, PUSER, "term", 0); + tsleep((void *)&random_kthread_control, curthread->td_priority, "term", + 0); /* Destroy the harvest fifos */ while (!STAILQ_EMPTY(&emptyfifo.head)) { @@ -281,7 +282,8 @@ /* Found nothing, so don't belabour the issue */ if (!active) - tsleep(&harvestfifo, PUSER, "-", hz / 10); + tsleep(&harvestfifo, curthread->td_priority, "-", + hz / 10); } ==== //depot/projects/smpng/sys/kern/subr_sleepqueue.c#12 (text+ko) ==== @@ -62,7 +62,7 @@ #include "opt_sleepqueue_profiling.h" #include -__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.13 2004/10/12 18:36:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_sleepqueue.c,v 1.14 2004/11/05 20:19:58 jhb Exp $"); #include #include @@ -252,7 +252,7 @@ } /* - * Places the current thread on the sleepqueue for the specified wait + * Places the current thread on the sleep queue for the specified wait * channel. If INVARIANTS is enabled, then it associates the passed in * lock with the sleepq to make sure it is held when that sleep queue is * woken up. @@ -262,7 +262,7 @@ { struct sleepqueue_chain *sc; struct sleepqueue *sq; - struct thread *td, *td1; + struct thread *td; td = curthread; sc = SC_LOOKUP(wchan); @@ -299,20 +299,13 @@ sq->sq_lock = lock; sq->sq_type = flags & SLEEPQ_TYPE; #endif - TAILQ_INSERT_TAIL(&sq->sq_blocked, td, td_slpq); } else { MPASS(wchan == sq->sq_wchan); MPASS(lock == sq->sq_lock); MPASS((flags & SLEEPQ_TYPE) == sq->sq_type); - TAILQ_FOREACH(td1, &sq->sq_blocked, td_slpq) - if (td1->td_priority > td->td_priority) - break; - if (td1 != NULL) - TAILQ_INSERT_BEFORE(td1, td, td_slpq); - else - TAILQ_INSERT_TAIL(&sq->sq_blocked, td, td_slpq); LIST_INSERT_HEAD(&sq->sq_free, td->td_sleepqueue, sq_hash); } + TAILQ_INSERT_TAIL(&sq->sq_blocked, td, td_slpq); td->td_sleepqueue = NULL; mtx_lock_spin(&sched_lock); td->td_wchan = wchan; @@ -404,7 +397,7 @@ /* * Switches to another thread if we are still asleep on a sleep queue and - * drop the lock on the sleepqueue chain. Returns with sched_lock held. + * drop the lock on the sleep queue chain. Returns with sched_lock held. */ static void sleepq_switch(void *wchan) @@ -675,7 +668,7 @@ sleepq_signal(void *wchan, int flags, int pri) { struct sleepqueue *sq; - struct thread *td; + struct thread *td, *besttd; CTR2(KTR_PROC, "sleepq_signal(%p, %d)", wchan, flags); KASSERT(wchan != NULL, ("%s: invalid NULL wait channel", __func__)); @@ -687,11 +680,21 @@ KASSERT(sq->sq_type == (flags & SLEEPQ_TYPE), ("%s: mismatch between sleep/wakeup and cv_*", __func__)); - /* Remove first thread from queue and awaken it. */ - td = TAILQ_FIRST(&sq->sq_blocked); - sleepq_remove_thread(sq, td); + /* + * Find the highest priority thread on the queue. If there is a + * tie, use the thread that first appears in the queue as it has + * been sleeping the longest since threads are always added to + * the tail of sleep queues. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 5 22:21:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9863E16A4D0; Fri, 5 Nov 2004 22:21:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 708B916A4CE for ; Fri, 5 Nov 2004 22:21:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6510243D41 for ; Fri, 5 Nov 2004 22:21:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5ML1OL038527 for ; Fri, 5 Nov 2004 22:21:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5ML1Cl038524 for perforce@freebsd.org; Fri, 5 Nov 2004 22:21:01 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 22:21:01 GMT Message-Id: <200411052221.iA5ML1Cl038524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 22:21:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=64377 Change 64377 by peter@peter_daintree on 2004/11/05 22:20:48 begin the invasion of i386-land for real. Affected files ... .. //depot/projects/hammer/sys/i386/include/sysarch.h#6 edit Differences ... ==== //depot/projects/hammer/sys/i386/include/sysarch.h#6 (text+ko) ==== @@ -44,6 +44,12 @@ /* xxxxx */ #define I386_VM86 6 +/* These four only exist when running an i386 binary on amd64 */ +#define _AMD64_GET_FSBASE 128 +#define _AMD64_SET_FSBASE 129 +#define _AMD64_GET_GSBASE 130 +#define _AMD64_SET_GSBASE 131 + struct i386_ldt_args { unsigned int start; union descriptor *descs; @@ -68,6 +74,11 @@ struct dbreg; __BEGIN_DECLS +/* These four only exist when running an i386 binary on amd64 */ +int _amd64_get_fsbase(void **); +int _amd64_get_gsbase(void **); +int _amd64_set_fsbase(void *); +int _amd64_set_gsbase(void *); int i386_get_ldt(int, union descriptor *, int); int i386_set_ldt(int, union descriptor *, int); int i386_get_ioperm(unsigned int, unsigned int *, int *); From owner-p4-projects@FreeBSD.ORG Fri Nov 5 22:29:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1208C16A4D0; Fri, 5 Nov 2004 22:29:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D13F716A4CE for ; Fri, 5 Nov 2004 22:29:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF90243D31 for ; Fri, 5 Nov 2004 22:29:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5MTB4v038814 for ; Fri, 5 Nov 2004 22:29:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5MTBsK038811 for perforce@freebsd.org; Fri, 5 Nov 2004 22:29:11 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 22:29:11 GMT Message-Id: <200411052229.iA5MTBsK038811@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 22:29:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=64378 Change 64378 by peter@peter_daintree on 2004/11/05 22:28:26 The next stage of the i386-land invasion Affected files ... .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#1 add .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#1 add .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#1 add .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Nov 5 22:32:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EA4D16A4D0; Fri, 5 Nov 2004 22:32:16 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF69F16A4CE for ; Fri, 5 Nov 2004 22:32:15 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D29B543D41 for ; Fri, 5 Nov 2004 22:32:15 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5MWFgF038964 for ; Fri, 5 Nov 2004 22:32:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5MWFiR038961 for perforce@freebsd.org; Fri, 5 Nov 2004 22:32:15 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 22:32:15 GMT Message-Id: <200411052232.iA5MWFiR038961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 22:32:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=64379 Change 64379 by peter@peter_daintree on 2004/11/05 22:31:40 Continue the invasion Affected files ... .. //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,12 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp # $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.27 2003/09/04 00:20:40 peter Exp $ +.if !defined(COMPAT_32BIT) SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c +.else +SRCS+= _amd64_get_fsbase.c _amd64_get_gsbase.c _amd64_set_fsbase.c _amd64_set_gsbase.c +.endif MDASM= Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \ reboot.S sbrk.S setlogin.S sigreturn.S syscall.S From owner-p4-projects@FreeBSD.ORG Fri Nov 5 22:43:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7795816A4D0; Fri, 5 Nov 2004 22:43:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5523516A4CE for ; Fri, 5 Nov 2004 22:43:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3387D43D1F for ; Fri, 5 Nov 2004 22:43:30 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5MhUR3039436 for ; Fri, 5 Nov 2004 22:43:30 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5MhTs4039433 for perforce@freebsd.org; Fri, 5 Nov 2004 22:43:29 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 22:43:29 GMT Message-Id: <200411052243.iA5MhTs4039433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 22:43:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=64381 Change 64381 by peter@peter_daintree on 2004/11/05 22:43:09 converge towards layout of i386 counterpart Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/pthread_md.c#3 edit Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/pthread_md.c#3 (text+ko) ==== @@ -66,10 +66,11 @@ { struct kcb *kcb; - if ((kcb = malloc(sizeof(struct kcb))) != NULL) { + kcb = malloc(sizeof(struct kcb)); + if (kcb != NULL) { bzero(kcb, sizeof(struct kcb)); + kcb->kcb_self = kcb; kcb->kcb_kse = kse; - kcb->kcb_self = kcb; } return (kcb); } From owner-p4-projects@FreeBSD.ORG Fri Nov 5 22:44:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2552D16A4D0; Fri, 5 Nov 2004 22:44:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01D8316A4CE for ; Fri, 5 Nov 2004 22:44:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5DD643D31 for ; Fri, 5 Nov 2004 22:44:31 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5MiV1D039453 for ; Fri, 5 Nov 2004 22:44:31 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5MiVmA039450 for perforce@freebsd.org; Fri, 5 Nov 2004 22:44:31 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 22:44:31 GMT Message-Id: <200411052244.iA5MiVmA039450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 22:44:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64382 Change 64382 by peter@peter_daintree on 2004/11/05 22:44:20 attempt to use the amd64 sysarch syscalls that are visible to i386 binaries to implement the %fs/%gs stuff, rather than the ldt syscalls that do not exist. Affected files ... .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#3 edit .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#10 edit Differences ... ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#3 (text+ko) ==== @@ -76,7 +76,9 @@ struct kcb * _kcb_ctor(struct kse *kse) { +#ifndef COMPAT_32BIT union descriptor ldt; +#endif struct kcb *kcb; kcb = malloc(sizeof(struct kcb)); @@ -84,6 +86,7 @@ bzero(kcb, sizeof(struct kcb)); kcb->kcb_self = kcb; kcb->kcb_kse = kse; +#ifndef COMPAT_32BIT ldt.sd.sd_hibase = (unsigned int)kcb >> 24; ldt.sd.sd_lobase = (unsigned int)kcb & 0xFFFFFF; ldt.sd.sd_hilimit = (sizeof(struct kcb) >> 16) & 0xF; @@ -99,6 +102,7 @@ free(kcb); return (NULL); } +#endif } return (kcb); } @@ -106,9 +110,11 @@ void _kcb_dtor(struct kcb *kcb) { +#ifndef COMPAT_32BIT if (kcb->kcb_ldt >= 0) { i386_set_ldt(kcb->kcb_ldt, NULL, 1); kcb->kcb_ldt = -1; /* just in case */ } +#endif free(kcb); } ==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#10 (text+ko) ==== @@ -32,7 +32,9 @@ #define _PTHREAD_MD_H_ #include +#include #include +#include #include extern int _thr_setcontext(mcontext_t *, intptr_t, intptr_t *); @@ -150,10 +152,15 @@ static __inline void _kcb_set(struct kcb *kcb) { +#ifndef COMPAT_32BIT int val; val = (kcb->kcb_ldt << 3) | 7; __asm __volatile("movl %0, %%gs" : : "r" (val)); +#else + _amd64_set_gsbase(kcb); +#endif + } /* Get the current kcb. */ From owner-p4-projects@FreeBSD.ORG Fri Nov 5 22:52:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10E9E16A4D0; Fri, 5 Nov 2004 22:52:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E249816A4CE for ; Fri, 5 Nov 2004 22:52:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B767E43D54 for ; Fri, 5 Nov 2004 22:52:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5Mqghd039750 for ; Fri, 5 Nov 2004 22:52:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5MqgUS039747 for perforce@freebsd.org; Fri, 5 Nov 2004 22:52:42 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 22:52:42 GMT Message-Id: <200411052252.iA5MqgUS039747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 22:52:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=64384 Change 64384 by peter@peter_daintree on 2004/11/05 22:52:17 pass COMPAT_32BIT to make and compiler. Affected files ... .. //depot/projects/hammer/Makefile.inc1#69 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#69 (text+ko) ==== @@ -203,9 +203,10 @@ WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} # 32 bit world -CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 -CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 -OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 + LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ @@ -218,7 +219,7 @@ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ CC="cc ${CCARGS}" \ CXX="c++ ${CXXARGS}" \ OBJC="cc ${OBJCARGS}" \ @@ -388,7 +389,7 @@ .for _t in obj depend all cd ${.CURDIR}/libexec/rtld-elf; \ PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \ - ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS} -DCOMPAT_32BIT" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} + ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS}" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} .endfor _install32: From owner-p4-projects@FreeBSD.ORG Fri Nov 5 23:16:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50C5416A4D0; Fri, 5 Nov 2004 23:16:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2469C16A4CE for ; Fri, 5 Nov 2004 23:16:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 189C743D1D for ; Fri, 5 Nov 2004 23:16:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5NGBnv040483 for ; Fri, 5 Nov 2004 23:16:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5NGBZo040480 for perforce@freebsd.org; Fri, 5 Nov 2004 23:16:11 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 23:16:11 GMT Message-Id: <200411052316.iA5NGBZo040480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 23:16:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=64386 Change 64386 by peter@peter_daintree on 2004/11/05 23:15:13 use amd64-centric methods for the emulated environment Affected files ... .. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#2 edit Differences ... ==== //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#2 (text+ko) ==== @@ -34,9 +34,12 @@ void _set_tp(void *tp) { +#ifndef COMPAT_32BIT union descriptor ldt; +#endif int sel; +#ifndef COMPAT_32BIT memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ldt.sd.sd_lobase = ((uintptr_t)tp) & 0xffffff; @@ -49,4 +52,7 @@ ldt.sd.sd_hibase = (((uintptr_t)tp) >> 24) & 0xff; sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1); __asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7)); +#else + _amd64_set_gs(tp); +#endif } From owner-p4-projects@FreeBSD.ORG Fri Nov 5 23:16:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DDBD16A4DD; Fri, 5 Nov 2004 23:16:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7634316A4DF for ; Fri, 5 Nov 2004 23:16:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63E5C43D1D for ; Fri, 5 Nov 2004 23:16:12 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5NGCX8040490 for ; Fri, 5 Nov 2004 23:16:12 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5NGCox040486 for perforce@freebsd.org; Fri, 5 Nov 2004 23:16:12 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 23:16:12 GMT Message-Id: <200411052316.iA5NGCox040486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 23:16:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=64387 Change 64387 by peter@peter_daintree on 2004/11/05 23:15:36 make this stuff actually compile. Affected files ... .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#2 edit .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#2 edit .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#2 edit .. //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#2 edit Differences ... ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_fsbase.c#2 (text+ko) ==== @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_fsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $"); +#include #include int @@ -36,7 +37,7 @@ int ret; addr64 = 0; - ret = sysarch(AMD64_GET_FSBASE, (void **)(&addr64)); + ret = sysarch(_AMD64_GET_FSBASE, (void **)(&addr64)); if (ret != -1) *addr = (void *)(uintptr_t)addr64; return ret; ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_get_gsbase.c#2 (text+ko) ==== @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD: src/lib/libc/amd64/sys/amd64_get_gsbase.c,v 1.2 2004/01/09 16:52:09 nectar Exp $"); +#include #include int @@ -36,7 +37,7 @@ int ret; addr64 = 0; - ret = sysarch(AMD64_GET_GSBASE, (void **)(&addr64)); + ret = sysarch(_AMD64_GET_GSBASE, (void **)(&addr64)); if (ret != -1) *addr = (void *)(uintptr_t)addr64; return ret; ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_fsbase.c#2 (text+ko) ==== @@ -33,5 +33,5 @@ _amd64_set_fsbase(void *addr) { - return (sysarch(AMD64_SET_FSBASE, &addr)); + return (sysarch(_AMD64_SET_FSBASE, &addr)); } ==== //depot/projects/hammer/lib/libc/i386/sys/_amd64_set_gsbase.c#2 (text+ko) ==== @@ -33,5 +33,5 @@ _amd64_set_gsbase(void *addr) { - return (sysarch(AMD64_SET_GSBASE, &addr)); + return (sysarch(_AMD64_SET_GSBASE, &addr)); } From owner-p4-projects@FreeBSD.ORG Fri Nov 5 23:23:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B79AA16A4D0; Fri, 5 Nov 2004 23:23:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 89F8416A4CE for ; Fri, 5 Nov 2004 23:23:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EAFD43D1F for ; Fri, 5 Nov 2004 23:23:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5NNLAB040660 for ; Fri, 5 Nov 2004 23:23:21 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5NNLBt040657 for perforce@freebsd.org; Fri, 5 Nov 2004 23:23:21 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 23:23:21 GMT Message-Id: <200411052323.iA5NNLBt040657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 23:23:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=64388 Change 64388 by peter@peter_daintree on 2004/11/05 23:22:39 make this actually compile Affected files ... .. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#3 edit Differences ... ==== //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#3 (text+ko) ==== @@ -36,10 +36,8 @@ { #ifndef COMPAT_32BIT union descriptor ldt; -#endif int sel; -#ifndef COMPAT_32BIT memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ldt.sd.sd_lobase = ((uintptr_t)tp) & 0xffffff; @@ -53,6 +51,6 @@ sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1); __asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7)); #else - _amd64_set_gs(tp); + _amd64_set_gsbase(tp); #endif } From owner-p4-projects@FreeBSD.ORG Fri Nov 5 23:23:22 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8463516A4CF; Fri, 5 Nov 2004 23:23:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC7D116A4E1 for ; Fri, 5 Nov 2004 23:23:21 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDC9743D39 for ; Fri, 5 Nov 2004 23:23:21 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA5NNLov040667 for ; Fri, 5 Nov 2004 23:23:21 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5NNLIh040663 for perforce@freebsd.org; Fri, 5 Nov 2004 23:23:21 GMT (envelope-from peter@freebsd.org) Date: Fri, 5 Nov 2004 23:23:21 GMT Message-Id: <200411052323.iA5NNLIh040663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Nov 2004 23:23:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=64389 Change 64389 by peter@peter_daintree on 2004/11/05 23:23:09 Invade rtld-elf for i386 as well, so it can run on amd64 machines. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#5 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#5 (text+ko) ==== @@ -327,8 +327,10 @@ allocate_initial_tls(Obj_Entry *objs) { void* tls; +#ifndef COMPAT_32BIT union descriptor ldt; int sel; +#endif /* * Fix the size of the static TLS block by using the maximum @@ -338,6 +340,7 @@ tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA; tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr)); +#ifndef COMPAT_32BIT memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ldt.sd.sd_lobase = ((Elf_Addr)tls) & 0xffffff; @@ -350,6 +353,9 @@ ldt.sd.sd_hibase = (((Elf_Addr)tls) >> 24) & 0xff; sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1); __asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7)); +#else + _amd64_set_gsbase(tls); +#endif } /* GNU ABI */ From owner-p4-projects@FreeBSD.ORG Sat Nov 6 00:18:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0925C16A4D0; Sat, 6 Nov 2004 00:18:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDEBD16A4CE for ; Sat, 6 Nov 2004 00:18:29 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F78243D54 for ; Sat, 6 Nov 2004 00:18:29 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA60ITFm043076 for ; Sat, 6 Nov 2004 00:18:29 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA60ITIF043073 for perforce@freebsd.org; Sat, 6 Nov 2004 00:18:29 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 00:18:29 GMT Message-Id: <200411060018.iA60ITIF043073@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 00:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=64392 Change 64392 by peter@peter_daintree on 2004/11/06 00:17:47 Tidy up Affected files ... .. //depot/projects/hammer/Makefile#26 edit .. //depot/projects/hammer/Makefile.inc1#70 edit Differences ... ==== //depot/projects/hammer/Makefile#26 (text+ko) ==== @@ -70,7 +70,7 @@ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - _build32 _install32 + build32 install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/hammer/Makefile.inc1#70 (text+ko) ==== @@ -203,26 +203,34 @@ WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} # 32 bit world -CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 -CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 -OBJCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT -I${LIB32TMP}/usr/include/objc -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32 +LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ + -L${LIB32TMP}/usr/lib32 \ + -B${LIB32TMP}/usr/lib32 +LIB32CC= ${LIB32PREFLAGS} \ + ${LIB32POSTFLAGS} +LIB32CXX= ${LIB32CPUFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ + ${LIB32POSTFLAGS} +LIB32OBJC= ${LIB32CPUFLAGS} -I${LIB32TMP}/usr/include/objc \ + ${LIB32POSTFLAGS} LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ - CC="cc ${CCARGS}" \ - CXX="c++ ${CXXARGS}" \ - OBJC="cc ${OBJCARGS}" \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ - CC="cc ${CCARGS}" \ - CXX="c++ ${CXXARGS}" \ - OBJC="cc ${OBJCARGS}" \ +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ + -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ + CC="cc ${LIB32CC}" \ + CXX="c++ ${LIB32CXX}" \ + OBJC="cc ${LIB32OBJC}" \ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ AS="as --32" \ LIBDIR=/usr/lib32 \ @@ -365,8 +373,8 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all -.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) -_build32: +.if ${MACHINE_ARCH} == amd64 +build32: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit libraries" @@ -392,7 +400,7 @@ ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS}" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} .endfor -_install32: +install32: mkdir -p ${DESTDIR}/usr/lib32 cd ${.CURDIR}/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install cd ${.CURDIR}/gnu/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install @@ -411,7 +419,7 @@ .endif WMAKE_TGTS+= _includes _libraries _depend everything .if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) -WMAKE_TGTS+= _build32 +WMAKE_TGTS+= build32 .endif buildworld: ${WMAKE_TGTS} @@ -544,7 +552,7 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install .if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) - ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _install32 + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif redistribute: From owner-p4-projects@FreeBSD.ORG Sat Nov 6 00:37:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D28F16A4D1; Sat, 6 Nov 2004 00:37:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB4DA16A4CE for ; Sat, 6 Nov 2004 00:37:53 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD71A43D3F for ; Sat, 6 Nov 2004 00:37:53 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA60brtG043662 for ; Sat, 6 Nov 2004 00:37:53 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA60brbb043659 for perforce@freebsd.org; Sat, 6 Nov 2004 00:37:53 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 00:37:53 GMT Message-Id: <200411060037.iA60brbb043659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 00:37:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=64394 Change 64394 by peter@peter_daintree on 2004/11/06 00:37:41 invade libthr Affected files ... .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#14 edit Differences ... ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#14 (text+ko) ==== @@ -62,14 +62,21 @@ void * _set_curthread(ucontext_t *uc, struct pthread *thr, int *err) { +#ifndef COMPAT_32BIT union descriptor desc; +#endif struct tcb *tcb; void *oldtls; +#ifndef COMPAT_32BIT int ldt_index; +#endif *err = 0; if (uc == NULL && thr->arch_id != NULL) { +#ifndef COMPAT_32BIT + _amd64_set_gsbase(thr->arch_id); +#endif return (thr->arch_id); } @@ -91,6 +98,7 @@ */ tcb->tcb_thread = thr; +#ifndef COMPAT_32BIT bzero(&desc, sizeof(desc)); /* @@ -119,6 +127,10 @@ uc->uc_mcontext.mc_gs = LSEL(ldt_index, SEL_UPL); else _set_gs(LSEL(ldt_index, SEL_UPL)); +#else + if (uc == NULL) + _amd64_set_gsbase(tcb); +#endif return (tcb); } From owner-p4-projects@FreeBSD.ORG Sat Nov 6 00:38:55 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A317C16A4D0; Sat, 6 Nov 2004 00:38:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DDC016A4CE for ; Sat, 6 Nov 2004 00:38:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 737C843D2F for ; Sat, 6 Nov 2004 00:38:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA60ct3c043748 for ; Sat, 6 Nov 2004 00:38:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA60cthl043745 for perforce@freebsd.org; Sat, 6 Nov 2004 00:38:55 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 00:38:55 GMT Message-Id: <200411060038.iA60cthl043745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 00:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=64395 Change 64395 by peter@peter_daintree on 2004/11/06 00:37:55 fix some typos Affected files ... .. //depot/projects/hammer/Makefile.inc1#71 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#71 (text+ko) ==== @@ -209,9 +209,9 @@ -B${LIB32TMP}/usr/lib32 LIB32CC= ${LIB32PREFLAGS} \ ${LIB32POSTFLAGS} -LIB32CXX= ${LIB32CPUFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ +LIB32CXX= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/c++/3.4 \ ${LIB32POSTFLAGS} -LIB32OBJC= ${LIB32CPUFLAGS} -I${LIB32TMP}/usr/include/objc \ +LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ ${LIB32POSTFLAGS} LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ From owner-p4-projects@FreeBSD.ORG Sat Nov 6 01:50:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0A4816A4D0; Sat, 6 Nov 2004 01:50:22 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABEB916A4CE for ; Sat, 6 Nov 2004 01:50:22 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BCDC43D39 for ; Sat, 6 Nov 2004 01:50:22 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA61oM8a052200 for ; Sat, 6 Nov 2004 01:50:22 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA61oMwg052196 for perforce@freebsd.org; Sat, 6 Nov 2004 01:50:22 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 01:50:22 GMT Message-Id: <200411060150.iA61oMwg052196@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 01:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=64397 Change 64397 by peter@peter_daintree on 2004/11/06 01:49:28 put this back to sleep. warner's is/was going to have it moved to sys/dev/pbio Affected files ... .. //depot/projects/hammer/sys/amd64/isa/pbio.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Nov 6 01:56:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B75216A4D0; Sat, 6 Nov 2004 01:56:31 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C4E9016A4CE for ; Sat, 6 Nov 2004 01:56:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FDBC43D49 for ; Sat, 6 Nov 2004 01:56:30 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA61uUD5052406 for ; Sat, 6 Nov 2004 01:56:30 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA61uUCW052403 for perforce@freebsd.org; Sat, 6 Nov 2004 01:56:30 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 01:56:30 GMT Message-Id: <200411060156.iA61uUCW052403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 01:56:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=64398 Change 64398 by peter@peter_daintree on 2004/11/06 01:55:36 More tidying up Affected files ... .. //depot/projects/hammer/Makefile.inc1#72 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#72 (text+ko) ==== @@ -129,7 +129,6 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} -LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 # /usr/games added for fortune which depend on strfile BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games @@ -202,7 +201,10 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +.if ${MACHINE_ARCH} == amd64 # 32 bit world +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 + LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ -L${LIB32TMP}/usr/lib32 \ @@ -214,8 +216,10 @@ LIB32OBJC= ${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \ ${LIB32POSTFLAGS} +# Yes, the flags are redundant. LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ _SHLIBDIRPREFIX=${LIB32TMP} \ + MACHINE_ARCH=i386 \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ CC="cc ${LIB32CC}" \ @@ -227,7 +231,7 @@ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ + -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ CC="cc ${LIB32CC}" \ CXX="c++ ${LIB32CXX}" \ OBJC="cc ${LIB32OBJC}" \ @@ -235,6 +239,7 @@ AS="as --32" \ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 +.endif # install stage .if empty(.MAKEFLAGS:M-n) @@ -377,7 +382,7 @@ build32: @echo @echo "--------------------------------------------------------------" - @echo ">>> stage 5.1: building 32 bit libraries" + @echo ">>> stage 5.1: building 32 bit shim libraries" @echo "--------------------------------------------------------------" .for _dir in \ lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ @@ -388,24 +393,29 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} hierarchy - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} obj - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} includes - cd ${.CURDIR}/lib/libncurses; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools - cd ${.CURDIR}/lib/libmagic; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools - cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj includes + cd ${.CURDIR}; \ + ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} ${_t} +.endfor +.for _dir in lib/libncurses lib/libmagic + cd ${.CURDIR}/${_t}; \ + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools +.endfor + cd ${.CURDIR}; \ + ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries .for _t in obj depend all cd ${.CURDIR}/libexec/rtld-elf; \ - PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \ - ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS}" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t} + PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endfor install32: - mkdir -p ${DESTDIR}/usr/lib32 - cd ${.CURDIR}/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install - cd ${.CURDIR}/gnu/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install - cd ${.CURDIR}/secure/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install - cd ${.CURDIR}/libexec/rtld-elf; MACHINE_ARCH=i386 PROG=ld-elf32.so.1 ${LIB32MAKE} install + mkdir -p ${DESTDIR}/usr/lib32 # XXX add to mtree + cd ${.CURDIR}/lib; ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install +.endif + cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install .endif From owner-p4-projects@FreeBSD.ORG Sat Nov 6 02:18:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E2F116A4D0; Sat, 6 Nov 2004 02:18:58 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B26216A4CF for ; Sat, 6 Nov 2004 02:18:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D94543D39 for ; Sat, 6 Nov 2004 02:18:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA62Iwo5053058 for ; Sat, 6 Nov 2004 02:18:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA62IvbO053055 for perforce@freebsd.org; Sat, 6 Nov 2004 02:18:57 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 02:18:57 GMT Message-Id: <200411060218.iA62IvbO053055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 02:18:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=64399 Change 64399 by peter@peter_daintree on 2004/11/06 02:18:07 final tweaks. reduce the scope of the obj and includes stuff. Affected files ... .. //depot/projects/hammer/Makefile.inc1#73 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#73 (text+ko) ==== @@ -394,11 +394,19 @@ -p ${LIB32TMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} .for _t in obj includes - cd ${.CURDIR}; \ - ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/include; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} + cd ${.CURDIR}/gnu/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.if !defined(NOCRYPT) + cd ${.CURDIR}/secure/lib; \ + ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} +.endif .endfor .for _dir in lib/libncurses lib/libmagic - cd ${.CURDIR}/${_t}; \ + cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools .endfor cd ${.CURDIR}; \ From owner-p4-projects@FreeBSD.ORG Sat Nov 6 04:59:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD7716A4D0; Sat, 6 Nov 2004 04:59:12 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F19F716A4CE for ; Sat, 6 Nov 2004 04:59:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF32C43D46 for ; Sat, 6 Nov 2004 04:59:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA64xBvY065580 for ; Sat, 6 Nov 2004 04:59:11 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA64xBCC065577 for perforce@freebsd.org; Sat, 6 Nov 2004 04:59:11 GMT (envelope-from peter@freebsd.org) Date: Sat, 6 Nov 2004 04:59:11 GMT Message-Id: <200411060459.iA64xBCC065577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 04:59:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=64402 Change 64402 by peter@peter_daintree on 2004/11/06 04:59:09 IFC @64401 Affected files ... .. //depot/projects/hammer/Makefile#27 integrate .. //depot/projects/hammer/Makefile.inc1#74 integrate .. //depot/projects/hammer/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/arm/gen/_ctx_start.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/makecontext.c#2 integrate .. //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#3 integrate .. //depot/projects/hammer/lib/libc/arm/gen/signalcontext.c#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/arm/sys/getcontext.S#2 delete .. //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/pthread_md.c#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/arm/context.S#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/arm/pthread_md.c#3 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/include/atomic_ops.h#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#5 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#11 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#15 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#26 integrate .. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#12 integrate .. //depot/projects/hammer/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/smp.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#76 integrate .. //depot/projects/hammer/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/hammer/sys/arm/arm/critical.c#2 integrate .. //depot/projects/hammer/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/hammer/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/locore.S#5 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/hammer/sys/arm/arm/trap.c#3 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#3 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#8 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#14 integrate .. //depot/projects/hammer/sys/i386/include/sysarch.h#7 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#71 integrate .. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#17 integrate Differences ... ==== //depot/projects/hammer/Makefile#27 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.309 2004/10/18 17:47:31 ru Exp $ +# $FreeBSD: src/Makefile,v 1.310 2004/11/06 03:14:26 peter Exp $ # # The user-driven targets are: # ==== //depot/projects/hammer/Makefile.inc1#74 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.450 2004/10/24 15:32:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.451 2004/11/06 03:14:26 peter Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically ==== //depot/projects/hammer/lib/libc/arm/gen/_ctx_start.S#2 (text+ko) ==== @@ -1,8 +1,9 @@ #include -.ident "$FreeBSD: src/lib/libc/arm/gen/_ctx_start.S,v 1.1 2004/05/14 12:04:30 cognet Exp $" +.ident "$FreeBSD: src/lib/libc/arm/gen/_ctx_start.S,v 1.2 2004/11/05 23:53:02 cognet Exp $" ENTRY(_ctx_start) - mov pc, r0 - mov r0, r1 + mov lr, pc + mov pc, r4 + mov r0, r5 bl _C_LABEL(ctx_done) bl _C_LABEL(abort) ==== //depot/projects/hammer/lib/libc/arm/gen/_setjmp.S#2 (text+ko) ==== @@ -33,8 +33,8 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.1 2004/05/14 12:04:30 cognet Exp $"); -#define SOFTFLOAT /* XXX */ +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.2 2004/11/05 23:53:54 cognet Exp $"); + /* * C library -- _setjmp, _longjmp * ==== //depot/projects/hammer/lib/libc/arm/gen/makecontext.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/makecontext.c,v 1.1 2004/05/14 12:04:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/makecontext.c,v 1.2 2004/11/05 23:53:02 cognet Exp $"); #include #include @@ -46,7 +46,7 @@ #include -extern void _ctx_start(ucontext_t *, int argc, ...); +extern void _ctx_start(void); void ctx_done(ucontext_t *ucp) @@ -72,7 +72,8 @@ /* Compute and align stack pointer. */ sp = (unsigned int *) - (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & ~7); + (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size - + sizeof(double)) & ~7); /* Allocate necessary stack space for arguments exceeding r0-3. */ if (argc > 4) sp -= argc - 4; @@ -80,8 +81,9 @@ /* Wipe out frame pointer. */ gr[_REG_FP] = 0; /* Arrange for return via the trampoline code. */ - gr[_REG_LR] = (__greg_t)_ctx_start; - gr[_REG_PC] = (__greg_t)func; + gr[_REG_PC] = (__greg_t)_ctx_start; + gr[_REG_R4] = (__greg_t)func; + gr[_REG_R5] = (__greg_t)ucp; va_start(ap, argc); /* Pass up to four arguments in r0-3. */ ==== //depot/projects/hammer/lib/libc/arm/gen/setjmp.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.2 2004/09/23 23:13:46 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/setjmp.S,v 1.3 2004/11/05 23:53:54 cognet Exp $"); /* * C library -- setjmp, longjmp * @@ -44,7 +44,6 @@ * The previous signal state is restored. */ -#define SOFTFLOAT /* XXX */ ENTRY(setjmp) /* Block all signals and retrieve the old signal mask */ stmfd sp!, {r0, r14} ==== //depot/projects/hammer/lib/libc/arm/gen/signalcontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/signalcontext.c,v 1.1 2004/05/14 12:04:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/signalcontext.c,v 1.2 2004/11/05 23:53:02 cognet Exp $"); #include #include @@ -51,11 +51,8 @@ struct sigframe *sfp; __greg_t *gr = ucp->uc_mcontext.__gregs; unsigned int *sp; - mcontext_t *mc; - mc = &ucp->uc_mcontext; - sp = (unsigned int *) - (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & ~7); + sp = (unsigned int *)gr[_REG_SP]; sfp = (struct sigframe *)sp - 1; @@ -63,13 +60,16 @@ bcopy(ucp, &sfp->sf_uc, sizeof(*ucp)); sfp->sf_si.si_signo = sig; - gr[_REG_SP] = (__greg_t)sp; + gr[_REG_SP] = (__greg_t)sfp; /* Wipe out frame pointer. */ gr[_REG_FP] = 0; /* Arrange for return via the trampoline code. */ - gr[_REG_LR] = (__greg_t)_ctx_start; - gr[_REG_PC] = (__greg_t)func; - gr[_REG_R0] = (__greg_t)ucp; + gr[_REG_PC] = (__greg_t)_ctx_start; + gr[_REG_R4] = (__greg_t)func; + gr[_REG_R5] = (__greg_t)ucp; + gr[_REG_R0] = (__greg_t)sig; + gr[_REG_R1] = (__greg_t)&sfp->sf_si; + gr[_REG_R2] = (__greg_t)&sfp->sf_uc; ucp->uc_link = &sfp->sf_uc; sigdelset(&ucp->uc_sigmask, sig); ==== //depot/projects/hammer/lib/libc/arm/sys/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.1 2004/05/14 12:04:31 cognet Exp $ +# $FreeBSD: src/lib/libc/arm/sys/Makefile.inc,v 1.2 2004/11/05 23:52:05 cognet Exp $ -MDASM= Ovfork.S brk.S cerror.S getcontext.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S +MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/hammer/lib/libc/i386/gen/_set_tp.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.1 2004/08/15 16:18:03 dfr Exp $ + * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.2 2004/11/06 03:28:26 peter Exp $ */ #include ==== //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.27 2003/09/04 00:20:40 peter Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.28 2004/11/06 03:28:26 peter Exp $ .if !defined(COMPAT_32BIT) SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ ==== //depot/projects/hammer/lib/libpthread/arch/amd64/amd64/pthread_md.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.3 2004/08/15 16:28:04 dfr Exp $ + * $FreeBSD: src/lib/libpthread/arch/amd64/amd64/pthread_md.c,v 1.4 2004/11/06 03:33:19 peter Exp $ */ #include ==== //depot/projects/hammer/lib/libpthread/arch/arm/arm/context.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/arm/arm/context.S,v 1.1 2004/05/14 12:21:29 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/arm/arm/context.S,v 1.2 2004/11/05 23:49:21 cognet Exp $"); /* * int thr_setcontext(mcontext_t *mcp, intptr_t val, intptr_t *loc) @@ -43,18 +43,9 @@ cmp r0, #0 moveq r0, #-1 moveq pc, lr - add ip, r0, #8 - ldmia ip, {r2-r12} cmp r2, #0 - str r1, [r2] - add ip, r0, #4 - str ip, [r1] /* Restore r1. */ - add ip, r0, #64 - msr cpsr, ip - add ip, r0, #52 - mov r0, #0 /* Return 0. */ - ldr sp, [ip] /* Restore stack pointer. */ - mov pc, lr /* Return. */ + strne r1, [r2] + ldmia r0, {r0-r15} /* XXX: FP bits ? */ /* @@ -72,10 +63,14 @@ moveq r0, #-1 moveq pc, lr stmia r0, {r0-r13} + mov r1, #1 + str r1, [r0] /* Return 1 from setcontext */ + str lr, [r0, #(15 * 4)] /* PC */ + mrs r1, cpsr + str r1, [r0, #(16 * 4)] /* CPSR */ mov r0, #0 /* Return 0. */ mov pc, lr ENTRY(_arm_enter_uts) - add r4, r2, r3 /* Stack addr + size. */ - mov lr, pc + add sp, r2, r3 /* Stack addr + size. */ mov pc, r1 ==== //depot/projects/hammer/lib/libpthread/arch/arm/arm/pthread_md.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/arm/arm/pthread_md.c,v 1.2 2004/09/24 13:02:30 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/arm/arm/pthread_md.c,v 1.3 2004/11/05 23:49:21 cognet Exp $"); #include @@ -39,19 +39,15 @@ #include "pthread_md.h" +struct arm_tp *_tp = NULL; + struct tcb * _tcb_ctor(struct pthread *thread, int initial) { struct tcb *tcb; - void *addr; - addr = malloc(sizeof(struct tcb) + 63); - if (addr == NULL) - tcb = NULL; - else { - tcb = (struct tcb *)(((uintptr_t)(addr) + 63) & ~63); + if ((tcb = malloc(sizeof(struct tcb)))) { bzero(tcb, sizeof(struct tcb)); - tcb->tcb_addr = addr; tcb->tcb_thread = thread; /* XXX - Allocate tdv/tls */ } @@ -61,11 +57,8 @@ void _tcb_dtor(struct tcb *tcb) { - void *addr; - addr = tcb->tcb_addr; - tcb->tcb_addr = NULL; - free(addr); + free(tcb); } struct kcb * ==== //depot/projects/hammer/lib/libpthread/arch/arm/include/atomic_ops.h#2 (text+ko) ==== @@ -23,12 +23,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/arm/include/atomic_ops.h,v 1.1 2004/05/14 12:21:29 cognet Exp $ + * $FreeBSD: src/lib/libpthread/arch/arm/include/atomic_ops.h,v 1.2 2004/11/05 23:49:21 cognet Exp $ */ #ifndef _ATOMIC_OPS_H_ #define _ATOMIC_OPS_H_ +#include +#include "thr_private.h" + /* * Atomic swap: * Atomic (tmp = *dst, *dst = val), then *res = tmp @@ -38,9 +41,7 @@ static inline void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) { - __asm __volatile( - "swp %2, %2, [%1]; mov %2, %0" - : "=r" (*res) : "r" (dst), "r" (val) : "cc"); + *res = __swp(val, dst); } #define atomic_swap_ptr(d, v, r) \ @@ -49,3 +50,19 @@ #define atomic_swap_int(d, v, r) \ atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif + +static inline u_int32_t +atomic_cmpset_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval) +{ + kse_critical_t crit = _kse_critical_enter(); + int ret; + + if (*p == cmpval) { + *p = newval; + ret = 1; + } else + ret = 0; + _kse_critical_leave(crit); + return (ret); +} + ==== //depot/projects/hammer/lib/libpthread/arch/arm/include/pthread_md.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.6 2004/09/24 13:02:30 cognet Exp $ + * $FreeBSD: src/lib/libpthread/arch/arm/include/pthread_md.h,v 1.7 2004/11/05 23:49:21 cognet Exp $ */ /* @@ -64,19 +64,15 @@ */ struct arm_tp { struct tdv *tp_tdv; /* dynamic TLS */ - uint32_t _reserved_; - long double tp_tls[0]; /* static TLS */ }; struct tcb { struct pthread *tcb_thread; - void *tcb_addr; /* allocated tcb address */ struct kcb *tcb_curkcb; uint32_t tcb_isfake; - uint32_t tcb_spare[4]; struct kse_thr_mailbox tcb_tmbx; /* needs 32-byte alignment */ struct arm_tp tcb_tp; -} __aligned(32); +}; struct kcb { struct kse_mailbox kcb_kmbx; @@ -85,7 +81,7 @@ struct kse *kcb_kse; }; -register struct arm_tp *_tp __asm("%r6"); +extern struct arm_tp *_tp; #define _tcb ((struct tcb*)((char*)(_tp) - offsetof(struct tcb, tcb_tp))) @@ -97,12 +93,21 @@ struct kcb *_kcb_ctor(struct kse *kse); void _kcb_dtor(struct kcb *); +static __inline uint32_t +__kcb_swp(uint32_t val, void *ptr) +{ + + __asm __volatile("swp %0, %1, [%2]" + : "=r" (val) : "r" (val) , "r" (ptr) : "memory"); + return (val); +} + /* Called from the KSE to set its private data. */ static __inline void _kcb_set(struct kcb *kcb) { /* There is no thread yet; use the fake tcb. */ - _tp = &kcb->kcb_faketcb.tcb_tp; + __kcb_swp((uint32_t)&kcb->kcb_faketcb.tcb_tp, &_tp); } /* @@ -126,30 +131,21 @@ _kcb_critical_enter(void) { struct kse_thr_mailbox *crit; - uint32_t flags; - if (_tcb->tcb_isfake != 0) { - /* - * We already are in a critical region since - * there is no current thread. - */ - crit = NULL; - } else { - flags = _tcb->tcb_tmbx.tm_flags; - _tcb->tcb_tmbx.tm_flags |= TMF_NOUPCALL; - crit = _tcb->tcb_curkcb->kcb_kmbx.km_curthread; - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = NULL; - _tcb->tcb_tmbx.tm_flags = flags; - } + if (_tcb->tcb_isfake) + return (NULL); + crit = (struct kse_thr_mailbox *)__kcb_swp((uint32_t)NULL, + &_tcb->tcb_curkcb->kcb_kmbx.km_curthread); return (crit); } static __inline void _kcb_critical_leave(struct kse_thr_mailbox *crit) { - /* No need to do anything if this is a fake tcb. */ + if (_tcb->tcb_isfake == 0) - _tcb->tcb_curkcb->kcb_kmbx.km_curthread = crit; + __kcb_swp((uint32_t)crit, + &_tcb->tcb_curkcb->kcb_kmbx.km_curthread); } static __inline int @@ -158,6 +154,7 @@ uint32_t flags; int ret; + return (_tcb->tcb_curkcb->kcb_kmbx.km_curthread == NULL); if (_tcb->tcb_isfake != 0) { /* * We are in a critical region since there is no @@ -176,11 +173,11 @@ static __inline void _tcb_set(struct kcb *kcb, struct tcb *tcb) { - if (tcb == NULL) + if (tcb == NULL) tcb = &kcb->kcb_faketcb; + __kcb_swp((uint32_t)&tcb->tcb_tp, &_tp); kcb->kcb_curtcb = tcb; tcb->tcb_curkcb = kcb; - _tp = &tcb->tcb_tp; } static __inline struct tcb * @@ -206,22 +203,25 @@ return (_tcb->tcb_curkcb->kcb_kse); } -void _arm_enter_uts(kse_func_t uts, struct kse_mailbox *km, void *stack, +void _arm_enter_uts(struct kse_mailbox *km, kse_func_t uts, void *stack, size_t stacksz); static __inline int _thread_enter_uts(struct tcb *tcb, struct kcb *kcb) { - if (_thr_getcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext) == 0) { - /* Make the fake tcb the current thread. */ + int ret; + + if ((ret = _thr_getcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext)) + == 0) { kcb->kcb_curtcb = &kcb->kcb_faketcb; - _tp = &kcb->kcb_faketcb.tcb_tp; - _arm_enter_uts(kcb->kcb_kmbx.km_func, &kcb->kcb_kmbx, + __kcb_swp((int)&kcb->kcb_faketcb.tcb_tp, &_tp); + _arm_enter_uts(&kcb->kcb_kmbx, kcb->kcb_kmbx.km_func, kcb->kcb_kmbx.km_stack.ss_sp, kcb->kcb_kmbx.km_stack.ss_size); /* We should not reach here. */ return (-1); - } + } else if (ret < 0) + return (-1); return (0); } @@ -231,9 +231,11 @@ extern int _libkse_debug; mcontext_t *mc; + if (!tcb || !kcb) + return (-1); _tcb_set(kcb, tcb); mc = &tcb->tcb_tmbx.tm_context.uc_mcontext; - if (_libkse_debug == 0) { + if (0 && _libkse_debug == 0) { tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, ==== //depot/projects/hammer/lib/libpthread/arch/i386/i386/pthread_md.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.3 2004/08/15 16:28:05 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/pthread_md.c,v 1.4 2004/11/06 03:35:51 peter Exp $"); #include #include ==== //depot/projects/hammer/lib/libpthread/arch/i386/include/pthread_md.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.12 2004/08/26 02:41:01 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/arch/i386/include/pthread_md.h,v 1.13 2004/11/06 03:35:51 peter Exp $ */ /* * Machine-dependent thread prototypes/definitions for the thread kernel. ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.15 2004/08/19 23:49:04 davidxu Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.16 2004/11/06 03:30:53 peter Exp $ */ #include ==== //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#6 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.13 2004/08/03 08:50:59 dfr Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.14 2004/11/06 03:32:07 peter Exp $ */ /* ==== //depot/projects/hammer/sbin/geom/class/mirror/gmirror.8#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.6 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.7 2004/11/05 22:38:14 pjd Exp $ .\" .Dd Jul 9, 2004 .Dt GMIRROR 8 @@ -293,3 +293,5 @@ There should be a way to change a component's priority inside a running mirror. .Pp There should be a section with an implementation description. +.Pp +Documentation for sysctls kern.geom.mirror.* is missing. ==== //depot/projects/hammer/sbin/geom/class/raid3/graid3.8#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.9 2004/11/04 19:12:43 ceri Exp $ +.\" $FreeBSD: src/sbin/geom/class/raid3/graid3.8,v 1.10 2004/11/05 22:38:14 pjd Exp $ .\" .Dd Aug 22, 2004 .Dt GRAID3 8 @@ -240,3 +240,5 @@ .An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .Sh BUGS There should be a section with an implementation description. +.Pp +Documentation for sysctls kern.geom.raid3.* is missing. ==== //depot/projects/hammer/sys/alpha/alpha/machdep.c#26 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.223 2004/09/05 02:09:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.224 2004/11/05 19:16:43 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -864,7 +864,8 @@ /* This is not a 'struct user' */ size_t sz = round_page(KSTACK_PAGES * PAGE_SIZE); pcpup = (struct pcpu *) pmap_steal_memory(sz); - pcpu_init(pcpup, alpha_pal_whami(), sz); + pcpu_init(pcpup, 0, sz); + pcpup->pc_pal_id = alpha_pal_whami(); alpha_pal_wrval((u_int64_t) pcpup); PCPU_GET(next_asn) = 1; /* 0 used for proc0 pmap */ PCPU_SET(curthread, &thread0); ==== //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.53 2004/11/05 19:16:43 jhb Exp $"); #include "opt_kstack_pages.h" @@ -61,23 +61,23 @@ static struct mtx ap_boot_mtx; -u_int boot_cpu_id; +u_int64_t boot_cpu_id; static void release_aps(void *dummy); static int smp_cpu_enabled(struct pcs *pcsp); extern void smp_init_secondary_glue(void); -static int smp_send_secondary_command(const char *command, int cpuid); -static int smp_start_secondary(int cpuid); +static int smp_send_secondary_command(const char *command, int pal_id); +static int smp_start_secondary(int pal_id, int cpuid); /* * Communicate with a console running on a secondary processor. * Return 1 on failure. */ static int -smp_send_secondary_command(const char *command, int cpuid) +smp_send_secondary_command(const char *command, int pal_id) { - u_int64_t mask = 1L << cpuid; - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + u_int64_t mask = 1L << pal_id; + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); int i, len; /* @@ -165,7 +165,7 @@ /* * Set flags in our per-CPU slot in the HWRPB. */ - cpu = LOCATE_PCS(hwrpb, PCPU_GET(cpuid)); + cpu = LOCATE_PCS(hwrpb, PCPU_GET(pal_id)); cpu->pcs_flags &= ~PCS_BIP; cpu->pcs_flags |= PCS_RC; alpha_mb(); @@ -216,9 +216,9 @@ } static int -smp_start_secondary(int cpuid) +smp_start_secondary(int pal_id, int cpuid) { - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); struct pcs *bootcpu = LOCATE_PCS(hwrpb, boot_cpu_id); struct alpha_pcb *pcb = (struct alpha_pcb *) cpu->pcs_hwpcb; struct pcpu *pcpu; @@ -226,12 +226,12 @@ size_t sz; if ((cpu->pcs_flags & PCS_PV) == 0) { - printf("smp_start_secondary: cpu %d PALcode invalid\n", cpuid); + printf("smp_start_secondary: cpu %d PALcode invalid\n", pal_id); return 0; } if (bootverbose) - printf("smp_start_secondary: starting cpu %d\n", cpuid); + printf("smp_start_secondary: starting cpu %d\n", pal_id); sz = round_page((UAREA_PAGES + KSTACK_PAGES) * PAGE_SIZE); pcpu = malloc(sz, M_TEMP, M_NOWAIT); @@ -241,6 +241,7 @@ } pcpu_init(pcpu, cpuid, sz); + pcpu->pc_pal_id = pal_id; /* * Copy the idle pcb and setup the address to start executing. @@ -270,7 +271,7 @@ /* * Fire it up and hope for the best. */ - if (!smp_send_secondary_command("START\r\n", cpuid)) { + if (!smp_send_secondary_command("START\r\n", pal_id)) { printf("smp_start_secondary: can't send START command\n"); pcpu_destroy(pcpu); free(pcpu, M_TEMP); @@ -296,7 +297,7 @@ * It worked (I think). */ if (bootverbose) - printf("smp_start_secondary: cpu %d started\n", cpuid); + printf("smp_start_secondary: cpu %d started\n", pal_id); return 1; } @@ -329,16 +330,18 @@ void cpu_mp_setmaxid(void) { - int i; + u_int64_t i; mp_maxid = 0; - for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { - if (i == PCPU_GET(cpuid)) + for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - mp_maxid = i; + mp_maxid++; } + if (mp_maxid > MAXCPU) + mp_maxid = MAXCPU; } int @@ -348,7 +351,7 @@ /* XXX: Need to check for valid platforms here. */ - boot_cpu_id = PCPU_GET(cpuid); + boot_cpu_id = PCPU_GET(pal_id); KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id, ("cpu_mp_probe() called on non-primary CPU")); all_cpus = PCPU_GET(cpumask); @@ -358,12 +361,10 @@ /* Make sure we have at least one secondary CPU. */ cpus = 0; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == PCPU_GET(cpuid)) + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - if (i > MAXCPU) - continue; cpus++; } return (cpus); @@ -372,10 +373,11 @@ void cpu_mp_start(void) { - int i; + int i, cpuid; mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); + cpuid = 1; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { struct pcs *pcsp; @@ -410,22 +412,30 @@ printf("CPU %d disabled by loader.\n", i); continue; } - all_cpus |= (1 << i); - mp_ncpus++; + if (smp_start_secondary(i, cpuid)) { + all_cpus |= (1 << cpuid); + mp_ncpus++; + cpuid++; + } } PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); - - for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == boot_cpu_id) - continue; - if (!CPU_ABSENT(i)) - smp_start_secondary(i); - } } void cpu_mp_announce(void) { + struct pcpu *pc; + int i; + + /* List CPUs */ + printf(" cpu0 (BSP): PAL ID: %2lu\n", boot_cpu_id); + for (i = 1; i < MAXCPU; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + MPASS(pc != NULL); + printf(" cpu%d (AP): PAL ID: %2lu\n", i, pc->pc_pal_id); + } } /* @@ -446,8 +456,9 @@ if (pcpu) { atomic_set_64(&pcpu->pc_pending_ipis, ipi); alpha_mb(); - CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", cpuid); - alpha_pal_wripir(cpuid); + CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", + pcpu->pc_pal_id); + alpha_pal_wripir(pcpu->pc_pal_id); } } } @@ -529,8 +540,8 @@ * requests to provide PALcode to secondaries and to start up new * secondaries that are added to the system on the fly. */ - if (PCPU_GET(cpuid) == boot_cpu_id) { - u_int cpuid; + if (PCPU_GET(pal_id) == boot_cpu_id) { + u_int pal_id; u_int64_t txrdy; #ifdef DIAGNOSTIC struct pcs *cpu; @@ -539,18 +550,18 @@ alpha_mb(); while (hwrpb->rpb_txrdy != 0) { - cpuid = ffs(hwrpb->rpb_txrdy) - 1; + pal_id = ffs(hwrpb->rpb_txrdy) - 1; #ifdef DIAGNOSTIC - cpu = LOCATE_PCS(hwrpb, cpuid); + cpu = LOCATE_PCS(hwrpb, pal_id); bcopy(&cpu->pcs_buffer.txbuf, buf, cpu->pcs_buffer.txlen); buf[cpu->pcs_buffer.txlen] = '\0'; - printf("SMP From CPU%d: %s\n", cpuid, buf); + printf("SMP From CPU%d: %s\n", pal_id, buf); #endif do { txrdy = hwrpb->rpb_txrdy; } while (atomic_cmpset_64(&hwrpb->rpb_txrdy, txrdy, - txrdy & ~(1 << cpuid)) == 0); + txrdy & ~(1 << pal_id)) == 0); } } } ==== //depot/projects/hammer/sys/alpha/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.14 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -34,6 +34,7 @@ #define PCPU_MD_FIELDS \ struct alpha_pcb pc_idlepcb; /* pcb for idling */ \ + u_int64_t pc_pal_id; /* physical CPU ID */ \ u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ ==== //depot/projects/hammer/sys/alpha/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/alpha/include/smp.h,v 1.6 2001/08/13 22:41:15 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/smp.h,v 1.7 2004/11/05 19:16:44 jhb Exp $ * */ @@ -26,7 +26,7 @@ #ifndef LOCORE -extern u_int boot_cpu_id; +extern u_int64_t boot_cpu_id; void ipi_selected(u_int cpus, u_int64_t ipi); void ipi_all(u_int64_t ipi); ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.58 2004/09/08 04:54:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.59 2004/11/05 18:24:01 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#76 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.247 2004/09/29 01:59:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.248 2004/11/05 18:25:22 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 6 12:39:33 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1978516A4D0; Sat, 6 Nov 2004 12:39:33 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E158E16A4CE for ; Sat, 6 Nov 2004 12:39:32 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98F5543D41 for ; Sat, 6 Nov 2004 12:39:32 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA6CdWvh089465 for ; Sat, 6 Nov 2004 12:39:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA6CdWbI089462 for perforce@freebsd.org; Sat, 6 Nov 2004 12:39:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Nov 2004 12:39:32 GMT Message-Id: <200411061239.iA6CdWbI089462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 12:39:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=64416 Change 64416 by rwatson@rwatson_zoo on 2004/11/06 12:39:14 Integ netperf_socket: - Alpha uses cpu id model consistent with other platforms, mapping from pal id to a logical id. - busdma KTR tracing merged to amd64. - non-atomic interrupt counters on amd64, i386. - amd64 invades i386. - Per-CPU disable capability for amd64 using hints. - Various armisms. - Securelevel back in specfs. - NTFS, UFS fixed up for geom and bufobj world order. - GEOM mirror shutdown much cleaned up. - Entropy registration cleanup for interrupt handlers. Storm detection cleanup. - When shutting down on amd64 and i386, pin to CPU 0 to satisfy ACPI. - Various VMisms. - i386 HZ is now 1000. - ng_timeout facility. - swapoff() fixes. - Start of UMA cleanup for per-cpu caches using critical sections. - Misc changes, fixes, etc. Netperf: - UDP use of global variables to hold temporary socket addresses eliminated, fixing a race when udp_input() is run in parallel. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/mp_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/smp.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#14 integrate .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/critical.c#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/fusu.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/locore.S#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/support.S#4 integrate .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpu.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/endian.h#5 integrate .. //depot/projects/netperf_socket/sys/arm/include/param.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/reg.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/snp/snp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/COPYRIGHT#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/makestatetext#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/request.h#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/statetexts.h#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinum.c#5 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumconfig.c#5 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumdaemon.c#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumext.h#5 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumhdr.h#3 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinuminterrupt.c#3 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#7 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.h#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumioctl.c#4 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumkw.h#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumlock.c#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinummemory.c#4 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumobj.h#4 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumparser.c#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumraid5.c#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumrequest.c#4 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumrevive.c#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumstate.c#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumstate.h#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumutil.c#3 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumutil.h#2 delete .. //depot/projects/netperf_socket/sys/dev/vinum/vinumvar.h#4 delete .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#14 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#8 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/include/sysarch.h#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_intr.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_physio.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_shutdown.c#18 integrate .. //depot/projects/netperf_socket/sys/kern/kern_subr.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#29 integrate .. //depot/projects/netperf_socket/sys/kern/subr_param.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#28 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_default.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/netperf_socket/sys/modules/vinum/Makefile#2 delete .. //depot/projects/netperf_socket/sys/netgraph/atm/sscop/ng_sscop_cust.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_main.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#13 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#12 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/netperf_socket/sys/sys/buf.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#31 integrate .. //depot/projects/netperf_socket/sys/sys/syslog.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ttydefaults.h#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#11 integrate .. //depot/projects/netperf_socket/sys/vm/uma_core.c#16 integrate .. //depot/projects/netperf_socket/sys/vm/vm_contig.c#12 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#15 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.c#12 integrate .. //depot/projects/netperf_socket/sys/vm/vm_object.h#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#17 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#12 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pager.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#8 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#9 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.223 2004/09/05 02:09:51 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.224 2004/11/05 19:16:43 jhb Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -864,7 +864,8 @@ /* This is not a 'struct user' */ size_t sz = round_page(KSTACK_PAGES * PAGE_SIZE); pcpup = (struct pcpu *) pmap_steal_memory(sz); - pcpu_init(pcpup, alpha_pal_whami(), sz); + pcpu_init(pcpup, 0, sz); + pcpup->pc_pal_id = alpha_pal_whami(); alpha_pal_wrval((u_int64_t) pcpup); PCPU_GET(next_asn) = 1; /* 0 used for proc0 pmap */ PCPU_SET(curthread, &thread0); ==== //depot/projects/netperf_socket/sys/alpha/alpha/mp_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.52 2004/01/07 23:00:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.53 2004/11/05 19:16:43 jhb Exp $"); #include "opt_kstack_pages.h" @@ -61,23 +61,23 @@ static struct mtx ap_boot_mtx; -u_int boot_cpu_id; +u_int64_t boot_cpu_id; static void release_aps(void *dummy); static int smp_cpu_enabled(struct pcs *pcsp); extern void smp_init_secondary_glue(void); -static int smp_send_secondary_command(const char *command, int cpuid); -static int smp_start_secondary(int cpuid); +static int smp_send_secondary_command(const char *command, int pal_id); +static int smp_start_secondary(int pal_id, int cpuid); /* * Communicate with a console running on a secondary processor. * Return 1 on failure. */ static int -smp_send_secondary_command(const char *command, int cpuid) +smp_send_secondary_command(const char *command, int pal_id) { - u_int64_t mask = 1L << cpuid; - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + u_int64_t mask = 1L << pal_id; + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); int i, len; /* @@ -165,7 +165,7 @@ /* * Set flags in our per-CPU slot in the HWRPB. */ - cpu = LOCATE_PCS(hwrpb, PCPU_GET(cpuid)); + cpu = LOCATE_PCS(hwrpb, PCPU_GET(pal_id)); cpu->pcs_flags &= ~PCS_BIP; cpu->pcs_flags |= PCS_RC; alpha_mb(); @@ -216,9 +216,9 @@ } static int -smp_start_secondary(int cpuid) +smp_start_secondary(int pal_id, int cpuid) { - struct pcs *cpu = LOCATE_PCS(hwrpb, cpuid); + struct pcs *cpu = LOCATE_PCS(hwrpb, pal_id); struct pcs *bootcpu = LOCATE_PCS(hwrpb, boot_cpu_id); struct alpha_pcb *pcb = (struct alpha_pcb *) cpu->pcs_hwpcb; struct pcpu *pcpu; @@ -226,12 +226,12 @@ size_t sz; if ((cpu->pcs_flags & PCS_PV) == 0) { - printf("smp_start_secondary: cpu %d PALcode invalid\n", cpuid); + printf("smp_start_secondary: cpu %d PALcode invalid\n", pal_id); return 0; } if (bootverbose) - printf("smp_start_secondary: starting cpu %d\n", cpuid); + printf("smp_start_secondary: starting cpu %d\n", pal_id); sz = round_page((UAREA_PAGES + KSTACK_PAGES) * PAGE_SIZE); pcpu = malloc(sz, M_TEMP, M_NOWAIT); @@ -241,6 +241,7 @@ } pcpu_init(pcpu, cpuid, sz); + pcpu->pc_pal_id = pal_id; /* * Copy the idle pcb and setup the address to start executing. @@ -270,7 +271,7 @@ /* * Fire it up and hope for the best. */ - if (!smp_send_secondary_command("START\r\n", cpuid)) { + if (!smp_send_secondary_command("START\r\n", pal_id)) { printf("smp_start_secondary: can't send START command\n"); pcpu_destroy(pcpu); free(pcpu, M_TEMP); @@ -296,7 +297,7 @@ * It worked (I think). */ if (bootverbose) - printf("smp_start_secondary: cpu %d started\n", cpuid); + printf("smp_start_secondary: cpu %d started\n", pal_id); return 1; } @@ -329,16 +330,18 @@ void cpu_mp_setmaxid(void) { - int i; + u_int64_t i; mp_maxid = 0; - for (i = 0; i < hwrpb->rpb_pcs_cnt && i < MAXCPU; i++) { - if (i == PCPU_GET(cpuid)) + for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - mp_maxid = i; + mp_maxid++; } + if (mp_maxid > MAXCPU) + mp_maxid = MAXCPU; } int @@ -348,7 +351,7 @@ /* XXX: Need to check for valid platforms here. */ - boot_cpu_id = PCPU_GET(cpuid); + boot_cpu_id = PCPU_GET(pal_id); KASSERT(boot_cpu_id == hwrpb->rpb_primary_cpu_id, ("cpu_mp_probe() called on non-primary CPU")); all_cpus = PCPU_GET(cpumask); @@ -358,12 +361,10 @@ /* Make sure we have at least one secondary CPU. */ cpus = 0; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == PCPU_GET(cpuid)) + if (i == PCPU_GET(pal_id)) continue; if (!smp_cpu_enabled(LOCATE_PCS(hwrpb, i))) continue; - if (i > MAXCPU) - continue; cpus++; } return (cpus); @@ -372,10 +373,11 @@ void cpu_mp_start(void) { - int i; + int i, cpuid; mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); + cpuid = 1; for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { struct pcs *pcsp; @@ -410,22 +412,30 @@ printf("CPU %d disabled by loader.\n", i); continue; } - all_cpus |= (1 << i); - mp_ncpus++; + if (smp_start_secondary(i, cpuid)) { + all_cpus |= (1 << cpuid); + mp_ncpus++; + cpuid++; + } } PCPU_SET(other_cpus, all_cpus & ~PCPU_GET(cpumask)); - - for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { - if (i == boot_cpu_id) - continue; - if (!CPU_ABSENT(i)) - smp_start_secondary(i); - } } void cpu_mp_announce(void) { + struct pcpu *pc; + int i; + + /* List CPUs */ + printf(" cpu0 (BSP): PAL ID: %2lu\n", boot_cpu_id); + for (i = 1; i < MAXCPU; i++) { + if (CPU_ABSENT(i)) + continue; + pc = pcpu_find(i); + MPASS(pc != NULL); + printf(" cpu%d (AP): PAL ID: %2lu\n", i, pc->pc_pal_id); + } } /* @@ -446,8 +456,9 @@ if (pcpu) { atomic_set_64(&pcpu->pc_pending_ipis, ipi); alpha_mb(); - CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", cpuid); - alpha_pal_wripir(cpuid); + CTR1(KTR_SMP, "calling alpha_pal_wripir(%d)", + pcpu->pc_pal_id); + alpha_pal_wripir(pcpu->pc_pal_id); } } } @@ -529,8 +540,8 @@ * requests to provide PALcode to secondaries and to start up new * secondaries that are added to the system on the fly. */ - if (PCPU_GET(cpuid) == boot_cpu_id) { - u_int cpuid; + if (PCPU_GET(pal_id) == boot_cpu_id) { + u_int pal_id; u_int64_t txrdy; #ifdef DIAGNOSTIC struct pcs *cpu; @@ -539,18 +550,18 @@ alpha_mb(); while (hwrpb->rpb_txrdy != 0) { - cpuid = ffs(hwrpb->rpb_txrdy) - 1; + pal_id = ffs(hwrpb->rpb_txrdy) - 1; #ifdef DIAGNOSTIC - cpu = LOCATE_PCS(hwrpb, cpuid); + cpu = LOCATE_PCS(hwrpb, pal_id); bcopy(&cpu->pcs_buffer.txbuf, buf, cpu->pcs_buffer.txlen); buf[cpu->pcs_buffer.txlen] = '\0'; - printf("SMP From CPU%d: %s\n", cpuid, buf); + printf("SMP From CPU%d: %s\n", pal_id, buf); #endif do { txrdy = hwrpb->rpb_txrdy; } while (atomic_cmpset_64(&hwrpb->rpb_txrdy, txrdy, - txrdy & ~(1 << cpuid)) == 0); + txrdy & ~(1 << pal_id)) == 0); } } } ==== //depot/projects/netperf_socket/sys/alpha/include/pcpu.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.14 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pcpu.h,v 1.15 2004/11/05 19:16:44 jhb Exp $ */ #ifndef _MACHINE_PCPU_H_ @@ -34,6 +34,7 @@ #define PCPU_MD_FIELDS \ struct alpha_pcb pc_idlepcb; /* pcb for idling */ \ + u_int64_t pc_pal_id; /* physical CPU ID */ \ u_int64_t pc_idlepcbphys; /* pa of pc_idlepcb */ \ u_int64_t pc_pending_ipis; /* pending IPI's */ \ u_int32_t pc_next_asn; /* next ASN to alloc */ \ ==== //depot/projects/netperf_socket/sys/alpha/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/alpha/include/smp.h,v 1.6 2001/08/13 22:41:15 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/smp.h,v 1.7 2004/11/05 19:16:44 jhb Exp $ * */ @@ -26,7 +26,7 @@ #ifndef LOCORE -extern u_int boot_cpu_id; +extern u_int64_t boot_cpu_id; void ipi_selected(u_int cpus, u_int64_t ipi); void ipi_all(u_int64_t ipi); ==== //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.58 2004/09/08 04:54:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.59 2004/11/05 18:24:01 peter Exp $"); #include #include @@ -33,12 +33,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include @@ -218,8 +220,11 @@ *dmat = NULL; newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT); - if (newtag == NULL) + if (newtag == NULL) { + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag " + "flags 0x%x error %d", newtag, 0, error); return (ENOMEM); + } newtag->parent = parent; newtag->alignment = alignment; @@ -296,16 +301,26 @@ } else { *dmat = newtag; } + CTR3(KTR_BUSDMA, "bus_dma_tag_create returned tag %p tag flags 0x%x " + "error %d", newtag, (newtag != NULL ? newtag->flags : 0), error); return (error); } int bus_dma_tag_destroy(bus_dma_tag_t dmat) { + bus_dma_tag_t dmat_copy; + int error; + + error = 0; + dmat_copy = dmat; + if (dmat != NULL) { - if (dmat->map_count != 0) - return (EBUSY); + if (dmat->map_count != 0) { + error = EBUSY; + goto out; + } while (dmat != NULL) { bus_dma_tag_t parent; @@ -326,7 +341,10 @@ dmat = NULL; } } - return (0); +out: + CTR2(KTR_BUSDMA, "bus_dma_tag_destroy tag %p error %d", dmat_copy, + error); + return (error); } /* @@ -344,8 +362,11 @@ dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); - if (dmat->segments == NULL) + if (dmat->segments == NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", + dmat, ENOMEM); return (ENOMEM); + } } /* @@ -360,8 +381,11 @@ *mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF, M_NOWAIT | M_ZERO); - if (*mapp == NULL) + if (*mapp == NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_create: tag %p error %d", + dmat, ENOMEM); return (ENOMEM); + } /* Initialize the new map */ STAILQ_INIT(&((*mapp)->bpages)); @@ -400,6 +424,8 @@ } if (error == 0) dmat->map_count++; + CTR3(KTR_BUSDMA, "bus_dmamap_create: tag %p tag flags 0x%x error %d", + dmat, dmat->flags, error); return (error); } @@ -411,11 +437,15 @@ bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) { if (map != NULL && map != &nobounce_dmamap) { - if (STAILQ_FIRST(&map->bpages) != NULL) + if (STAILQ_FIRST(&map->bpages) != NULL) { + CTR2(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error %d", + dmat, EBUSY); return (EBUSY); + } free(map, M_DEVBUF); } dmat->map_count--; + CTR1(KTR_BUSDMA, "bus_dmamap_destroy: tag %p error 0", dmat); return (0); } @@ -445,8 +475,11 @@ dmat->segments = (bus_dma_segment_t *)malloc( sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF, M_NOWAIT); - if (dmat->segments == NULL) + if (dmat->segments == NULL) { + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag " + "flags 0x%x error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); + } } if ((dmat->maxsize <= PAGE_SIZE) && @@ -463,8 +496,13 @@ 0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul, dmat->boundary); } - if (*vaddr == NULL) + if (*vaddr == NULL) { + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); + } + CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag flags 0x%x error %d", + dmat, dmat->flags, ENOMEM); return (0); } @@ -487,6 +525,8 @@ else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); } + CTR2(KTR_BUSDMA, "bus_dmamem_free: tag %p flags 0x%x", dmat, + dmat->flags); } /* @@ -495,11 +535,11 @@ * the starting segment on entrace, and the ending segment on exit. * first indicates if this is the first invocation of this function. */ -static int +static __inline int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, bus_size_t buflen, - struct thread *td, + pmap_t pmap, int flags, bus_addr_t *lastaddrp, int *segp, @@ -512,23 +552,22 @@ bus_addr_t paddr; int needbounce = 0; int seg; - pmap_t pmap; segs = dmat->segments; if (map == NULL) map = &nobounce_dmamap; - if (td != NULL) - pmap = vmspace_pmap(td->td_proc->p_vmspace); - else - pmap = NULL; - - if ((dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) - || dmat->boundary > 0 || dmat->alignment > 1) - && map != &nobounce_dmamap && map->pagesneeded == 0) { + if ((map != &nobounce_dmamap && map->pagesneeded == 0) + && (dmat->lowaddr < ptoa((vm_paddr_t)Maxmem) + || dmat->boundary > 0 || dmat->alignment > 1)) { vm_offset_t vendaddr; + CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " + "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), + dmat->boundary, dmat->alignment); + CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", + map, &nobounce_dmamap, map->pagesneeded); /* * Count the number of bounce pages * needed in order to complete this transfer @@ -544,10 +583,9 @@ } vaddr += PAGE_SIZE; } + CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); } - vaddr = (vm_offset_t)buf; - /* Reserve Necessary Bounce Pages */ if (map->pagesneeded != 0) { mtx_lock(&bounce_lock); @@ -571,6 +609,7 @@ mtx_unlock(&bounce_lock); } + vaddr = (vm_offset_t)buf; lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); @@ -658,14 +697,19 @@ error = _bus_dmamap_load_buffer(dmat, map, buf, buflen, NULL, flags, &lastaddr, &nsegs, 1); - if (error == EINPROGRESS) + if (error == EINPROGRESS) { + CTR3(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); + } if (error) (*callback)(callback_arg, dmat->segments, 0, error); else (*callback)(callback_arg, dmat->segments, nsegs + 1, 0); + CTR2(KTR_BUSDMA, "bus_dmamap_load: tag %p tag flags 0x%x error 0", + dmat, dmat->flags); return (0); } @@ -711,6 +755,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, m0->m_pkthdr.len, error); } + CTR3(KTR_BUSDMA, "bus_dmamap_load_mbuf: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); } @@ -727,17 +773,18 @@ int nsegs, error, first, i; bus_size_t resid; struct iovec *iov; - struct thread *td = NULL; + pmap_t pmap; flags |= BUS_DMA_NOWAIT; resid = uio->uio_resid; iov = uio->uio_iov; if (uio->uio_segflg == UIO_USERSPACE) { - td = uio->uio_td; - KASSERT(td != NULL, + KASSERT(uio->uio_td != NULL, ("bus_dmamap_load_uio: USERSPACE but no proc")); - } + pmap = vmspace_pmap(uio->uio_td->td_proc->p_vmspace); + } else + pmap = NULL; nsegs = 0; error = 0; @@ -754,7 +801,7 @@ if (minlen > 0) { error = _bus_dmamap_load_buffer(dmat, map, addr, minlen, - td, flags, &lastaddr, &nsegs, first); + pmap, flags, &lastaddr, &nsegs, first); first = 0; resid -= minlen; @@ -768,6 +815,8 @@ (*callback)(callback_arg, dmat->segments, nsegs+1, uio->uio_resid, error); } + CTR3(KTR_BUSDMA, "bus_dmamap_load_uio: tag %p tag flags 0x%x " + "error %d", dmat, dmat->flags, error); return (error); } @@ -797,6 +846,8 @@ * the caches on broken hardware */ total_bounced++; + CTR3(KTR_BUSDMA, "_bus_dmamap_sync: tag %p tag flags 0x%x " + "op 0x%x performing bounce", op, dmat, dmat->flags); if (op & BUS_DMASYNC_PREWRITE) { while (bpage != NULL) { ==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.10 2004/11/01 22:15:13 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.11 2004/11/03 18:03:06 scottl Exp $ */ /* @@ -166,8 +166,8 @@ * argument for counting hardware interrupts when they're * processed too. */ - atomic_add_long(isrc->is_count, 1); - atomic_add_int(&cnt.v_intr, 1); + (*isrc->is_count)++; + cnt.v_intr++; it = isrc->is_ithread; if (it == NULL) @@ -219,7 +219,7 @@ error = ithread_schedule(it); } if (error == EINVAL) { - atomic_add_long(isrc->is_straycount, 1); + (*isrc->is_straycount)++; if (*isrc->is_straycount < MAX_STRAY_LOG) log(LOG_ERR, "stray irq%d\n", vector); else if (*isrc->is_straycount == MAX_STRAY_LOG) ==== //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.247 2004/09/29 01:59:10 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.248 2004/11/05 18:25:22 peter Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -127,6 +127,7 @@ struct cpu_info { int cpu_present:1; int cpu_bsp:1; + int cpu_disabled:1; } static cpu_info[MAXCPU]; static int cpu_apic_ids[MAXCPU]; @@ -350,7 +351,11 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x < MAXCPU; x++) { - if (cpu_info[x].cpu_present && !cpu_info[x].cpu_bsp) { + if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) + continue; + if (cpu_info[x].cpu_disabled) + printf(" cpu (AP): APIC ID: %2d (disabled)\n", x); + else { KASSERT(i < mp_ncpus, ("mp_ncpus and actual cpus are out of whack")); printf(" cpu%d (AP): APIC ID: %2d\n", i++, x); @@ -582,9 +587,19 @@ /* start each AP */ cpu = 0; for (apic_id = 0; apic_id < MAXCPU; apic_id++) { + + /* Ignore non-existent CPUs and the BSP. */ if (!cpu_info[apic_id].cpu_present || cpu_info[apic_id].cpu_bsp) continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", apic_id)) { + cpu_info[apic_id].cpu_disabled = 1; + mp_ncpus--; + continue; + } + cpu++; /* save APIC ID for this logical ID */ ==== //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.3 2004/09/23 21:59:43 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.4 2004/11/05 19:48:40 cognet Exp $"); #include @@ -973,7 +973,11 @@ cpufuncs = arm9_cpufuncs; cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ get_cachetype_cp15(); +#ifdef ARM9_CACHE_WRITE_THROUGH pmap_pte_init_arm9(); +#else + pmap_pte_init_generic(); +#endif return 0; } #endif /* CPU_ARM9 */ ==== //depot/projects/netperf_socket/sys/arm/arm/critical.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/critical.c,v 1.1 2004/05/14 11:46:42 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/critical.c,v 1.2 2004/11/05 18:29:45 cognet Exp $"); #include #include #include @@ -46,5 +46,7 @@ void cpu_critical_fork_exit(void) { + + curthread->td_md.md_savecrit = __set_cpsr_c(0, 0) &~ I32_bit; } ==== //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.4 2004/09/23 22:03:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.5 2004/11/04 18:48:52 cognet Exp $"); #include #include @@ -155,13 +155,13 @@ case R_ARM_NONE: /* none */ break; - case R_ARM_PC24: /* S + A - P */ + case R_ARM_ABS32: addr = lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend - (Elf_Addr)where; if (*where != addr) *where = addr; + break; case R_ARM_COPY: /* none */ @@ -173,14 +173,13 @@ return -1; break; - case R_ARM_GLOB_DAT: /* S */ + case R_ARM_JUMP_SLOT: addr = lookup(lf, symidx, 1); - if (addr == 0) - return -1; - if (*where != addr) + if (addr) { *where = addr; - break; - + return (0); + } + return (-1); case R_ARM_RELATIVE: break; @@ -212,6 +211,8 @@ elf_cpu_load_file(linker_file_t lf __unused) { + cpu_idcache_wbinv_all(); + cpu_tlb_flushID(); return (0); } ==== //depot/projects/netperf_socket/sys/arm/arm/fusu.S#3 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include "assym.s" -__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.2 2004/09/28 14:39:26 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/fusu.S,v 1.3 2004/11/05 19:50:48 cognet Exp $"); #ifdef MULTIPROCESSOR .Lcpu_info: @@ -52,6 +52,56 @@ * Fetch an int from the user's address space. */ +ENTRY(casuptr) +#ifdef MULTIPROCESSOR + /* XXX Probably not appropriate for non-Hydra SMPs */ + stmfd sp!, {r0, r14} + bl _C_LABEL(cpu_number) + ldr r2, .Lcpu_info + ldr r2, [r2, r0, lsl #2] + ldr r2, [r2, #CI_CURPCB] + ldmfd sp!, {r0, r14} +#else + ldr r3, .Lcurpcb + ldr r3, [r3] +#endif + +#ifdef DIAGNOSTIC + teq r3, #0x00000000 + beq .Lfusupcbfault +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 6 17:25:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0E1C16A4D0; Sat, 6 Nov 2004 17:25:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6520A16A4D5 for ; Sat, 6 Nov 2004 17:25:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4803743D31 for ; Sat, 6 Nov 2004 17:25:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA6HPNuT013303 for ; Sat, 6 Nov 2004 17:25:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA6HPMpe013299 for perforce@freebsd.org; Sat, 6 Nov 2004 17:25:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Nov 2004 17:25:22 GMT Message-Id: <200411061725.iA6HPMpe013299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 64433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Nov 2004 17:25:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=64433 Change 64433 by rwatson@rwatson_zoo on 2004/11/06 17:25:09 Integ md(4) tweaks to netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/dev/md/md.c#24 integrate .. //depot/projects/netperf_socket/sys/sys/mdioctl.h#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/md/md.c#24 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.142 2004/10/23 20:50:06 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.144 2004/11/06 13:16:35 pjd Exp $ * */ @@ -174,6 +174,7 @@ /* MD_VNODE related fields */ struct vnode *vnode; + char file[PATH_MAX]; struct ucred *cred; /* MD_SWAP related fields */ @@ -440,7 +441,7 @@ } if (osp > 255) uma_zfree(sc->uma, (void*)osp); - if (error) + if (error != 0) break; secno++; dst += sc->sectorsize; @@ -721,7 +722,7 @@ mtx_init(&sc->queue_mtx, "md bio queue", NULL, MTX_DEF); sprintf(sc->name, "md%d", unit); error = kthread_create(md_kthread, sc, &sc->procp, 0, 0,"%s", sc->name); - if (error) { + if (error != 0) { free(sc, M_MD); return (NULL); } @@ -861,19 +862,23 @@ struct nameidata nd; int error, flags; + if (strlcpy(sc->file, mdio->md_file, sizeof(sc->file)) >= + sizeof(sc->file)) { + return (ENAMETOOLONG); + } flags = FREAD|FWRITE; - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, sc->file, td); error = vn_open(&nd, &flags, 0, -1); - if (error) { + if (error != 0) { NDFREE(&nd, NDF_ONLY_PNBUF); if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); + NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, sc->file, td); error = vn_open(&nd, &flags, 0, -1); } NDFREE(&nd, NDF_ONLY_PNBUF); - if (error) + if (error != 0) return (error); if (nd.ni_vp->v_type != VREG || (error = VOP_GETATTR(nd.ni_vp, &vattr, td->td_ucred, td))) { @@ -984,7 +989,7 @@ } } error = mdsetcred(sc, td->td_ucred); - if (error) { + if (error != 0) { vm_object_deallocate(sc->object); sc->object = NULL; } @@ -1097,11 +1102,15 @@ mdio->md_mediasize = sc->mediasize; mdio->md_sectorsize = sc->sectorsize; if (sc->type == MD_VNODE) { - /* XXX fill this in */ - mdio->md_file = NULL; + if (strlcpy(mdio->md_file, sc->file, + sizeof(mdio->md_file)) >= sizeof(mdio->md_file)) { + return (ENAMETOOLONG); + } } return (0); case MDIOCLIST: + if (mdio->md_version != MDIOVERSION) + return (EINVAL); i = 1; LIST_FOREACH(sc, &md_softc_list, list) { if (i == MDNPAD - 1) ==== //depot/projects/netperf_socket/sys/sys/mdioctl.h#6 (text+ko) ==== @@ -37,7 +37,7 @@ * * From: src/sys/sys/vnioctl.h,v 1.4 * - * $FreeBSD: src/sys/sys/mdioctl.h,v 1.17 2004/09/16 21:32:13 pjd Exp $ + * $FreeBSD: src/sys/sys/mdioctl.h,v 1.18 2004/11/06 13:07:02 pjd Exp $ */ #ifndef _SYS_MDIOCTL_H_ @@ -54,20 +54,20 @@ unsigned md_version; /* Structure layout version */ unsigned md_unit; /* unit number */ enum md_types md_type ; /* type of disk */ - char *md_file; /* pathname of file to mount */ off_t md_mediasize; /* size of disk in bytes */ unsigned md_sectorsize; /* sectorsize */ unsigned md_options; /* options */ u_int64_t md_base; /* base address */ int md_fwheads; /* firmware heads */ int md_fwsectors; /* firmware sectors */ + char md_file[PATH_MAX]; /* pathname of file to mount */ int md_pad[MDNPAD]; /* padding for future ideas */ }; #define MD_NAME "md" #define MD_MODNAME "g_md" #define MDCTL_NAME "mdctl" -#define MDIOVERSION 0 +#define MDIOVERSION 1 /* * Before you can use a unit, it must be configured with MDIOCSET.