From owner-p4-projects@FreeBSD.ORG Sun Jan 22 03:48:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AA4316A422; Sun, 22 Jan 2006 03:48:12 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D138816A41F for ; Sun, 22 Jan 2006 03:48:11 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82B2643D45 for ; Sun, 22 Jan 2006 03:48:11 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0M3mBu9010272 for ; Sun, 22 Jan 2006 03:48:11 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0M3mBvA010266 for perforce@freebsd.org; Sun, 22 Jan 2006 03:48:11 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 22 Jan 2006 03:48:11 GMT Message-Id: <200601220348.k0M3mBvA010266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 90144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2006 03:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=90144 Change 90144 by soc-andrew@soc-andrew_serv on 2006/01/22 03:47:10 Fix a problem where the size of the malloced space is 1 byte too small in libdfui Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_tcp.c#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/dfui/conn_tcp.c#2 (text+ko) ==== @@ -396,7 +396,7 @@ * Construct a message. */ - fmsg = malloc(strlen(msg) + 1); + fmsg = malloc(strlen(msg) + 2); fmsg[0] = msgtype; strcpy(fmsg + 1, msg); dfui_debug("SEND<<%s>>\n", fmsg); From owner-p4-projects@FreeBSD.ORG Sun Jan 22 22:12:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7006716A422; Sun, 22 Jan 2006 22:12:00 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 16EC216A41F for ; Sun, 22 Jan 2006 22:12:00 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF83D43D48 for ; Sun, 22 Jan 2006 22:11:59 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0MMBxbf086366 for ; Sun, 22 Jan 2006 22:11:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0MMBwbr086363 for perforce@freebsd.org; Sun, 22 Jan 2006 22:11:58 GMT (envelope-from scottl@freebsd.org) Date: Sun, 22 Jan 2006 22:11:58 GMT Message-Id: <200601222211.k0MMBwbr086363@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 90185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2006 22:12:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=90185 Change 90185 by scottl@scottl-junior on 2006/01/22 22:11:13 Integrate from the xen3 parent. Affected files ... .. //depot/projects/xen3-newbus/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/conf/NOTES#2 integrate .. //depot/projects/xen3-newbus/src/sys/conf/files#2 integrate .. //depot/projects/xen3-newbus/src/sys/conf/files.i386-xen#2 integrate .. //depot/projects/xen3-newbus/src/sys/conf/options#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/si/si.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/si/si2_z280.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/si/si3_t225.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/dev/xen/balloon/balloon.c#1 branch .. //depot/projects/xen3-newbus/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/conf/XENCONF#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/i386-xen/clock.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/i386-xen/evtchn.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/i386-xen/io_apic.c#1 branch .. //depot/projects/xen3-newbus/src/sys/i386-xen/i386-xen/machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/i386-xen/xen_machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/include/pmap.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/include/xenfunc.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/include/xenpmap.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386-xen/include/xenvar.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/tty.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/net/if_mib.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/net/if_mib.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/xen3-newbus/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/sys/_lock.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/sys/lock.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/sys/param.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/sys/select.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/sys/tty.h#2 integrate .. //depot/projects/xen3-newbus/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/xen3-newbus/src/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/xen3-newbus/src/sys/amd64/amd64/bpf_jit_machdep.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.3 2005/12/06 07:22:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $"); #include "opt_bpf.h" @@ -103,6 +103,10 @@ */ emit_func emitm; + /* Do not compile an empty filter. */ + if (nins == 0) + return NULL; + /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); ==== //depot/projects/xen3-newbus/src/sys/amd64/amd64/mptable_pci.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.3 2005/09/18 01:42:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.4 2006/01/06 19:22:18 jhb Exp $"); #include #include @@ -100,13 +100,10 @@ { 0, 0 } }; -static driver_t mptable_hostb_driver = { - "pcib", - mptable_hostb_methods, - 1, -}; +static devclass_t hostb_devclass; -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, pcib_devclass, 0, 0); +DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); +DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); /* PCI to PCI bridge driver. */ @@ -155,11 +152,9 @@ {0, 0} }; -static driver_t mptable_pcib_driver = { - "pcib", - mptable_pcib_pci_methods, - sizeof(struct pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, + sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); ==== //depot/projects/xen3-newbus/src/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.299 2006/01/06 18:02:11 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -220,10 +220,10 @@ printf("kernel trap %d with interrupts disabled\n", type); /* - * We shouldn't enable interrupts while in a critical - * section or servicing an NMI. + * We shouldn't enable interrupts while holding a + * spin lock or servicing an NMI. */ - if (type != T_NMI && td->td_critnest == 0) + if (type != T_NMI && td->td_md.md_spinlock_count == 0) enable_intr(); } } ==== //depot/projects/xen3-newbus/src/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.115 2005/12/20 21:09:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.116 2006/01/06 19:22:18 jhb Exp $"); #include "opt_cpu.h" @@ -326,12 +326,9 @@ { 0, 0 } }; -static driver_t legacy_pcib_driver = { - "pcib", - legacy_pcib_methods, - 1, -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, pcib_devclass, 0, 0); @@ -377,12 +374,7 @@ { 0, 0 } }; -static driver_t pcibus_pnp_driver = { - "pcibus_pnp", - pcibus_pnp_methods, - 1, /* no softc */ -}; - static devclass_t pcibus_pnp_devclass; +DEFINE_CLASS_0(pcibus_pnp, pcibus_pnp_driver, pcibus_pnp_methods, 1); DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0); ==== //depot/projects/xen3-newbus/src/sys/arm/arm/trap.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.19 2006/01/06 18:02:12 jhb Exp $"); #include @@ -269,7 +269,8 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_critnest == 0 && __predict_true(tf->tf_spsr & I32_bit) == 0) + if (td->td_md.md_spinlock_count == 0 && + __predict_true(tf->tf_spsr & I32_bit) == 0) enable_interrupts(I32_bit); /* Invoke the appropriate handler, if necessary */ @@ -729,7 +730,7 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_critnest == 0 && + if (td->td_md.md_spinlock_count == 0 && __predict_true((tf->tf_spsr & I32_bit) == 0)) enable_interrupts(I32_bit); @@ -1007,7 +1008,7 @@ * 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)) + if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) enable_interrupts(I32_bit); syscall(td, frame, insn); ==== //depot/projects/xen3-newbus/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.60 2005/07/01 15:21:29 avatar Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.61 2006/01/08 20:04:55 iedowse Exp $"); #include #include @@ -1656,6 +1656,8 @@ case CAM_NO_HBA: case CAM_PROVIDE_FAIL: case CAM_REQ_TOO_BIG: + case CAM_LUN_INVALID: + case CAM_TID_INVALID: error = EINVAL; break; case CAM_SCSI_BUS_RESET: ==== //depot/projects/xen3-newbus/src/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1341 2005/12/31 14:39:19 netchild Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1343 2006/01/04 17:19:28 joel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1922,9 +1922,9 @@ # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # +# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_als4000: Avance Logic ALS4000 PCI. # snd_atiixp: ATI IXP 200/300/400 PCI. -# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_audiocs: Crystal Semiconductor CS4231 SBus/EBus. # snd_cmi: CMedia CMI8338/CMI8738 PCI. # snd_cs4281: Crystal Semiconductor CS4281 PCI. @@ -1984,7 +1984,6 @@ device snd_via8233 device snd_via82c686 device snd_vibes -#device snd_vortex1 device snd_uaudio # For non-pnp sound cards: ==== //depot/projects/xen3-newbus/src/sys/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1080 2005/12/29 01:43:46 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1081 2006/01/04 17:05:18 joel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -860,7 +860,6 @@ dev/sound/pci/via8233.c optional snd_via8233 pci dev/sound/pci/via82c686.c optional snd_via82c686 pci dev/sound/pci/vibes.c optional snd_vibes pci -#dev/sound/pci/vortex1.c optional snd_vortex1 pci dev/sound/pcm/ac97.c optional sound dev/sound/pcm/ac97_if.m optional sound dev/sound/pcm/ac97_patch.c optional sound ==== //depot/projects/xen3-newbus/src/sys/conf/files.i386-xen#2 (text+ko) ==== @@ -455,3 +455,4 @@ dev/xen/xenbus/xenbus_xs.c standard dev/xen/blkfront/blkfront.c standard dev/xen/netfront/netfront.c standard +dev/xen/balloon/balloon.c standard ==== //depot/projects/xen3-newbus/src/sys/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.522 2005/12/31 14:39:19 netchild Exp $ +# $FreeBSD: src/sys/conf/options,v 1.523 2006/01/06 04:44:09 imp Exp $ # # On the handling of kernel options # @@ -213,6 +213,11 @@ # otherwise a STUB module will be compiled in. SOFTUPDATES opt_ffs.h +# On small, embedded systems, it can be useful to turn off support for +# snapshots. It saves about 30-40k for a feature that would be lightly +# used, if it is used at all. +NO_FFS_SNAPSHOT opt_ffs.h + # Enabling this option turns on support for Access Control Lists in UFS, # which can be used to support high security configurations. Depends on # UFS_EXTATTR. ==== //depot/projects/xen3-newbus/src/sys/dev/acpica/acpi_pci_link.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.51 2005/12/05 19:50:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.53 2006/01/06 16:14:32 jhb Exp $"); #include "opt_acpi.h" #include @@ -449,8 +449,10 @@ } } sc->pl_num_links = creq.count; - if (creq.count == 0) + if (creq.count == 0) { + ACPI_SERIAL_END(pci_link); return (0); + } sc->pl_links = malloc(sizeof(struct link) * sc->pl_num_links, M_PCI_LINK, M_WAITOK | M_ZERO); @@ -625,8 +627,11 @@ /* Bump the reference count. */ ACPI_SERIAL_BEGIN(pci_link); link = acpi_pci_link_lookup(dev, index); - if (link == NULL) - panic("%s: apparently invalid index %d", __func__, index); + if (link == NULL) { + device_printf(dev, "apparently invalid index %d\n", index); + ACPI_SERIAL_END(pci_link); + return; + } link->l_references++; if (link->l_routed) pci_link_interrupt_weights[link->l_irq]++; ==== //depot/projects/xen3-newbus/src/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.49 2005/09/16 07:02:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.50 2006/01/06 19:22:18 jhb Exp $"); #include "opt_acpi.h" #include @@ -107,12 +107,10 @@ {0, 0} }; -static driver_t acpi_pcib_acpi_driver = { - "pcib", - acpi_pcib_acpi_methods, - sizeof(struct acpi_hpcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, acpi_pcib_acpi_driver, acpi_pcib_acpi_methods, + sizeof(struct acpi_hpcib_softc)); DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, pcib_devclass, 0, 0); MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); ==== //depot/projects/xen3-newbus/src/sys/dev/acpica/acpi_pcib_pci.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.13 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.14 2006/01/06 19:22:18 jhb Exp $"); #include "opt_acpi.h" @@ -97,12 +97,10 @@ {0, 0} }; -static driver_t acpi_pcib_pci_driver = { - "pcib", - acpi_pcib_pci_methods, - sizeof(struct acpi_pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, acpi_pcib_pci_driver, acpi_pcib_pci_methods, + sizeof(struct acpi_pcib_softc)); DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, pcib_devclass, 0, 0); MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.260 2005/11/25 09:00:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.261 2006/01/05 21:27:18 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-all.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,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/sys/dev/ata/ata-all.h,v 1.109 2005/12/27 16:49:33 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.110 2006/01/05 21:27:19 sos Exp $ */ /* ATA register defines */ ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-card.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.38 2005/09/22 18:46:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.39 2006/01/05 21:27:19 sos Exp $"); #include #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-cbus.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 - 2005 Søren Schmidt + * Copyright (c) 2002 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.22 2005/04/30 16:22:06 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.23 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-chipset.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.146 2005/12/30 23:15:02 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.149 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include @@ -2920,7 +2918,8 @@ devid == ATA_I960RM) return ENXIO; - strcpy(buffer, idx->text); + strcpy(buffer, "Promise "); + strcat(buffer, idx->text); /* if we are on a FastTrak TX4, adjust the interrupt resource */ if ((idx->cfg2 & PRTX4) && pci_get_class(GRANDPARENT(dev))==PCIC_BRIDGE && @@ -2942,8 +2941,7 @@ start = end = 0; } } - sprintf(buffer, "Promise %s %s controller", - buffer, ata_mode2str(idx->max_dma)); + sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_promise_chipinit; @@ -2995,8 +2993,6 @@ break; case PRMIO: -// if (ctlr->r_res1) -// bus_release_resource(dev, ctlr->r_type1, ctlr->r_rid1,ctlr->r_res1); ctlr->r_type1 = SYS_RES_MEMORY; ctlr->r_rid1 = PCIR_BAR(4); if (!(ctlr->r_res1 = bus_alloc_resource_any(dev, ctlr->r_type1, @@ -3694,7 +3690,7 @@ struct ata_device *atadev = device_get_softc(dev); int devno = (ch->unit << 1) + ATA_DEV(atadev->unit); int error; - u_int32_t timings33[][2] = { + u_int32_t timings[][2] = { /* PROLD PRNEW mode */ { 0x004ff329, 0x004fff2f }, /* PIO 0 */ { 0x004fec25, 0x004ff82a }, /* PIO 1 */ @@ -3755,7 +3751,7 @@ if (!error) { if (ctlr->chip->cfg1 < PRTX) pci_write_config(gparent, 0x60 + (devno << 2), - timings33[ctlr->chip->cfg1][ata_mode2idx(mode)],4); + timings[ata_mode2idx(mode)][ctlr->chip->cfg1], 4); atadev->mode = mode; } return; ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-disk.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.191 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.192 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-disk.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,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/sys/dev/ata/ata-disk.h,v 1.50 2005/03/30 12:03:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.51 2006/01/05 21:27:19 sos Exp $ */ /* structure describing an ATA disk */ ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-dma.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.140 2005/12/05 22:31:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.141 2006/01/05 21:27:19 sos Exp $"); #include #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-isa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.29 2005/04/30 16:22:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.30 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-lowlevel.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.74 2005/12/05 22:31:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.75 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-pci.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.109 2005/12/27 18:22:11 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.110 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 - 2005 Søren Schmidt + * Copyright (c) 2003 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,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/sys/dev/ata/ata-pci.h,v 1.58 2005/12/27 17:09:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.59 2006/01/05 21:27:19 sos Exp $ */ /* structure holding chipset config info */ ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-queue.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.52 2005/12/27 16:49:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.53 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-raid.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2005 Søren Schmidt + * Copyright (c) 2000 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.114 2005/12/27 16:49:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.115 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata-raid.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2005 Søren Schmidt + * Copyright (c) 2000 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,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/sys/dev/ata/ata-raid.h,v 1.41 2005/12/15 13:30:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.42 2006/01/05 21:27:19 sos Exp $ */ /* misc defines */ ==== //depot/projects/xen3-newbus/src/sys/dev/ata/ata_if.m#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) 2004, 2005 Søren Schmidt +# Copyright (c) 2004 - 2006 Søren Schmidt # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -10,8 +10,6 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,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/sys/dev/ata/ata_if.m,v 1.5 2005/04/30 16:22:07 sos Exp $ +# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.6 2006/01/05 21:27:19 sos Exp $ #include #include ==== //depot/projects/xen3-newbus/src/sys/dev/ata/atapi-cd.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 23 16:01:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52B8416A542; Mon, 23 Jan 2006 16:01:18 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E236B16A422 for ; Mon, 23 Jan 2006 16:01:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8F4143D46 for ; Mon, 23 Jan 2006 16:01:17 +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.13.1/8.13.1) with ESMTP id k0NG1HS9062978 for ; Mon, 23 Jan 2006 16:01:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NG1H3x062975 for perforce@freebsd.org; Mon, 23 Jan 2006 16:01:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Jan 2006 16:01:17 GMT Message-Id: <200601231601.k0NG1H3x062975@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 Cc: Subject: PERFORCE change 90217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 16:01:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=90217 Change 90217 by rwatson@rwatson_peppercorn on 2006/01/23 16:00:20 Assert rwatson copyright due to lots of cleanup, bug fixing, chance of memory allocation semantics, 64-bit header types Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#27 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#27 (text+ko) ==== @@ -1,6 +1,7 @@ /* * Copyright (c) 2004, Apple Computer, Inc. * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * * This code was developed in part by Robert N. M. Watson, Senior Principal From owner-p4-projects@FreeBSD.ORG Mon Jan 23 20:02:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE8B216A422; Mon, 23 Jan 2006 20:02:26 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 5AD1616A420 for ; Mon, 23 Jan 2006 20:02:26 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D075444219 for ; Mon, 23 Jan 2006 20:02:18 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0NK2IL2083333 for ; Mon, 23 Jan 2006 20:02:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NK2HLx083330 for perforce@freebsd.org; Mon, 23 Jan 2006 20:02:17 GMT (envelope-from peter@freebsd.org) Date: Mon, 23 Jan 2006 20:02:17 GMT Message-Id: <200601232002.k0NK2HLx083330@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 Cc: Subject: PERFORCE change 90235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 20:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=90235 Change 90235 by peter@peter_daintree on 2006/01/23 20:01:56 IFC @90234 Affected files ... .. //depot/projects/hammer/etc/defaults/rc.conf#67 integrate .. //depot/projects/hammer/etc/gettytab#4 integrate .. //depot/projects/hammer/etc/periodic/daily/Makefile#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#45 integrate .. //depot/projects/hammer/etc/rc.d/devfs#12 integrate .. //depot/projects/hammer/etc/rc.d/ftpd#1 branch .. //depot/projects/hammer/games/fortune/datfiles/fortunes#57 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#21 integrate .. //depot/projects/hammer/lib/libc/sys/rename.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/undelete.2#3 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_info.c#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#12 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#28 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#20 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/hammer/share/man/man4/bktr.4#10 integrate .. //depot/projects/hammer/share/man/man4/snd_atiixp.4#3 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#69 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_pci.c#6 integrate .. //depot/projects/hammer/sys/cam/cam_ccb.h#7 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#25 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#19 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#40 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#68 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#63 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#23 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#58 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#16 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#19 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/hammer/sys/dev/isp/isp_inline.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#7 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_target.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#8 integrate .. //depot/projects/hammer/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_fc.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_init.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_lan.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_targ.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#8 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#52 integrate .. //depot/projects/hammer/sys/dev/pci/pci_private.h#12 integrate .. //depot/projects/hammer/sys/dev/sound/driver.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#15 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#18 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#8 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#67 integrate .. //depot/projects/hammer/sys/fs/msdosfs/direntry.h#6 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_conv.c#13 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#10 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#23 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#9 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#44 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#13 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#37 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#53 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#27 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#47 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#51 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#51 integrate .. //depot/projects/hammer/sys/kern/uipc_sem.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#40 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#65 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#19 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#98 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#56 integrate .. //depot/projects/hammer/sys/libkern/fnmatch.c#5 integrate .. //depot/projects/hammer/sys/net/if.c#59 integrate .. //depot/projects/hammer/sys/net/if_gre.c#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#28 integrate .. //depot/projects/hammer/sys/netatm/atm_signal.c#5 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_vcm.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#14 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#37 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#15 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.h#5 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#27 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#9 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#10 integrate .. //depot/projects/hammer/sys/netipsec/keysock.h#3 integrate .. //depot/projects/hammer/sys/netkey/keysock.c#14 integrate .. //depot/projects/hammer/sys/netkey/keysock.h#4 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#25 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/hammer/sys/sys/ata.h#14 integrate .. //depot/projects/hammer/sys/sys/syscall.h#50 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#50 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#50 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#59 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#24 integrate .. //depot/projects/hammer/tools/regression/aio/kqueue/aio_kqueue.c#2 integrate .. //depot/projects/hammer/tools/regression/aio/kqueue/lio/lio_kqueue.c#2 integrate Differences ... ==== //depot/projects/hammer/etc/defaults/rc.conf#67 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.270 2006/01/08 10:15:30 dougb Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.271 2006/01/21 18:08:15 yar Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -227,6 +227,9 @@ sshd_enable="NO" # Enable sshd sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one. sshd_flags="" # Additional flags for sshd. +ftpd_enable="NO" # Enable stand-alone ftpd. +ftpd_program="/usr/libexec/ftpd" # Path to ftpd, if you want a different one. +ftpd_flags="" # Additional flags to stand-alone ftpd. ### Network daemon (NFS): All need rpcbind_enable="YES" ### amd_enable="NO" # Run amd service with $amd_flags (or NO). ==== //depot/projects/hammer/etc/gettytab#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.22 2004/06/06 11:46:27 schweikh Exp $ +# $FreeBSD: src/etc/gettytab,v 1.23 2006/01/22 15:33:16 matteo Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -211,6 +211,8 @@ # 3wire.9600|9600-3wire:\ :np:nc:sp#9600: +3wire.19200|19200-3wire:\ + :np:nc:sp#19200: 3wire.38400|38400-3wire:\ :np:nc:sp#38400: 3wire.57600|57600-3wire:\ ==== //depot/projects/hammer/etc/periodic/daily/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.12 2003/10/27 20:14:53 jesper Exp $ +# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.13 2006/01/21 20:16:30 maxim Exp $ FILES= 100.clean-disks \ 110.clean-tmps \ @@ -12,8 +12,9 @@ 310.accounting \ 330.news \ 400.status-disks \ + 405.status-ata-raid \ + 406.status-gmirror \ 420.status-network \ - 405.status-ata-raid \ 430.status-rwho \ 440.status-mailq \ 450.status-security \ ==== //depot/projects/hammer/etc/rc.d/Makefile#45 (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.62 2005/12/15 01:04:48 iedowse Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.63 2006/01/21 18:08:15 yar Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -9,7 +9,7 @@ devd devfs dhclient \ dmesg dumpon \ early.sh encswap \ - fsck \ + fsck ftpd \ gbde geli geli2 \ hcsecd \ hostname \ ==== //depot/projects/hammer/etc/rc.d/devfs#12 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.11 2005/12/10 20:21:45 dougb Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.12 2006/01/21 14:31:45 matteo Exp $ # # PROVIDE: devfs @@ -41,19 +41,25 @@ { if [ -r /etc/devfs.conf ]; then cd /dev - while read action device parameter; do + while read action devicelist parameter; do case "${action}" in - l*) if [ -c ${device} -a ! -e ${parameter} ]; then - ln -fs ${device} ${parameter} - fi + l*) for device in ${devicelist}; do + if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + done ;; - o*) if [ -c ${device} ]; then - chown ${parameter} ${device} - fi + o*) for device in ${devicelist}; do + if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + done ;; - p*) if [ -c ${device} ]; then - chmod ${parameter} ${device} - fi + p*) for device in ${devicelist}; do + if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + done ;; esac done < /etc/devfs.conf ==== //depot/projects/hammer/games/fortune/datfiles/fortunes#57 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.202 2005/12/25 23:26:34 wilko Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.203 2006/01/21 14:16:01 matteo Exp $ % ======================================================================= @@ -8962,13 +8962,9 @@ Exposed to the attacks of friends and acquaintances; defamed; slandered. % -ABSENTEE: +Absentee, n.: A person with an income who has had the forethought - to remove themselves from the sphere of exaction. -% -Absentee, n.: - A person with an income who has had the forethought to remove -himself from the sphere of exaction. + to remove himself from the sphere of exaction. -- Ambrose Bierce, "The Devil's Dictionary" % Absinthe makes the tart grow fonder. @@ -8976,13 +8972,9 @@ Absolutum obsoletum. (If it works, it's out of date.) -- Stafford Beer % -ABSTAINER: +Abstainer, n.: A weak person who yields to the temptation of denying himself a pleasure. -% -Abstainer, n.: - A weak person who yields to the temptation of denying himself a -pleasure. -- Ambrose Bierce, "The Devil's Dictionary" % Abstract: @@ -8999,13 +8991,9 @@ Neck in Relation to Visual Performance." Human Factors 29, #1 (Feb. 1987), pp. 67-71. % -ABSURDITY: +Absurdity, n.: A statement or belief manifestly inconsistent with one's own opinion. -% -Absurdity, n.: - A statement or belief manifestly inconsistent with one's own -opinion. -- Ambrose Bierce, "The Devil's Dictionary" % Academic politics is the most vicious and bitter form of politics, @@ -10004,9 +9992,6 @@ about today's software design would be accurate. -- K. E. Iverson % -ALONE: - In bad company. -% Alone, adj.: In bad company. -- Ambrose Bierce, "The Devil's Dictionary" @@ -10107,9 +10092,6 @@ There is so much sand in Northern Africa that if it were spread out it would completely cover the Sahara Desert. % -AMBIDEXTROUS: - Able to pick with equal skill a right-hand pocket or a left. -% Ambidextrous, adj.: Able to pick with equal skill a right-hand pocket or a left. -- Ambrose Bierce, "The Devil's Dictionary" @@ -10853,13 +10835,9 @@ at the same time with the other! (Well, you really can't, but the Americans think you can, and that's the point, right?) % -ANOINT: +Anoint, v.: To grease a king or other great functionary already sufficiently slippery. -% -Anoint, v.: - To grease a king or other great functionary already -sufficiently slippery. -- Ambrose Bierce, "The Devil's Dictionary" % Another day, another dollar. @@ -11220,14 +11198,9 @@ April is the cruelest month... -- Thomas Stearns Eliot % -AQUADEXTROUS: +Aquadextrous, adj.: Possessing the ability to turn the bathtub faucet on and off with your toes. - -- "Sniglets", Rich Hall & Friends -% -aquadextrous, adj.: - Possessing the ability to turn the bathtub faucet on and off -with your toes. -- Rich Hall, "Sniglets" % AQUARIUS (Jan 20 - Feb 18) @@ -12124,13 +12097,9 @@ [Babe] Ruth made a big mistake when he gave up pitching. -- Tris Speaker, 1921 % -BACCHUS: +Bacchus, n.: A convenient deity invented by the ancients as an excuse for getting drunk. -% -Bacchus, n.: - A convenient deity invented by the ancients as an excuse for -getting drunk. -- Ambrose Bierce, "The Devil's Dictionary" % BACHELOR: @@ -12237,13 +12206,9 @@ Barker's Proof: Proofreading is more effective after publication. % -BAROMETER: +Barometer, n.: An ingenious instrument which indicates what kind of weather we are having. -% -Barometer, n.: - An ingenious instrument which indicates what kind of weather we -are having. -- Ambrose Bierce, "The Devil's Dictionary" % Barth's Distinction: @@ -14191,14 +14156,9 @@ A fire at one end, a fool at the other, and a bit of tobacco in between. % -CINEMUCK: - The combination of popcorn, soda, and melted chocolate - which covers the floors of movie theaters. - -- "Sniglets", Rich Hall & Friends -% Cinemuck, n.: The combination of popcorn, soda, and melted chocolate which -covers the floors of movie theaters. + covers the floors of movie theaters. -- Rich Hall, "Sniglets" % Circumstances rule men; men do not rule circumstances. @@ -14975,9 +14935,6 @@ Courtship to marriage, as a very witty prologue to a very dull play. -- William Congreve % -COWARD: - One who in a perilous emergency thinks with his legs. -% Coward, n.: One who in a perilous emergency thinks with his legs. -- Ambrose Bierce, "The Devil's Dictionary" @@ -15020,11 +14977,7 @@ Crime does not pay... as well as politics. -- A. E. Neuman % -CRITIC: - A person who boasts himself hard to please - because nobody tries to please him. -% -critic, n.: +Critic, n.: A person who boasts himself hard to please because nobody tries to please him. -- Ambrose Bierce, "The Devil's Dictionary" @@ -15225,9 +15178,6 @@ Davis's Dictum: Problems that go away by themselves, come back by themselves. % -DAWN: - The time when men of reason go to bed. -% Dawn, n.: The time when men of reason go to bed. -- Ambrose Bierce, "The Devil's Dictionary" @@ -15642,13 +15592,9 @@ child. -- Dr. Albert Hoffman % -DELIBERATION: +Deliberation, n.: The act of examining one's bread to determine which side it is buttered on. -% -Deliberation, n.: - The act of examining one's bread to determine which side it is -buttered on. -- Ambrose Bierce, "The Devil's Dictionary" % Deliver yesterday, code today, think tomorrow. @@ -15756,14 +15702,9 @@ % Dental health is next to mental health. % -Dentist: +Dentist, n.: A Prestidigitator who, putting metal in one's mouth, pulls coins out of one's pockets. - -- Ambrose Bierce -% -Dentist, n.: - A Prestidigitator who, putting metal in one's mouth, pulls -coins out of one's pockets. -- Ambrose Bierce, "The Devil's Dictionary" % Denver, n: @@ -16032,9 +15973,6 @@ Distinctive, adj.: A different color or shape than our competitors. % -DISTRESS: - A disease incurred by exposure to the prosperity of a friend. -% Distress, n.: A disease incurred by exposure to the prosperity of a friend. -- Ambrose Bierce, "The Devil's Dictionary" @@ -16903,7 +16841,7 @@ % Eat drink and be merry, for tomorrow we diet. % -"Eat, drink, and be merry, for tomorrow you may work." +Eat, drink, and be merry, for tomorrow you may work. % Eat one live toad the first thing in the morning and nothing worse will happen to you the rest of the day. @@ -16996,9 +16934,6 @@ Egotism, n: Doing the New York Times crossword puzzle with a pen. -Egotist, n: - A person of low taste, more interested in himself than me. - -- Ambrose Bierce % Egotist, n.: A person of low taste, more interested in himself than me. @@ -21089,15 +21024,9 @@ (2) The strength of the turbulence is directly proportional to the temperature of your coffee. % -GURMLISH: +Gurmlish, n.: The red warning flag at the top of a club sandwich which prevents the person from biting into it and puncturing the roof of his mouth. - -- "Sniglets", Rich Hall & Friends -% -Gurmlish, n.: - The red warning flag at the top of a club sandwich which -prevents the person from biting into it and puncturing the roof of his -mouth. -- Rich Hall & Friends, "Sniglets" % GURU: @@ -28376,15 +28305,10 @@ (2) If a small boy can get dirty, he will. (3) If a teenager can go out, he will. % -IMPARTIAL: +Impartial, adj.: Unable to perceive any promise of personal advantage from espousing either side of a controversy or adopting either of two conflicting opinions. -% -Impartial, adj.: - Unable to perceive any promise of personal advantage from -espousing either side of a controversy or adopting either of two -conflicting opinions. -- Ambrose Bierce, "The Devil's Dictionary" % Important letters which contain no errors will develop errors in the @@ -29111,9 +29035,6 @@ Increased knowledge will help you now. Have mate's phone bugged. % -INCUMBENT: - Person of liveliest interest to the outcumbents. -% Incumbent, n.: Person of liveliest interest to the outcumbents. -- Ambrose Bierce, "The Devil's Dictionary" @@ -29304,15 +29225,10 @@ best at, that's what I say. -- Doctor Who % -INTERPRETER: +Interpreter, n.: One who enables two persons of different languages to understand each other by repeating to each what it would have been to the interpreter's advantage for the other to have said. -% -Interpreter, n.: - One who enables two persons of different languages to -understand each other by repeating to each what it would have been to -the interpreter's advantage for the other to have said. -- Ambrose Bierce, "The Devil's Dictionary" % Into love and out again, @@ -31496,13 +31412,8 @@ % Kleeneness is next to Godelness. % -Klein bottle for rent -- inquire within. +Klein bottle for sale -- inquire within. % -Klein bottle for sale ... inquire within. -% -KLEPTOMANIAC: - A rich thief. -% Kleptomaniac, n.: A rich thief. -- Ambrose Bierce, "The Devil's Dictionary" @@ -31587,11 +31498,6 @@ Kramer's Law: You can never tell which way the train went by looking at the tracks. % -KROGT: - (chemical symbol: Kr) The metallic silver coating found - on fast-food game cards. - -- "Sniglets", Rich Hall & Friends -% Krogt, n. (chemical symbol: Kr): The metallic silver coating found on fast-food game cards. -- Rich Hall, "Sniglets" @@ -31615,14 +31521,9 @@ 2. Never be last. 3. Never volunteer for anything. % -LACTOMANGULATION: - Manhandling the "open here" spout on a milk carton so badly that - one has to resort to using the "illegal" side. - -- "Sniglets", Rich Hall & Friends -% Lactomangulation, n.: Manhandling the "open here" spout on a milk carton so badly -that one has to resort to using the "illegal" side. + that one has to resort to using the "illegal" side. -- Rich Hall, "Sniglets" % La-dee-dee, la-dee-dah. @@ -32193,9 +32094,6 @@ L'hazard ne favorise que l'esprit prepare. -- L. Pasteur % -LIAR: - A lawyer with a roving commission. -% Liar, n.: A lawyer with a roving commission. -- Ambrose Bierce, "The Devil's Dictionary" @@ -33183,11 +33081,8 @@ Macho does not prove mucho. -- Zsa Zsa Gabor % -MAD: +Mad, adj.: Affected with a high degree of intellectual independence. -% -Mad, adj.: - Affected with a high degree of intellectual independence ... -- Ambrose Bierce, "The Devil's Dictionary" % Madam, there's no such thing as a tough child -- @@ -33234,23 +33129,14 @@ knowledge. -- Ambrose Bierce, "The Devil's Dictionary" % -MAGNOCARTIC: - Any automobile that, when left unattended, attracts shopping carts. - -- "Sniglets", Rich Hall & Friends -% -magnocartic, adj: +Magnocartic, adj: Any automobile that, when left unattended, attracts shopping carts. -- Rich Hall, "Sniglets" % -MAGPIE: +Magpie, n.: A bird whose thievish disposition suggested to someone that it might be taught to talk. - -- A. Bierce -% -Magpie, n.: - A bird whose thievish disposition suggested to someone that it -might be taught to talk. -- Ambrose Bierce, "The Devil's Dictionary" % MAIDEN AUNT: @@ -34327,22 +34213,15 @@ Nowadays it insists on it. -- Russell Baker % -MISFORTUNE: - The kind of fortune that never misses. -% Misfortune, n.: The kind of fortune that never misses. -- Ambrose Bierce, "The Devil's Dictionary" % Misfortunes arrive on wings and leave on foot. % -MISS: +Miss, n.: A title with which we brand unmarried women to indicate that they are in the market. -% -Miss, n.: - A title with which we brand unmarried women to indicate that -they are in the market. -- Ambrose Bierce, "The Devil's Dictionary" % Mistakes are often the stepping stones to utter failure. @@ -34462,19 +34341,12 @@ woke the bruiser, and Moishe, his heart in his mouth, rose to the occasion. "Feeling better now?" he asked solicitously. % -MOLECULE: +Molecule, n.: The ultimate, indivisible unit of matter. It is distinguished from the corpuscle, also the ultimate, indivisible unit of matter, by a closer resemblance to the atom, also the ultimate, indivisible unit of matter... The ion differs from the molecule, the corpuscle and the atom in that it is an ion... -% -Molecule, n.: - The ultimate, indivisible unit of matter. It is distinguished -from the corpuscle, also the ultimate, indivisible unit of matter, by a -closer resemblance to the atom, also the ultimate, indivisible unit of -matter ... The ion differs from the molecule, the corpuscle and the -atom in that it is an ion ... -- Ambrose Bierce, "The Devil's Dictionary" % Mollison's Bureaucracy Hypothesis: @@ -36723,9 +36595,6 @@ Dim Sum, n: Chinese for more food than you've ever seen in your entire life. % -November: - The eleventh twelfth of a weariness. -% November, n.: The eleventh twelfth of a weariness. -- Ambrose Bierce, "The Devil's Dictionary" @@ -37429,8 +37298,6 @@ Enough. -- Ambrose Bierce, "The Devil's Dictionary" % -Once, adv.: Enough. -% Once again dread deed is done. Canon sleeps, his all-knowing eye shaded @@ -43162,14 +43029,9 @@ % Slowly and surely the unix crept up on the Nintendo user ... % -SLURM: - The slime that accumulates on the underside of a soap bar when it - sits in the dish too long. - -- "Sniglets", Rich Hall & Friends -% Slurm, n.: The slime that accumulates on the underside of a soap bar when -it sits in the dish too long. + it sits in the dish too long. -- Rich Hall, "Sniglets" % Small change can often be found under seat cushions. @@ -43208,16 +43070,10 @@ Smuggling... It's not just a job, it's an adventure! -- paid for by your local Colombian recruiting office % -SNACKTREK: +Snacktrek, n.: The peculiar habit, when searching for a snack, of constantly returning to the refrigerator in hopes that something new will have materialized. - -- "Sniglets", Rich Hall & Friends -% -Snacktrek, n.: - The peculiar habit, when searching for a snack, of constantly -returning to the refrigerator in hopes that something new will have -materialized. -- Rich Hall, "Sniglets" % Snakes. Why did it have to be snakes? @@ -53458,9 +53314,6 @@ % Truth will be out this morning. (Which may really mess things up.) % -TRUTHFUL: - Dumb and illiterate. -% Truthful, adj.: Dumb and illiterate. -- Ambrose Bierce, "The Devil's Dictionary" @@ -58053,13 +57906,9 @@ Wishing without work is like fishing without bait. -- Frank Tyger % -WIT: +Wit, n.: The salt with which the American Humorist spoils his cookery... by leaving it out. -% -Wit, n.: - The salt with which the American Humorist spoils his cookery -... by leaving it out. -- Ambrose Bierce, "The Devil's Dictionary" % With a gentleman I try to be a gentleman and a half, and with a fraud I @@ -59038,14 +58887,9 @@ Yield to Temptation ... it may not pass your way again. -- Lazarus Long, "Time Enough for Love" % -YINKEL: +Yinkel, n.: A person who combs his hair over his bald spot, hoping no one will notice. - -- "Sniglets", Rich Hall & Friends -% -Yinkel, n.: - A person who combs his hair over his bald spot, hoping no one -will notice. -- Rich Hall, "Sniglets" % You ain't learning nothing when you're talking. ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#21 (text+ko) ==== @@ -136,7 +136,7 @@ #define MALLOC_DEBUG #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.101 2006/01/20 03:11:11 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.103 2006/01/23 03:32:38 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -2980,7 +2980,7 @@ static region_t * arena_chunk_reg_alloc(arena_t *arena, size_t size, bool fit) { - region_t *ret, *next; + region_t *ret; chunk_node_t *chunk; chunk = chunk_alloc(chunk_size); @@ -3014,12 +3014,29 @@ region_prev_free_unset(&ret->sep); region_next_free_unset(&ret->sep); - /* Create a separator at the end of this new region. */ - next = (region_t *)&((char *)ret)[region_next_size_get(&ret->sep)]; - region_next_size_set(&next->sep, 0); - region_prev_free_unset(&next->sep); - region_next_free_unset(&next->sep); - region_next_contig_unset(&next->sep); + /* + * Avoiding the following when possible is worthwhile, because it + * avoids touching a page that for many applications would never be + * touched otherwise. + */ +#ifdef USE_BRK + if ((uintptr_t)ret >= (uintptr_t)brk_base + && (uintptr_t)ret < (uintptr_t)brk_max) { + region_t *next; + + /* + * This may be a re-used brk chunk, so we have no guarantee + * that the memory is zero-filled. Therefore manually create a + * separator at the end of this new region (all zero bits). + */ + next = (region_t *)&((char *)ret)[region_next_size_get( + &ret->sep)]; + region_next_size_set(&next->sep, 0); + region_prev_free_unset(&next->sep); + region_next_free_unset(&next->sep); + region_next_contig_unset(&next->sep); + } +#endif if (fit) arena_reg_fit(arena, size, ret, (arena->split == NULL)); @@ -4348,12 +4365,12 @@ opt_abort = true; break; case 'c': - opt_ndelay <<= 1; + opt_ndelay >>= 1; if (opt_ndelay == 0) opt_ndelay = 1; break; case 'C': - opt_ndelay >>= 1; + opt_ndelay <<= 1; if (opt_ndelay == 0) opt_ndelay = 1; break; ==== //depot/projects/hammer/lib/libc/sys/rename.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rename.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.22 2004/07/02 23:52:13 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rename.2,v 1.24 2006/01/22 19:49:37 truckman Exp $ .\" .Dd June 4, 1993 .Dt RENAME 2 ==== //depot/projects/hammer/lib/libc/sys/rmdir.2#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/rmdir.2,v 1.13 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/rmdir.2,v 1.15 2006/01/22 19:49:37 truckman Exp $ .\" -.Dd June 4, 1993 +.Dd January 22, 2006 .Dt RMDIR 2 .Os .Sh NAME @@ -85,6 +85,11 @@ The directory containing the directory to be removed is marked sticky, and neither the containing directory nor the directory to be removed are owned by the effective user ID. +.It Bq Er EINVAL +The last component of the path is +.Ql .\& +or +.Ql .. . .It Bq Er EBUSY The directory to be removed is the mount point for a mounted file system. ==== //depot/projects/hammer/lib/libc/sys/undelete.2#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)undelete.2 8.4 (Berkeley) 10/18/94 -.\" $FreeBSD: src/lib/libc/sys/undelete.2,v 1.15 2002/12/19 09:40:25 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/undelete.2,v 1.17 2006/01/22 19:49:37 truckman Exp $ .\" -.Dd October 18, 1994 +.Dd January 22, 2006 .Dt UNDELETE 2 .Os .Sh NAME @@ -86,6 +86,9 @@ .It Bq Er EPERM The directory containing the name is marked sticky, and the containing directory is not owned by the effective user ID. +.It Bq Er EINVAL +The last component of the path is +.Ql .. . .It Bq Er EIO An I/O error occurred while updating the directory entry. .It Bq Er EROFS ==== //depot/projects/hammer/lib/libthr/thread/thr_info.c#5 (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/libthr/thread/thr_info.c,v 1.5 2006/01/09 08:07:22 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_info.c,v 1.6 2006/01/23 06:11:23 davidxu Exp $ */ #include @@ -38,6 +38,8 @@ #include "thr_private.h" +__weak_reference(_pthread_set_name_np, pthread_set_name_np); + /* Set the thread name for debug. */ void _pthread_set_name_np(pthread_t thread, char *name) ==== //depot/projects/hammer/libexec/ftpd/ftpd.8#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.69 2005/01/18 09:29:39 ru Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.70 2006/01/21 12:21:41 yar Exp $ .\" .Dd January 27, 2000 .Dt FTPD 8 @@ -144,7 +144,9 @@ When .Fl D is specified, write the daemon's process ID to -.Ar file . +.Ar file +instead of the default pid file, +.Pa /var/run/ftpd.pid . .It Fl R With this option set, .Nm @@ -519,7 +521,7 @@ .Pa ~/bin directory exist. .Sh FILES -.Bl -tag -width ".Pa /var/log/xferlog" -compact +.Bl -tag -width ".Pa /var/run/ftpd.pid" -compact .It Pa /etc/ftpusers List of unwelcome/restricted users. .It Pa /etc/ftpchroot @@ -530,6 +532,8 @@ Welcome notice. .It Pa /etc/ftpmotd Welcome notice after login. +.It Pa /var/run/ftpd.pid +Default pid file for daemon mode. .It Pa /var/run/nologin Displayed and access refused. .It Pa /var/log/ftpd ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#28 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 23 20:55:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EB6A16A422; Mon, 23 Jan 2006 20:55:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 BFB6F16A41F for ; Mon, 23 Jan 2006 20:55:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D91643D55 for ; Mon, 23 Jan 2006 20:55:23 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0NKtNCO093452 for ; Mon, 23 Jan 2006 20:55:23 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NKtMf2093449 for perforce@freebsd.org; Mon, 23 Jan 2006 20:55:22 GMT (envelope-from peter@freebsd.org) Date: Mon, 23 Jan 2006 20:55:22 GMT Message-Id: <200601232055.k0NKtMf2093449@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 Cc: Subject: PERFORCE change 90237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 20:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=90237 Change 90237 by peter@peter_daintree on 2006/01/23 20:55:11 Integ -b i386_hammer (minus mem.c) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#36 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#49 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#64 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#149 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#114 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#85 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#87 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#92 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#40 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/bus.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#19 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#21 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#34 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#25 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#24 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#58 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#31 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#54 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#23 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#56 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#24 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#33 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#25 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#37 (text+ko) ==== @@ -188,11 +188,7 @@ jmp doreti /* - * Executed by a CPU when it receives an Xcpustop IPI from another CPU, - * - * - Signals its receipt. - * - Waits for permission to restart. - * - Signals its restart. + * Executed by a CPU when it receives an IPI_STOP from another CPU. */ .text SUPERALIGN_TEXT ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#39 (text+ko) ==== @@ -28,6 +28,9 @@ __FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $"); #include +#include +#include +#include #include #include #include ==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#36 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#36 (text+ko) ==== @@ -192,6 +192,7 @@ #define TRAP 1 #define INTERRUPT 2 #define SYSCALL 3 +#define TRAP_INTERRUPT 5 static void db_nextframe(struct amd64_frame **, db_addr_t *, struct thread *); static int db_numargs(struct amd64_frame *); @@ -326,6 +327,12 @@ frame_type = INTERRUPT; else if (strcmp(name, "Xfast_syscall") == 0) frame_type = SYSCALL; + /* XXX: These are interrupts with trap frames. */ + else if (strcmp(name, "Xtimerint") == 0 || + strcmp(name, "Xcpustop") == 0 || + strcmp(name, "Xrendezvous") == 0 || + strcmp(name, "Xipi_intr_bitmap_handler") == 0) + frame_type = TRAP_INTERRUPT; } /* @@ -357,6 +364,7 @@ db_printf("--- syscall"); decode_syscall(tf->tf_rax, td); break; + case TRAP_INTERRUPT: case INTERRUPT: db_printf("--- interrupt"); break; ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#35 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#45 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#30 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/genassym.c#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#49 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#44 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#64 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#149 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#114 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#26 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#85 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#87 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#92 (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.1214) +# (XXX from i386:NOTES,v 1.1217) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.51 2005/12/03 01:23:49 anholt Exp $ # @@ -220,6 +220,7 @@ # # ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# cs: IBM Etherjet and other Crystal Semi CS89x0-based adapters # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) # (requires miibus) @@ -227,6 +228,9 @@ # Am79C960) # nve: nVidia nForce MCP on-board Ethernet Networking +device cs +hint.cs.0.at="isa" +hint.cs.0.port="0x300" device ed options ED_3C503 options ED_HPP ==== //depot/projects/hammer/sys/amd64/include/_types.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#40 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/asmacros.h#13 (text+ko) ==== @@ -130,7 +130,7 @@ #ifdef LOCORE /* - * Convenience macros for declaring interrupt entry points. + * Convenience macro for declaring interrupt entry points. */ #define IDTVEC(name) ALIGN_TEXT; .globl __CONCAT(X,name); \ .type __CONCAT(X,name),@function; __CONCAT(X,name): ==== //depot/projects/hammer/sys/amd64/include/bus.h#15 (text+ko) ==== @@ -1004,6 +1004,17 @@ #endif } +#ifdef BUS_SPACE_NO_LEGACY +#undef inb +#undef outb +#define inb(a) compiler_error +#define inw(a) compiler_error +#define inl(a) compiler_error +#define outb(a, b) compiler_error +#define outw(a, b) compiler_error +#define outl(a, b) compiler_error +#endif + #include /* ==== //depot/projects/hammer/sys/amd64/include/clock.h#20 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpu.h#19 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/frame.h#17 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/param.h#34 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcb.h#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pmap.h#58 (text+ko) ==== @@ -176,7 +176,7 @@ * the corresponding pde that in turn maps it. */ pt_entry_t *vtopte(vm_offset_t); -#define vtophys(va) pmap_kextract((vm_offset_t)(va)) +#define vtophys(va) pmap_kextract(((vm_offset_t) (va))) static __inline pt_entry_t pte_load(pt_entry_t *ptep) ==== //depot/projects/hammer/sys/amd64/include/smp.h#31 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#54 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#23 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#56 (text+ko) ==== @@ -286,16 +286,6 @@ return; } #ifdef DELAYDEBUG - sched_pin(); - start = rdtsc(); - end = start + (tsc_freq * n) / 1000000; - do { - now = rdtsc(); - } while (now < end || (now > start && end < start)); - sched_unpin(); - return; - } -#ifdef DELAYDEBUG if (state == 0) { state = 1; for (n1 = 1; n1 <= 10000000; n1 *= 10) ==== //depot/projects/hammer/sys/amd64/isa/icu.h#24 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#33 (text+ko) ==== @@ -326,10 +326,10 @@ { 0, 0 } }; -static devclass_t pcib_devclass; +static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); -DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, pcib_devclass, 0, 0); +DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); /* ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#25 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 23 21:39:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6531316A424; Mon, 23 Jan 2006 21:39:20 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0C97316A420 for ; Mon, 23 Jan 2006 21:39:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E2DC43D78 for ; Mon, 23 Jan 2006 21:39:18 +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.13.1/8.13.1) with ESMTP id k0NLdIuJ096127 for ; Mon, 23 Jan 2006 21:39:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NLdIxl096124 for perforce@freebsd.org; Mon, 23 Jan 2006 21:39:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Jan 2006 21:39:18 GMT Message-Id: <200601232139.k0NLdIxl096124@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 Cc: Subject: PERFORCE change 90242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 21:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=90242 Change 90242 by rwatson@rwatson_peppercorn on 2006/01/23 21:38:52 Reduce all passed files, not just the first one many times. Submitted by: Wojciech A. Koszek Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#6 (text+ko) ==== @@ -545,6 +545,7 @@ char *objval, *converr; char ch; char timestr[128]; + char *fname; converr = NULL; @@ -698,12 +699,14 @@ /* * XXX: We should actually be merging records here */ - for (i = 0;i < argc; i++) { - fp = fopen(*argv, "r"); + for (i = 0; i < argc; i++) { + fname = argv[i]; + fp = fopen(fname, "r"); if (fp == NULL) - errx(EXIT_FAILURE, "Couldn't open %s", *argv); + errx(EXIT_FAILURE, "Couldn't open %s", fname); if (select_records(fp) == -1) { - errx(EXIT_FAILURE, "Couldn't select records %s", *argv); + errx(EXIT_FAILURE, "Couldn't select records %s", + fname); } fclose(fp); } From owner-p4-projects@FreeBSD.ORG Mon Jan 23 22:00:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E71116A424; Mon, 23 Jan 2006 22:00:01 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 94B4216A420 for ; Mon, 23 Jan 2006 22:00:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39B4F43D5A for ; Mon, 23 Jan 2006 21:59:58 +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.13.1/8.13.1) with ESMTP id k0NLxwKA097056 for ; Mon, 23 Jan 2006 21:59:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NLxvDE097053 for perforce@freebsd.org; Mon, 23 Jan 2006 21:59:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Jan 2006 21:59:57 GMT Message-Id: <200601232159.k0NLxvDE097053@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 Cc: Subject: PERFORCE change 90245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 22:00:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=90245 Change 90245 by rwatson@rwatson_peppercorn on 2006/01/23 21:59:54 Converge on style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#7 (text+ko) ==== @@ -50,33 +50,32 @@ #include "auditreduce.h" +extern char *optarg; +extern int optind, optopt, opterr,optreset; -extern char *optarg; -extern int optind, optopt, opterr,optreset; +static au_mask_t maskp; /* Class. */ +static time_t p_atime; /* Created after this time. */ +static time_t p_btime; /* Created before this time. */ +static uint16_t p_evtype; /* Event that we are searching for. */ +static int p_auid; /* Audit id. */ +static int p_euid; /* Effective user id. */ +static int p_egid; /* Effective group id. */ +static int p_rgid; /* Real group id. */ +static int p_ruid; /* Real user id. */ +static int p_subid; /* Subject id. */ -static au_mask_t maskp; /* Used while selecting based on class */ -static time_t p_atime;/* select records created after this time */ -static time_t p_btime;/* select records created before this time */ -static uint16_t p_evtype; /* The event that we are searching for */ -static int p_auid; /* audit id */ -static int p_euid; /* effective user id */ -static int p_egid; /* effective group id */ -static int p_rgid; /* real group id */ -static int p_ruid; /* real user id */ -static int p_subid; /* subject id */ - -/* Following are the objects (-o option) that we can select upon */ -static char *p_fileobj = NULL; -static char *p_msgqobj = NULL; -static char *p_pidobj = NULL; -static char *p_semobj = NULL; -static char *p_shmobj = NULL; -static char *p_sockobj = NULL; +/* + * Following are the objects (-o option) that we can select upon. + */ +static char *p_fileobj = NULL; +static char *p_msgqobj = NULL; +static char *p_pidobj = NULL; +static char *p_semobj = NULL; +static char *p_shmobj = NULL; +static char *p_sockobj = NULL; - static uint32_t opttochk = 0; - static void usage(const char *msg) { @@ -105,179 +104,177 @@ } /* - * Check if the given auid matches the selection criteria + * Check if the given auid matches the selection criteria. */ -static int select_auid(int au) +static int +select_auid(int au) { - /* check if we want to select on auid */ - if(ISOPTSET(opttochk, OPT_u)) { - if(au != p_auid) { - return 0; - } + + /* Check if we want to select on auid. */ + if (ISOPTSET(opttochk, OPT_u)) { + if (au != p_auid) + return (0); } - return 1; + return (1); } /* - * Check if the given euid matches the selection criteria + * Check if the given euid matches the selection criteria. */ -static int select_euid(int euser) +static int +select_euid(int euser) { - /* check if we want to select on euid */ - if(ISOPTSET(opttochk, OPT_e)) { - if(euser != p_euid) { - return 0; - } + + /* Check if we want to select on euid. */ + if (ISOPTSET(opttochk, OPT_e)) { + if (euser != p_euid) + return (0); } - return 1; + return (1); } /* - * Check if the given egid matches the selection criteria + * Check if the given egid matches the selection criteria. */ -static int select_egid(int egrp) +static int +select_egid(int egrp) { - /* check if we want to select on egid */ - if(ISOPTSET(opttochk, OPT_f)) { - if(egrp != p_egid) { - return 0; - } + + /* Check if we want to select on egid. */ + if (ISOPTSET(opttochk, OPT_f)) { + if (egrp != p_egid) + return (0); } - return 1; + return (1); } /* - * Check if the given rgid matches the selection criteria + * Check if the given rgid matches the selection criteria. */ -static int select_rgid(int grp) +static int +select_rgid(int grp) { - /* check if we want to select on rgid */ - if(ISOPTSET(opttochk, OPT_g)) { - if(grp != p_rgid) { - return 0; - } + + /* Check if we want to select on rgid. */ + if (ISOPTSET(opttochk, OPT_g)) { + if (grp != p_rgid) + return (0); } - return 1; + return (1); } /* - * Check if the given ruid matches the selection criteria + * Check if the given ruid matches the selection criteria. */ -static int select_ruid(int user) +static int +select_ruid(int user) { - /* check if we want to select on rgid */ - if(ISOPTSET(opttochk, OPT_r)) { - if(user != p_ruid) { - return 0; - } + + /* Check if we want to select on rgid. */ + if (ISOPTSET(opttochk, OPT_r)) { + if (user != p_ruid) + return (0); } - return 1; + return (1); } /* - * Check if the given subject id (pid) matches the selection criteria + * Check if the given subject id (pid) matches the selection criteria. */ -static int select_subid(int subid) +static int +select_subid(int subid) { - /* check if we want to select on subject uid */ - if(ISOPTSET(opttochk, OPT_j)) { - if(subid != p_subid) { - return 0; - } + + /* Check if we want to select on subject uid. */ + if (ISOPTSET(opttochk, OPT_j)) { + if (subid != p_subid) + return (0); } - return 1; + return (1); } /* - * Check if object's pid maches the given pid + * Check if object's pid maches the given pid. */ -static int select_pidobj(uint32_t pid) +static int +select_pidobj(uint32_t pid) { - if(ISOPTSET(opttochk, OPT_op)) { - if(pid != strtol(p_pidobj, (char **)NULL, 10)) { - return 0; - } + + if (ISOPTSET(opttochk, OPT_op)) { + if (pid != strtol(p_pidobj, (char **)NULL, 10)) + return (0); } - return 1; + return (1); } /* - * Check if the given ipc object with the given type matches the - * selection criteria + * Check if the given ipc object with the given type matches the selection + * criteria. */ -static int select_ipcobj(u_char type, uint32_t id, uint32_t *optchkd) +static int +select_ipcobj(u_char type, uint32_t id, uint32_t *optchkd) { - if(type == AT_IPC_MSG) { + + if (type == AT_IPC_MSG) { SETOPT((*optchkd), OPT_om); - if(ISOPTSET(opttochk, OPT_om)) { - if(id != strtol(p_msgqobj, (char **)NULL, 10)) { - return 0; - } + if (ISOPTSET(opttochk, OPT_om)) { + if (id != strtol(p_msgqobj, (char **)NULL, 10)) + return (0); } - return 1; - } - else if(type == AT_IPC_SEM) { + return (1); + } else if (type == AT_IPC_SEM) { SETOPT((*optchkd), OPT_ose); - if(ISOPTSET(opttochk, OPT_ose)) { - if(id != strtol(p_semobj, (char **)NULL, 10)) { - return 0; - } + if (ISOPTSET(opttochk, OPT_ose)) { + if (id != strtol(p_semobj, (char **)NULL, 10)) + return (0); } - return 1; - } - else if (type == AT_IPC_SHM) { + return (1); + } else if (type == AT_IPC_SHM) { SETOPT((*optchkd), OPT_osh); - if(ISOPTSET(opttochk, OPT_osh)) { - if(id != strtol(p_shmobj, (char **)NULL, 10)) { - return 0; - } + if (ISOPTSET(opttochk, OPT_osh)) { + if (id != strtol(p_shmobj, (char **)NULL, 10)) + return (0); } - return 1; + return (1); } - /* unknown type -- filter if *any* ipc filtering is required */ - if(ISOPTSET(opttochk, OPT_om) - || ISOPTSET(opttochk, OPT_ose) - || ISOPTSET(opttochk, OPT_osh)) { - return 0; - } + /* Unknown type -- filter if *any* ipc filtering is required. */ + if (ISOPTSET(opttochk, OPT_om) || ISOPTSET(opttochk, OPT_ose) + || ISOPTSET(opttochk, OPT_osh)) + return (0); - return 1; + return (1); } /* - * Check if the file name matches selection criteria + * Check if the file name matches selection criteria. */ -static int select_filepath(char *path, uint32_t *optchkd) +static int +select_filepath(char *path, uint32_t *optchkd) { char *loc; SETOPT((*optchkd), OPT_of); - if(ISOPTSET(opttochk, OPT_of)) { - if(p_fileobj[0] == '~') { - /* object should not be in path */ + if (ISOPTSET(opttochk, OPT_of)) { + if (p_fileobj[0] == '~') { + /* Object should not be in path. */ loc = strstr(path, p_fileobj + 1); - if((loc != NULL) && (loc == path)) { - return 0; - } - } - else { - /* object should be in path */ + if ((loc != NULL) && (loc == path)) + return (0); + } else { + /* Object should be in path. */ loc = strstr(path, p_fileobj); - if((loc == NULL) || (loc != path)) { - return 0; - } + if ((loc == NULL) || (loc != path)) + return (0); } } - return 1; + return (1); } - - /* - * Returns 1 if the following pass the selection rules: + * Returns 1 if the following pass the selection rules: * * before-time, * after time, @@ -285,44 +282,46 @@ * class, * event */ -static int select_hdr32(tokenstr_t tok, uint32_t *optchkd) +static int +select_hdr32(tokenstr_t tok, uint32_t *optchkd) { + SETOPT((*optchkd), (OPT_A | OPT_a | OPT_b | OPT_c | OPT_m)); - /* The A option overrides a,b and d */ - if(!ISOPTSET(opttochk, OPT_A)) { - if(ISOPTSET(opttochk, OPT_a)) { + /* The A option overrides a, b and d. */ + if (!ISOPTSET(opttochk, OPT_A)) { + if (ISOPTSET(opttochk, OPT_a)) { if (difftime((time_t)tok.tt.hdr32.s, p_atime) < 0) { - /* record was created before p_atime */ - return 0; + /* Record was created before p_atime. */ + return (0); } } - if(ISOPTSET(opttochk, OPT_b)) { + if (ISOPTSET(opttochk, OPT_b)) { if (difftime(p_btime, (time_t)tok.tt.hdr32.s) < 0) { - /* record was created after p_btime */ - return 0; + /* Record was created after p_btime. */ + return (0); } } } - if(ISOPTSET(opttochk, OPT_c)) { - - /* check if the classes represented by the event matches given class */ - if(au_preselect(tok.tt.hdr32.e_type, &maskp, - AU_PRS_BOTH, AU_PRS_USECACHE) != 1) { - return 0; - } + if (ISOPTSET(opttochk, OPT_c)) { + /* + * Check if the classes represented by the event matches + * given class. + */ + if (au_preselect(tok.tt.hdr32.e_type, &maskp, AU_PRS_BOTH, + AU_PRS_USECACHE) != 1) + return (0); } - /* check if event matches */ - if(ISOPTSET(opttochk, OPT_m)) { - if(tok.tt.hdr32.e_type != p_evtype) { - return 0; - } + /* Check if event matches. */ + if (ISOPTSET(opttochk, OPT_m)) { + if (tok.tt.hdr32.e_type != p_evtype) + return (0); } - return 1; + return (1); } /* @@ -334,31 +333,25 @@ * ruid, * process id */ -static int select_proc32(tokenstr_t tok, uint32_t *optchkd) +static int +select_proc32(tokenstr_t tok, uint32_t *optchkd) { + SETOPT((*optchkd), (OPT_u | OPT_e | OPT_f | OPT_g | OPT_r | OPT_op)); - if( !select_auid(tok.tt.proc32.auid)) { - return 0; - } - if( !select_euid(tok.tt.proc32.euid)) { - return 0; - } - if( !select_egid(tok.tt.proc32.egid)) { - return 0; - } - if( !select_rgid(tok.tt.proc32.rgid)) { - return 0; - } - if( !select_ruid(tok.tt.proc32.ruid)) { - return 0; - } - - if( !select_pidobj(tok.tt.proc32.pid)) { - return 0; - } - - return 1; + if (!select_auid(tok.tt.proc32.auid)) + return (0); + if (!select_euid(tok.tt.proc32.euid)) + return (0); + if (!select_egid(tok.tt.proc32.egid)) + return (0); + if (!select_rgid(tok.tt.proc32.rgid)) + return (0); + if (!select_ruid(tok.tt.proc32.ruid)) + return (0); + if (!select_pidobj(tok.tt.proc32.pid)) + return (0); + return (1); } /* @@ -370,36 +363,33 @@ * ruid, * subject id */ -static int select_subj32(tokenstr_t tok, uint32_t *optchkd) +static int +select_subj32(tokenstr_t tok, uint32_t *optchkd) { + SETOPT((*optchkd), (OPT_u | OPT_e | OPT_f | OPT_g | OPT_r | OPT_j)); - if( !select_auid(tok.tt.subj32.auid)) { - return 0; - } - if( !select_euid(tok.tt.subj32.euid)) { - return 0; - } - if( !select_egid(tok.tt.subj32.egid)) { - return 0; - } - if( !select_rgid(tok.tt.subj32.rgid)) { - return 0; - } - if( !select_ruid(tok.tt.subj32.ruid)) { - return 0; - } - if( !select_subid(tok.tt.subj32.pid)) { - return 0; - } - return 1; + if (!select_auid(tok.tt.subj32.auid)) + return (0); + if (!select_euid(tok.tt.subj32.euid)) + return (0); + if (!select_egid(tok.tt.subj32.egid)) + return (0); + if (!select_rgid(tok.tt.subj32.rgid)) + return (0); + if (!select_ruid(tok.tt.subj32.ruid)) + return (0); + if (!select_subid(tok.tt.subj32.pid)) + return (0); + return (1); } /* - * Read each record from the audit trail. - * Check if it is selected after passing through each of the options + * Read each record from the audit trail. Check if it is selected after + * passing through each of the options */ -static int select_records(FILE *fp) +static int +select_records(FILE *fp) { u_char *buf; tokenstr_t tok; @@ -409,130 +399,123 @@ uint32_t optchkd; int err = 0; - - while((reclen = au_read_rec(fp, &buf)) != -1) { - + while ((reclen = au_read_rec(fp, &buf)) != -1) { optchkd = 0; bytesread = 0; selected = 1; - while ((selected == 1) && (bytesread < reclen)) { - - if(-1 == au_fetch_tok(&tok, buf + bytesread, reclen - bytesread)) { - /* is this an incomplete record ? */ + if (-1 == au_fetch_tok(&tok, buf + bytesread, + reclen - bytesread)) { + /* Is this an incomplete record? */ err = 1; break; } - /* For each token type we have have different selection criteria */ + /* + * For each token type we have have different + * selection criteria. + */ switch(tok.id) { - case AU_HEADER_32_TOKEN : - selected = select_hdr32(tok, &optchkd); - break; + case AU_HEADER_32_TOKEN: + selected = select_hdr32(tok, + &optchkd); + break; - case AU_PROCESS_32_TOKEN : - selected = select_proc32(tok, &optchkd); - break; + case AU_PROCESS_32_TOKEN: + selected = select_proc32(tok, + &optchkd); + break; - case AU_SUBJECT_32_TOKEN : - selected = select_subj32(tok, &optchkd); - break; + case AU_SUBJECT_32_TOKEN: + selected = select_subj32(tok, + &optchkd); + break; - case AU_IPC_TOKEN : - selected = select_ipcobj(tok.tt.ipc.type, tok.tt.ipc.id, &optchkd); - break; + case AU_IPC_TOKEN: + selected = select_ipcobj( + tok.tt.ipc.type, tok.tt.ipc.id, + &optchkd); + break; - case AU_FILE_TOKEN : - selected = select_filepath(tok.tt.file.name, &optchkd); - break; + case AU_FILE_TOKEN: + selected = select_filepath( + tok.tt.file.name, &optchkd); + break; - case AU_PATH_TOKEN : - selected = select_filepath(tok.tt.path.path, &optchkd); - break; + case AU_PATH_TOKEN: + selected = select_filepath( + tok.tt.path.path, &optchkd); + break; - /* - * The following tokens dont have any relevant attributes - * that we can select upon - */ - case AU_TRAILER_TOKEN : - case AU_ARG32_TOKEN : - case AU_ATTR32_TOKEN : - case AU_EXIT_TOKEN : - case AU_NEWGROUPS_TOKEN : - case AU_IN_ADDR_TOKEN : - case AU_IP_TOKEN : - case AU_IPCPERM_TOKEN : - case AU_IPORT_TOKEN : - case AU_OPAQUE_TOKEN : - case AU_RETURN_32_TOKEN : - case AU_SEQ_TOKEN : - case AU_TEXT_TOKEN : - case AU_ARB_TOKEN : - case AU_SOCK_TOKEN : - default: - break; + /* + * The following tokens dont have any relevant + * attributes that we can select upon. + */ + case AU_TRAILER_TOKEN: + case AU_ARG32_TOKEN: + case AU_ATTR32_TOKEN: + case AU_EXIT_TOKEN: + case AU_NEWGROUPS_TOKEN: + case AU_IN_ADDR_TOKEN: + case AU_IP_TOKEN: + case AU_IPCPERM_TOKEN: + case AU_IPORT_TOKEN: + case AU_OPAQUE_TOKEN: + case AU_RETURN_32_TOKEN: + case AU_SEQ_TOKEN: + case AU_TEXT_TOKEN: + case AU_ARB_TOKEN: + case AU_SOCK_TOKEN: + default: + break; } - bytesread += tok.len; } - - if((selected == 1) && (!err)) { - - /* check if all the options were matched */ - if(!(opttochk & ~optchkd)) { - /* XXX write this record to the output file */ - + if ((selected == 1) && (!err)) { + /* Check if all the options were matched. */ + if (!(opttochk & ~optchkd)) { + /* XXX Write this record to the output file. */ /* default to stdout */ fwrite(buf, 1, reclen, stdout); } } - free(buf); } - - return 0; + return (0); } - /* - * The -o option has the form object_type=object_value - * Identify the object components + * The -o option has the form object_type=object_value. Identify the object + * components. */ -void parse_object_type(char *name, char *val) +void +parse_object_type(char *name, char *val) { - if(val == NULL) + if (val == NULL) return; - if(!strcmp(name, FILEOBJ)) { + if (!strcmp(name, FILEOBJ)) { p_fileobj = val; SETOPT(opttochk, OPT_of); - } - else if( !strcmp(name, MSGQIDOBJ)) { + } else if (!strcmp(name, MSGQIDOBJ)) { p_msgqobj = val; SETOPT(opttochk, OPT_om); - } - else if( !strcmp(name, PIDOBJ)) { + } else if (!strcmp(name, PIDOBJ)) { p_pidobj = val; SETOPT(opttochk, OPT_op); - } - else if( !strcmp(name, SEMIDOBJ)) { + } else if (!strcmp(name, SEMIDOBJ)) { p_semobj = val; SETOPT(opttochk, OPT_ose); - } - else if( !strcmp(name, SHMIDOBJ)) { + } else if (!strcmp(name, SHMIDOBJ)) { p_shmobj = val; SETOPT(opttochk, OPT_osh); - } - else if( !strcmp(name, SOCKOBJ)) { + } else if (!strcmp(name, SOCKOBJ)) { p_sockobj = val; SETOPT(opttochk, OPT_oso); - } - else { + } else usage("unknown value for -o"); - } } - int main(int argc, char **argv) { @@ -554,28 +537,33 @@ case 'A': SETOPT(opttochk, OPT_A); break; + case 'a': if (ISOPTSET(opttochk, OPT_a)) { usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_a); strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", + &tm); + /* fprintf(stderr, "Time converted = %s\n", timestr); */ p_atime = mktime(&tm); break; + case 'b': if (ISOPTSET(opttochk, OPT_b)) { usage("d is exclusive with a and b"); } SETOPT(opttochk, OPT_b); strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", + &tm); + /* fprintf(stderr, "Time converted = %s\n", timestr); */ p_btime = mktime(&tm); break; + case 'c': - if(0 != getauditflagsbin(optarg, &maskp)) { + if (0 != getauditflagsbin(optarg, &maskp)) { /* Incorrect class */ usage("Incorrect class"); } @@ -583,20 +571,19 @@ break; case 'd': - if (ISOPTSET(opttochk, OPT_b) || ISOPTSET(opttochk, OPT_a)) { + if (ISOPTSET(opttochk, OPT_b) || ISOPTSET(opttochk, + OPT_a)) usage("'d' is exclusive with 'a' and 'b'"); - } SETOPT(opttochk, OPT_d); strptime(optarg, "%Y%m%d", &tm); strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); + /* fprintf(stderr, "Time converted = %s\n", timestr); */ p_atime = mktime(&tm); - tm.tm_hour = 23; tm.tm_min = 59; tm.tm_sec = 59; strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); + /* fprintf(stderr, "Time converted = %s\n", timestr); */ p_btime = mktime(&tm); break; @@ -604,9 +591,8 @@ p_euid = strtol(optarg, &converr, 10); if (*converr != '\0') { /* Try the actual name */ - if ((pw = getpwnam(optarg)) == NULL) { + if ((pw = getpwnam(optarg)) == NULL) break; - } p_euid = pw->pw_uid; } SETOPT(opttochk, OPT_e); @@ -615,10 +601,9 @@ case 'f': p_egid = strtol(optarg, &converr, 10); if (*converr != '\0') { - /* try actual group name */ - if ((grp = getgrnam(optarg)) == NULL) { + /* Try actual group name. */ + if ((grp = getgrnam(optarg)) == NULL) break; - } p_egid = grp->gr_gid; } SETOPT(opttochk, OPT_f); @@ -627,10 +612,9 @@ case 'g': p_rgid = strtol(optarg, &converr, 10); if (*converr != '\0') { - /* try actual group name */ - if ((grp = getgrnam(optarg)) == NULL) { + /* Try actual group name. */ + if ((grp = getgrnam(optarg)) == NULL) break; - } p_rgid = grp->gr_gid; } SETOPT(opttochk, OPT_g); @@ -644,11 +628,10 @@ case 'm': p_evtype = strtol(optarg, (char **)NULL, 10); if (p_evtype == 0) { - /* Could be the string representation */ + /* Could be the string representation. */ n = getauevnonam(optarg); - if(n == NULL) { + if (n == NULL) usage("Incorrect event name"); - } p_evtype = *n; free(n); } @@ -667,9 +650,8 @@ case 'r': p_ruid = strtol(optarg, &converr, 10); if (*converr != '\0') { - if ((pw = getpwnam(optarg)) == NULL) { + if ((pw = getpwnam(optarg)) == NULL) break; - } p_ruid = pw->pw_uid; } SETOPT(opttochk, OPT_r); @@ -678,15 +660,15 @@ case 'u': p_auid = strtol(optarg, &converr, 10); if (*converr != '\0') { - if ((pw = getpwnam(optarg)) == NULL) { + if ((pw = getpwnam(optarg)) == NULL) break; - } p_auid = pw->pw_uid; } SETOPT(opttochk, OPT_u); break; + case '?': - default : + default: usage("Unknown option"); } } @@ -697,7 +679,7 @@ usage("Filename needed"); /* - * XXX: We should actually be merging records here + * XXX: We should actually be merging records here. */ for (i = 0; i < argc; i++) { fname = argv[i]; From owner-p4-projects@FreeBSD.ORG Mon Jan 23 22:05:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BB6C16A422; Mon, 23 Jan 2006 22:05:05 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2D4F016A41F for ; Mon, 23 Jan 2006 22:05:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA62D43D48 for ; Mon, 23 Jan 2006 22:05:04 +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.13.1/8.13.1) with ESMTP id k0NM5459097313 for ; Mon, 23 Jan 2006 22:05:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NM54C1097310 for perforce@freebsd.org; Mon, 23 Jan 2006 22:05:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Jan 2006 22:05:04 GMT Message-Id: <200601232205.k0NM54C1097310@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 Cc: Subject: PERFORCE change 90246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 22:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90246 Change 90246 by rwatson@rwatson_peppercorn on 2006/01/23 22:04:25 Converge towards style(9). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#3 (text+ko) ==== @@ -1,18 +1,18 @@ /* * Copyright (c) 2004, Apple Computer, Inc. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * + * from this software without specific prior written permission. + * * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -26,13 +26,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* - * Tool used to parse audit records conforming to the BSM structure - */ +/* + * Tool used to parse audit records conforming to the BSM structure. + */ /* * praudit [-lrs] [-ddel] [filenames] - */ + */ #include @@ -43,120 +43,112 @@ extern char *optarg; extern int optind, optopt, opterr,optreset; -static char *del = ","; /* default delimiter */ +static char *del = ","; /* Default delimiter. */ static int oneline = 0; static int raw = 0; static int shortfrm = 0; static int partial = 0; -static void usage() +static void +usage() { - printf("Usage: praudit [-lrs] [-ddel] [filenames]\n"); + + fprintf(stderr, "Usage: praudit [-lrs] [-ddel] [filenames]\n"); exit(1); } + /* - * token printing for each token type + * Token printing for each token type . */ -static int print_tokens(FILE *fp) +static int +print_tokens(FILE *fp) { u_char *buf; tokenstr_t tok; int reclen; int bytesread; - /* allow tail -f | praudit to work */ - if (partial) { - u_char type = 0; - /* record must begin with a header token */ - do { - type = fgetc(fp); - } while(type != AU_HEADER_32_TOKEN); - ungetc(type, fp); - } + /* Allow tail -f | praudit to work. */ + if (partial) { + u_char type = 0; + /* Record must begin with a header token. */ + do { + type = fgetc(fp); + } while(type != AU_HEADER_32_TOKEN); + ungetc(type, fp); + } - while((reclen = au_read_rec(fp, &buf)) != -1) { - + while ((reclen = au_read_rec(fp, &buf)) != -1) { bytesread = 0; - while (bytesread < reclen) { - - if(-1 == au_fetch_tok(&tok, buf + bytesread, reclen - bytesread)) { - /* is this an incomplete record ? */ + /* Is this an incomplete record? */ + if (-1 == au_fetch_tok(&tok, buf + bytesread, + reclen - bytesread)) break; - } - au_print_tok(stdout, &tok, del, raw, shortfrm); bytesread += tok.len; - - if(oneline) { + if (oneline) printf("%s", del); - } - else { + else printf("\n"); - } } - free(buf); - - if(oneline) { + if (oneline) printf("\n"); - } } - - return 0; + return (0); } -int main(int argc, char **argv) +int +main(int argc, char **argv) { char ch; int i; FILE *fp; - - while((ch = getopt(argc, argv, "lprsd:")) != -1) { + + while ((ch = getopt(argc, argv, "lprsd:")) != -1) { switch(ch) { + case 'l': + oneline = 1; + break; - case 'l': - oneline = 1; - break; + case 'r': + if (shortfrm) + usage(); /* Exclusive from shortfrm. */ + raw = 1; + break; - case 'r': - if(shortfrm) - usage(); /* exclusive from shortfrm */ - raw = 1; - break; + case 's': + if (raw) + usage(); /* Exclusive from raw. */ + shortfrm = 1; + break; - case 's': - if(raw) - usage(); /* exclusive from raw */ - shortfrm = 1; - break; + case 'd': + del = optarg; + break; - case 'd': - del = optarg; - break; + case 'p': + partial = 1; + break; - case 'p': - partial = 1; - break; - - case '?': - default : - usage(); + case '?': + default: + usage(); } } - /* For each of the files passed as arguments dump the contents */ - if(optind == argc) { + /* For each of the files passed as arguments dump the contents. */ + if (optind == argc) { print_tokens(stdin); - return 1; + return (1); } for (i = optind; i < argc; i++) { fp = fopen(argv[i], "r"); - if((fp == NULL) || (-1 == print_tokens(fp))) { + if ((fp == NULL) || (print_tokens(fp) == -1)) perror(argv[i]); - } - if(fp != NULL) - fclose(fp); + if (fp != NULL) + fclose(fp); } - return 1; + return (1); } From owner-p4-projects@FreeBSD.ORG Mon Jan 23 22:06:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C67B16A423; Mon, 23 Jan 2006 22:06:07 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3ECD616A41F for ; Mon, 23 Jan 2006 22:06:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 986AD43D48 for ; Mon, 23 Jan 2006 22:06:06 +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.13.1/8.13.1) with ESMTP id k0NM66xA097402 for ; Mon, 23 Jan 2006 22:06:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NM66Oq097399 for perforce@freebsd.org; Mon, 23 Jan 2006 22:06:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Jan 2006 22:06:06 GMT Message-Id: <200601232206.k0NM66Oq097399@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 Cc: Subject: PERFORCE change 90247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 22:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=90247 Change 90247 by rwatson@rwatson_peppercorn on 2006/01/23 22:05:39 Further style tweaks. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#4 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#4 (text+ko) ==== @@ -40,14 +40,14 @@ #include #include -extern char *optarg; -extern int optind, optopt, opterr,optreset; +extern char *optarg; +extern int optind, optopt, opterr,optreset; -static char *del = ","; /* Default delimiter. */ -static int oneline = 0; -static int raw = 0; -static int shortfrm = 0; -static int partial = 0; +static char *del = ","; /* Default delimiter. */ +static int oneline = 0; +static int raw = 0; +static int shortfrm = 0; +static int partial = 0; static void usage() @@ -66,7 +66,7 @@ u_char *buf; tokenstr_t tok; int reclen; - int bytesread; + int bytesread; /* Allow tail -f | praudit to work. */ if (partial) { @@ -104,7 +104,7 @@ { char ch; int i; - FILE *fp; + FILE *fp; while ((ch = getopt(argc, argv, "lprsd:")) != -1) { switch(ch) { From owner-p4-projects@FreeBSD.ORG Mon Jan 23 22:07:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26F8E16A422; Mon, 23 Jan 2006 22:07:09 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DF88E16A41F for ; Mon, 23 Jan 2006 22:07:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A50C143D46 for ; Mon, 23 Jan 2006 22:07:08 +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.13.1/8.13.1) with ESMTP id k0NM788M097521 for ; Mon, 23 Jan 2006 22:07:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0NM78Gx097518 for perforce@freebsd.org; Mon, 23 Jan 2006 22:07:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Jan 2006 22:07:08 GMT Message-Id: <200601232207.k0NM78Gx097518@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 Cc: Subject: PERFORCE change 90249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2006 22:07:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=90249 Change 90249 by rwatson@rwatson_peppercorn on 2006/01/23 22:06:33 Further minor style tweaks. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ /* * Tool used to merge and select audit records from audit trail files - */ + */ /* * XXX Currently we do not support merging of records from multiple @@ -313,7 +313,7 @@ if (au_preselect(tok.tt.hdr32.e_type, &maskp, AU_PRS_BOTH, AU_PRS_USECACHE) != 1) return (0); - } + } /* Check if event matches. */ if (ISOPTSET(opttochk, OPT_m)) { @@ -394,7 +394,7 @@ u_char *buf; tokenstr_t tok; int reclen; - int bytesread; + int bytesread; int selected; uint32_t optchkd; @@ -523,7 +523,7 @@ struct passwd *pw; struct tm tm; au_event_t *n; - FILE *fp; + FILE *fp; int i; char *objval, *converr; char ch; From owner-p4-projects@FreeBSD.ORG Tue Jan 24 19:31:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48DBF16A422; Tue, 24 Jan 2006 19:31:00 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 0CC3416A41F for ; Tue, 24 Jan 2006 19:31:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8E7343D49 for ; Tue, 24 Jan 2006 19:30:59 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0OJUxg7047167 for ; Tue, 24 Jan 2006 19:30:59 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0OJUxBF047164 for perforce@freebsd.org; Tue, 24 Jan 2006 19:30:59 GMT (envelope-from peter@freebsd.org) Date: Tue, 24 Jan 2006 19:30:59 GMT Message-Id: <200601241930.k0OJUxBF047164@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 Cc: Subject: PERFORCE change 90296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 19:31:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=90296 Change 90296 by peter@peter_daintree on 2006/01/24 19:29:59 Make this compile Affected files ... .. //depot/projects/hammer/sys/netinet/ip_icmp.c#28 edit Differences ... ==== //depot/projects/hammer/sys/netinet/ip_icmp.c#28 (text+ko) ==== @@ -861,6 +861,7 @@ for (i = 0; i < size; i++) { if (mtu > mtutab[i]) return mtutab[i]; + } } else { for (i = size - 1; i >= 0; i--) if (mtu < mtutab[i]) From owner-p4-projects@FreeBSD.ORG Tue Jan 24 19:38:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0AF116A422; Tue, 24 Jan 2006 19:38:09 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 685DB16A420 for ; Tue, 24 Jan 2006 19:38:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6D3D43D45 for ; Tue, 24 Jan 2006 19:38:08 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0OJc8b3047521 for ; Tue, 24 Jan 2006 19:38:08 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0OJc8k9047518 for perforce@freebsd.org; Tue, 24 Jan 2006 19:38:08 GMT (envelope-from peter@freebsd.org) Date: Tue, 24 Jan 2006 19:38:08 GMT Message-Id: <200601241938.k0OJc8k9047518@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 Cc: Subject: PERFORCE change 90297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 19:38:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=90297 Change 90297 by peter@peter_daintree on 2006/01/24 19:37:15 IFC @90295 Affected files ... .. //depot/projects/hammer/contrib/bc/bc/main.c#4 integrate .. //depot/projects/hammer/etc/rc.d/ipsec#10 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient-script#7 integrate .. //depot/projects/hammer/sbin/mount/mount.c#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#37 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#41 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#23 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#41 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#29 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#23 integrate .. //depot/projects/hammer/sys/netinet/in.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#73 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#29 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#58 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#32 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#39 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#26 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#48 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#24 integrate .. //depot/projects/hammer/sys/vm/vm_pageq.c#13 integrate Differences ... ==== //depot/projects/hammer/contrib/bc/bc/main.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ Western Washington University Bellingham, WA 98226-9062 -$FreeBSD: src/contrib/bc/bc/main.c,v 1.7 2005/09/27 18:52:17 brooks Exp $ +$FreeBSD: src/contrib/bc/bc/main.c,v 1.8 2006/01/24 06:38:35 brooks Exp $ *************************************************************************/ @@ -65,7 +65,7 @@ printf ("usage: %s [options] [file ...]\n%s%s%s%s%s%s%s", progname, " -h --help print this usage and exit\n", " -i --interactive force interactive mode\n", - " -l --mathlib use the predefine math routines\n", + " -l --mathlib use the predefined math routines\n", " -q --quiet don't print initial banner\n", " -s --standard non-standard bc constructs are errors\n", " -w --warn warn about non-standard bc constructs\n", ==== //depot/projects/hammer/etc/rc.d/ipsec#10 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.13 2005/10/12 22:14:44 pjd Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.16 2006/01/24 15:16:55 pjd Exp $ # # PROVIDE: ipsec @@ -9,15 +9,13 @@ # BEFORE: DAEMON mountcritremote # KEYWORD: nojail -# it does not really require beforenetlkm. - . /etc/rc.subr name="ipsec" rcvar=`set_rcvar` start_precmd="ipsec_prestart" start_cmd="ipsec_start" -stop_precmd="test -f /etc/ipsec.conf" +stop_precmd="test -f $ipsec_file" stop_cmd="ipsec_stop" reload_cmd="ipsec_reload" extra_commands="reload" @@ -63,8 +61,6 @@ ipsec_reload() { echo "Reloading ipsec manual keys/policies." - ${ipsec_program} -F - ${ipsec_program} -FP ${ipsec_program} -f "$ipsec_file" } ==== //depot/projects/hammer/sbin/dhclient/dhclient-script#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ -# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.12 2006/01/23 05:42:59 wes Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.13 2006/01/24 06:11:55 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback # @@ -276,7 +276,7 @@ if [ -n "$new_routers" ]; then $LOGGER "New Routers ($interface): $new_routers" set "$new_routers" - if ping -q -c 1 -w 1 "$1"; then + if ping -q -c 1 -t 1 "$1"; then if [ "$new_ip_address" != "$alias_ip_address" ]; then add_new_alias fi ==== //depot/projects/hammer/sbin/mount/mount.c#24 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.80 2006/01/18 11:00:34 pjd Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.81 2006/01/24 15:26:36 pjd Exp $"; #endif /* not lint */ #include @@ -717,7 +717,7 @@ void remopt(string, opt) char *string; - const char *opt; + const char *opt; { char *o, *p, *r; ==== //depot/projects/hammer/sys/dev/ata/ata-pci.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.112 2006/01/18 13:10:17 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.113 2006/01/24 12:34:56 sos Exp $"); #include "opt_ata.h" #include @@ -439,7 +439,8 @@ { struct ata_channel *ch = device_get_softc(dev); - if (ch->dma && ((ch->flags & ATA_ALWAYS_DMASTAT) || + if (!ata_legacy(device_get_parent(dev)) && + ch->dma && ((ch->flags & ATA_ALWAYS_DMASTAT) || (ch->dma->flags & ATA_DMA_ACTIVE))) { int bmstat = ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & ATA_BMSTAT_MASK; ==== //depot/projects/hammer/sys/dev/ath/if_ath.c#41 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.107 2006/01/09 17:13:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.108 2006/01/23 20:58:05 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -2143,7 +2143,7 @@ * TU's and then calculate based on the beacon interval. * Note that we clamp the result to at most 10 beacons. */ - bs.bs_bmissthreshold = howmany(ic->ic_bmisstimeout, intval); + bs.bs_bmissthreshold = ic->ic_bmissthreshold; if (bs.bs_bmissthreshold > 10) bs.bs_bmissthreshold = 10; else if (bs.bs_bmissthreshold <= 0) ==== //depot/projects/hammer/sys/dev/sound/pcm/channel.c#19 (text+ko) ==== @@ -31,11 +31,14 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.107 2006/01/22 15:06:49 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.108 2006/01/24 01:10:07 ariff Exp $"); #define MIN_CHUNK_SIZE 256 /* for uiomove etc. */ +#if 0 #define DMA_ALIGN_THRESHOLD 4 #define DMA_ALIGN_MASK (~(DMA_ALIGN_THRESHOLD - 1)) +#endif +#define DMA_ALIGN_MASK(bps) (~((bps) - 1)) #define CANCHANGE(c) (!(c->flags & CHN_F_TRIGGERED)) @@ -1253,7 +1256,10 @@ #if 1 hwptr &= ~a ; /* Apply channel align mask */ #endif +#if 0 hwptr &= DMA_ALIGN_MASK; /* Apply DMA align mask */ +#endif + hwptr &= DMA_ALIGN_MASK(sndbuf_getbps(c->bufhard)); return hwptr; } ==== //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#9 (text+ko) ==== @@ -66,7 +66,7 @@ #include #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.15 2006/01/22 15:06:49 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.16 2006/01/24 01:10:07 ariff Exp $"); #define RATE_ASSERT(x, y) /* KASSERT(x,y) */ #define RATE_TEST(x, y) /* if (!(x)) printf y */ @@ -100,6 +100,7 @@ uint32_t alpha; /* interpolation distance */ uint32_t pos, bpos; /* current sample / buffer positions */ uint32_t bufsz; /* total buffer size */ + uint32_t stray; /* stray bytes */ int32_t scale, roll; /* scale / roll factor */ int16_t *buffer; uint32_t (*convert)(struct feed_rate_info *, int16_t *, uint32_t); @@ -350,6 +351,7 @@ info->pos = 2; info->bpos = 4; info->alpha = 0; + info->stray = 0; feed_rate_reset(info); if (info->src == info->dst) { /* @@ -710,12 +712,13 @@ slot = (((info->gx * (count >> 1)) + info->gy - info->alpha - 1) / info->gy) << 1; RATE_TEST((slot & 1) == 0, ("%s: Slot count not sample integral (%d)\n", __func__, slot)); - slot &= ~1; /* * Optimize buffer feeding aggresively to ensure calculated slot * can be fitted nicely into available buffer free space, hence * avoiding multiple feeding. */ + RATE_TEST(info->stray == 0, ("%s: [1] Stray bytes: %u\n", + __func__,info->stray)); if (info->pos != 2 && info->bpos - info->pos == 2 && info->bpos + slot > info->bufsz) { /* @@ -734,25 +737,31 @@ i = 0; for (;;) { for (;;) { - fetch = info->bufsz - info->bpos; + fetch = (info->bufsz - info->bpos) << 1; + fetch -= info->stray; RATE_ASSERT(fetch >= 0, ("%s: [1] Buffer overrun: %d > %d\n", __func__, info->bpos, info->bufsz)); - if (slot < fetch) - fetch = slot; - fetch &= ~1; + if ((slot << 1) < fetch) + fetch = slot << 1; if (fetch > 0) { - RATE_TEST((fetch & 1) == 0, - ("%s: Fetch size not sample integral (%d)\n", - __func__, fetch)); + RATE_ASSERT(((info->bpos << 1) - info->stray) >= 0 && + ((info->bpos << 1) - info->stray) < (info->bufsz << 1), + ("%s: DANGER - BUFFER OVERRUN! bufsz=%d, pos=%d\n", __func__, + info->bufsz << 1, (info->bpos << 1) - info->stray)); fetch = FEEDER_FEED(f->source, c, - (uint8_t *)(info->buffer + info->bpos), - fetch << 1, source); + (uint8_t *)(info->buffer) + (info->bpos << 1) - info->stray, + fetch, source); + info->stray = 0; if (fetch == 0) break; RATE_TEST((fetch & 3) == 0, ("%s: Fetch size not byte integral (%d)\n", __func__, fetch)); + info->stray += fetch & 3; + RATE_TEST(info->stray == 0, + ("%s: Stray bytes detected (%d)\n", + __func__, info->stray)); fetch >>= 1; fetch &= ~1; info->bpos += fetch; @@ -790,6 +799,7 @@ * to beginning of buffer so next cycle can * interpolate using it. */ + RATE_TEST(info->stray == 0, ("%s: [2] Stray bytes: %u\n", __func__, info->stray)); info->buffer[0] = info->buffer[info->pos - 2]; info->buffer[1] = info->buffer[info->pos - 1]; info->bpos = 2; @@ -798,7 +808,10 @@ if (i == count) break; } +#if 0 RATE_TEST(count == i, ("Expect: %u , Got: %u\n", count << 1, i << 1)); +#endif + RATE_TEST(info->stray == 0, ("%s: [3] Stray bytes: %u\n", __func__, info->stray)); return i << 1; } ==== //depot/projects/hammer/sys/kern/kern_ktrace.c#23 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.105 2005/11/14 19:30:09 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_ktrace.c,v 1.106 2006/01/23 21:45:32 jhb Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -952,6 +952,7 @@ error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); + vrele(vp); mtx_unlock(&Giant); if (!error) return; ==== //depot/projects/hammer/sys/kern/vfs_aio.c#41 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.211 2006/01/23 10:27:15 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.215 2006/01/24 07:24:24 davidxu Exp $"); #include #include @@ -184,24 +184,50 @@ struct __aiocb_private _aiocb_private; } oaiocb_t; +/* + * Below is a key of locks used to protect each member of struct aiocblist + * aioliojob and kaioinfo and any backends. + * + * * - need not protected + * a - locked by proc mtx + * b - locked by backend lock, the backend lock can be null in some cases, + * for example, BIO belongs to this type, in this case, proc lock is + * reused. + * c - locked by aio_job_mtx, the lock for the generic file I/O backend. + */ + +/* + * Current, there is only two backends: BIO and generic file I/O. + * socket I/O is served by generic file I/O, this is not a good idea, since + * disk file I/O and any other types without O_NONBLOCK flag can block daemon + * threads, if there is no thread to serve socket I/O, the socket I/O will be + * delayed too long or starved, we should create some threads dedicated to + * sockets to do non-blocking I/O, same for pipe and fifo, for these I/O + * systems we really need non-blocking interface, fiddling O_NONBLOCK in file + * structure is not safe because there is race between userland and aio + * daemons. + */ + struct aiocblist { - TAILQ_ENTRY(aiocblist) list; /* List of jobs */ - TAILQ_ENTRY(aiocblist) plist; /* List of jobs for proc */ - TAILQ_ENTRY(aiocblist) allist; - int jobflags; - int jobstate; - int inputcharge; - int outputcharge; - struct buf *bp; /* Buffer pointer */ - struct proc *userproc; /* User process */ - struct ucred *cred; /* Active credential when created */ - struct file *fd_file; /* Pointer to file structure */ - struct aioliojob *lio; /* Optional lio job */ - struct aiocb *uuaiocb; /* Pointer in userspace of aiocb */ - struct knlist klist; /* list of knotes */ - struct aiocb uaiocb; /* Kernel I/O control block */ - ksiginfo_t ksi; /* Realtime signal info */ - struct task biotask; + TAILQ_ENTRY(aiocblist) list; /* (b) internal list of for backend */ + TAILQ_ENTRY(aiocblist) plist; /* (a) list of jobs for each backend */ + TAILQ_ENTRY(aiocblist) allist; /* (a) list of all jobs in proc */ + int jobflags; /* (a) job flags */ + int jobstate; /* (b) job state */ + int inputcharge; /* (*) input blockes */ + int outputcharge; /* (*) output blockes */ + struct buf *bp; /* (*) private to BIO backend, + * buffer pointer + */ + struct proc *userproc; /* (*) user process */ + struct ucred *cred; /* (*) active credential when created */ + struct file *fd_file; /* (*) pointer to file structure */ + struct aioliojob *lio; /* (*) optional lio job */ + struct aiocb *uuaiocb; /* (*) pointer in userspace of aiocb */ + struct knlist klist; /* (a) list of knotes */ + struct aiocb uaiocb; /* (*) kernel I/O control block */ + ksiginfo_t ksi; /* (a) realtime signal info */ + struct task biotask; /* (*) private to BIO backend */ }; /* jobflags */ @@ -215,22 +241,22 @@ #define AIOP_FREE 0x1 /* proc on free queue */ struct aiothreadlist { - int aiothreadflags; /* AIO proc flags */ - TAILQ_ENTRY(aiothreadlist) list; /* List of processes */ - struct thread *aiothread; /* The AIO thread */ + int aiothreadflags; /* (c) AIO proc flags */ + TAILQ_ENTRY(aiothreadlist) list; /* (c) list of processes */ + struct thread *aiothread; /* (*) the AIO thread */ }; /* * data-structure for lio signal management */ struct aioliojob { - int lioj_flags; - int lioj_count; - int lioj_finished_count; - struct sigevent lioj_signal; /* signal on all I/O done */ - TAILQ_ENTRY(aioliojob) lioj_list; - struct knlist klist; /* list of knotes */ - ksiginfo_t lioj_ksi; /* Realtime signal info */ + int lioj_flags; /* (a) listio flags */ + int lioj_count; /* (a) listio flags */ + int lioj_finished_count; /* (a) listio flags */ + struct sigevent lioj_signal; /* (a) signal on all I/O done */ + TAILQ_ENTRY(aioliojob) lioj_list; /* (a) lio list */ + struct knlist klist; /* (a) list of knotes */ + ksiginfo_t lioj_ksi; /* (a) Realtime signal info */ }; #define LIOJ_SIGNAL 0x1 /* signal on all done (lio) */ @@ -241,29 +267,31 @@ * per process aio data structure */ struct kaioinfo { - int kaio_flags; /* per process kaio flags */ - int kaio_maxactive_count; /* maximum number of AIOs */ - int kaio_active_count; /* number of currently used AIOs */ - int kaio_qallowed_count; /* maxiumu size of AIO queue */ - int kaio_count; /* size of AIO queue */ - int kaio_ballowed_count; /* maximum number of buffers */ - int kaio_buffer_count; /* number of physio buffers */ - TAILQ_HEAD(,aiocblist) kaio_all; /* all AIOs in the process */ - TAILQ_HEAD(,aiocblist) kaio_done; /* done queue for process */ - TAILQ_HEAD(,aioliojob) kaio_liojoblist; /* list of lio jobs */ - TAILQ_HEAD(,aiocblist) kaio_jobqueue; /* job queue for process */ - TAILQ_HEAD(,aiocblist) kaio_bufqueue; /* buffer job queue for process */ - TAILQ_HEAD(,aiocblist) kaio_sockqueue; /* queue for aios waiting on sockets */ + int kaio_flags; /* (a) per process kaio flags */ + int kaio_maxactive_count; /* (*) maximum number of AIOs */ + int kaio_active_count; /* (c) number of currently used AIOs */ + int kaio_qallowed_count; /* (*) maxiumu size of AIO queue */ + int kaio_count; /* (a) size of AIO queue */ + int kaio_ballowed_count; /* (*) maximum number of buffers */ + int kaio_buffer_count; /* (a) number of physio buffers */ + TAILQ_HEAD(,aiocblist) kaio_all; /* (a) all AIOs in the process */ + TAILQ_HEAD(,aiocblist) kaio_done; /* (a) done queue for process */ + TAILQ_HEAD(,aioliojob) kaio_liojoblist; /* (a) list of lio jobs */ + TAILQ_HEAD(,aiocblist) kaio_jobqueue; /* (a) job queue for process */ + TAILQ_HEAD(,aiocblist) kaio_bufqueue; /* (a) buffer job queue for process */ + TAILQ_HEAD(,aiocblist) kaio_sockqueue; /* (a) queue for aios waiting on sockets, + * not used yet. + */ }; #define KAIO_RUNDOWN 0x1 /* process is being run down */ #define KAIO_WAKEUP 0x2 /* wakeup process when there is a significant event */ -static TAILQ_HEAD(,aiothreadlist) aio_freeproc; /* Idle daemons */ +static TAILQ_HEAD(,aiothreadlist) aio_freeproc; /* (c) Idle daemons */ static struct sema aio_newproc_sem; static struct mtx aio_job_mtx; static struct mtx aio_sock_mtx; -static TAILQ_HEAD(,aiocblist) aio_jobs; /* Async job list */ +static TAILQ_HEAD(,aiocblist) aio_jobs; /* (c) Async job list */ static struct unrhdr *aiod_unr; static void aio_init_aioinfo(struct proc *p); @@ -420,10 +448,18 @@ error = kqueue_del_filteropts(EVFILT_AIO); if (error) return error; + error = kqueue_del_filteropts(EVFILT_LIO); + if (error) + return error; async_io_version = 0; aio_swake = NULL; taskqueue_free(taskqueue_aiod_bio); delete_unrhdr(aiod_unr); + uma_zdestroy(kaio_zone); + uma_zdestroy(aiop_zone); + uma_zdestroy(aiocb_zone); + uma_zdestroy(aiol_zone); + uma_zdestroy(aiolio_zone); EVENTHANDLER_DEREGISTER(process_exit, exit_tag); EVENTHANDLER_DEREGISTER(process_exec, exec_tag); mtx_destroy(&aio_job_mtx); @@ -579,6 +615,7 @@ struct aiocblist *cbe, *cbn; struct file *fp; struct socket *so; + int remove; KASSERT(curthread->td_proc == p, ("%s: called on non-curproc", __func__)); @@ -595,35 +632,30 @@ * Try to cancel all pending requests. This code simulates * aio_cancel on all pending I/O requests. */ - while ((cbe = TAILQ_FIRST(&ki->kaio_sockqueue))) { - fp = cbe->fd_file; - so = fp->f_data; - mtx_lock(&aio_sock_mtx); - TAILQ_REMOVE(&so->so_aiojobq, cbe, list); - mtx_unlock(&aio_sock_mtx); - TAILQ_REMOVE(&ki->kaio_sockqueue, cbe, plist); - TAILQ_INSERT_HEAD(&ki->kaio_jobqueue, cbe, plist); - cbe->jobstate = JOBST_JOBQGLOBAL; - } - TAILQ_FOREACH_SAFE(cbe, &ki->kaio_jobqueue, plist, cbn) { + remove = 0; mtx_lock(&aio_job_mtx); if (cbe->jobstate == JOBST_JOBQGLOBAL) { TAILQ_REMOVE(&aio_jobs, cbe, list); - mtx_unlock(&aio_job_mtx); + remove = 1; + } else if (cbe->jobstate == JOBST_JOBQSOCK) { + fp = cbe->fd_file; + MPASS(fp->f_type == DTYPE_SOCKET); + so = fp->f_data; + TAILQ_REMOVE(&so->so_aiojobq, cbe, list); + remove = 1; + } + mtx_unlock(&aio_job_mtx); + + if (remove) { cbe->jobstate = JOBST_JOBFINISHED; cbe->uaiocb._aiocb_private.status = -1; cbe->uaiocb._aiocb_private.error = ECANCELED; TAILQ_REMOVE(&ki->kaio_jobqueue, cbe, plist); aio_bio_done_notify(p, cbe, DONE_QUEUE); - } else { - mtx_unlock(&aio_job_mtx); } } - if (TAILQ_FIRST(&ki->kaio_sockqueue)) - goto restart; - /* Wait for all running I/O to be finished */ if (TAILQ_FIRST(&ki->kaio_bufqueue) || TAILQ_FIRST(&ki->kaio_jobqueue)) { @@ -685,14 +717,7 @@ * and this code should work in all instances for every type of file, including * pipes, sockets, fifos, and regular files. * - * XXX I don't think these code work well with pipes, sockets and fifo, the - * problem is the aiod threads can be blocked if there is not data or no - * buffer space, and file was not opened with O_NONBLOCK, all aiod threads - * will be blocked if there is couple of such processes. We need a FOF_OFFSET - * like flag to override f_flag to tell low level system to do non-blocking - * I/O, we can not muck O_NONBLOCK because there is full of race between - * userland and aiod threads, although there is a trigger mechanism for socket, - * but it also does not work well if userland is misbehaviored. + * XXX I don't think it works well for socket, pipe, and fifo. */ static void aio_process(struct aiocblist *aiocbe) @@ -833,8 +858,6 @@ struct proc *curcp, *mycp, *userp; struct vmspace *myvm, *tmpvm; struct thread *td = curthread; - struct pgrp *newpgrp; - struct session *newsess; int id = (intptr_t)_id; /* @@ -867,14 +890,7 @@ fdfree(td); /* The daemon resides in its own pgrp. */ - MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, - M_WAITOK | M_ZERO); - MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, - M_WAITOK | M_ZERO); - - sx_xlock(&proctree_lock); - enterpgrp(mycp, mycp->p_pid, newpgrp, newsess); - sx_xunlock(&proctree_lock); + setsid(td, NULL); /* * Wakeup parent process. (Parent sleeps to keep from blasting away @@ -1051,7 +1067,7 @@ mtx_lock(&aio_job_mtx); num_aio_procs++; if (start != NULL) - *start--; + (*start)--; mtx_unlock(&aio_job_mtx); } else { free_unr(aiod_unr, id); @@ -1187,47 +1203,33 @@ aio_swake_cb(struct socket *so, struct sockbuf *sb) { struct aiocblist *cb, *cbn; - struct proc *p; - struct kaioinfo *ki = NULL; int opcode, wakecount = 0; struct aiothreadlist *aiop; - if (sb == &so->so_snd) { + if (sb == &so->so_snd) opcode = LIO_WRITE; - SOCKBUF_LOCK(&so->so_snd); - so->so_snd.sb_flags &= ~SB_AIO; - SOCKBUF_UNLOCK(&so->so_snd); - } else { + else opcode = LIO_READ; - SOCKBUF_LOCK(&so->so_rcv); - so->so_rcv.sb_flags &= ~SB_AIO; - SOCKBUF_UNLOCK(&so->so_rcv); - } - mtx_lock(&aio_sock_mtx); + SOCKBUF_LOCK(sb); + sb->sb_flags &= ~SB_AIO; + mtx_lock(&aio_job_mtx); TAILQ_FOREACH_SAFE(cb, &so->so_aiojobq, list, cbn) { if (opcode == cb->uaiocb.aio_lio_opcode) { if (cb->jobstate != JOBST_JOBQSOCK) panic("invalid queue value"); - p = cb->userproc; - ki = p->p_aioinfo; + /* XXX + * We don't have actual sockets backend yet, + * so we simply move the requests to the generic + * file I/O backend. + */ TAILQ_REMOVE(&so->so_aiojobq, cb, list); - PROC_LOCK(p); - TAILQ_REMOVE(&ki->kaio_sockqueue, cb, plist); - /* - * XXX check AIO_RUNDOWN, and don't put on - * jobqueue if it was set. - */ - TAILQ_INSERT_TAIL(&ki->kaio_jobqueue, cb, plist); - cb->jobstate = JOBST_JOBQGLOBAL; - mtx_lock(&aio_job_mtx); TAILQ_INSERT_TAIL(&aio_jobs, cb, list); - mtx_unlock(&aio_job_mtx); - PROC_UNLOCK(p); wakecount++; } } - mtx_unlock(&aio_sock_mtx); + mtx_unlock(&aio_job_mtx); + SOCKBUF_UNLOCK(sb); while (wakecount--) { mtx_lock(&aio_job_mtx); @@ -1427,14 +1429,15 @@ SOCKBUF_LOCK(sb); if (((opcode == LIO_READ) && (!soreadable(so))) || ((opcode == LIO_WRITE) && (!sowriteable(so)))) { - mtx_lock(&aio_sock_mtx); + sb->sb_flags |= SB_AIO; + + mtx_lock(&aio_job_mtx); TAILQ_INSERT_TAIL(&so->so_aiojobq, aiocbe, list); - mtx_unlock(&aio_sock_mtx); + mtx_unlock(&aio_job_mtx); - sb->sb_flags |= SB_AIO; PROC_LOCK(p); - TAILQ_INSERT_TAIL(&ki->kaio_sockqueue, aiocbe, plist); TAILQ_INSERT_TAIL(&ki->kaio_all, aiocbe, allist); + TAILQ_INSERT_TAIL(&ki->kaio_jobqueue, aiocbe, plist); aiocbe->jobstate = JOBST_JOBQSOCK; ki->kaio_count++; if (lj) @@ -1652,6 +1655,7 @@ struct file *fp; struct socket *so; int error; + int remove; int cancelled = 0; int notcancelled = 0; struct vnode *vp; @@ -1672,32 +1676,6 @@ td->td_retval[0] = AIO_NOTCANCELED; return (0); } - } else if (fp->f_type == DTYPE_SOCKET) { - so = fp->f_data; - mtx_lock(&aio_sock_mtx); - TAILQ_FOREACH_SAFE(cbe, &so->so_aiojobq, list, cbn) { - if (cbe->userproc == p && - (uap->aiocbp == NULL || - uap->aiocbp == cbe->uuaiocb)) { - TAILQ_REMOVE(&so->so_aiojobq, cbe, list); - PROC_LOCK(p); - TAILQ_REMOVE(&ki->kaio_sockqueue, cbe, plist); - cbe->jobstate = JOBST_JOBRUNNING; - cbe->uaiocb._aiocb_private.status = -1; - cbe->uaiocb._aiocb_private.error = ECANCELED; - aio_bio_done_notify(p, cbe, DONE_QUEUE); - PROC_UNLOCK(p); - cancelled++; - if (uap->aiocbp != NULL) - break; - } - } - mtx_unlock(&aio_sock_mtx); - if (cancelled && uap->aiocbp != NULL) { - fdrop(fp, td); - td->td_retval[0] = AIO_CANCELED; - return (0); - } } PROC_LOCK(p); @@ -1705,33 +1683,55 @@ if ((uap->fd == cbe->uaiocb.aio_fildes) && ((uap->aiocbp == NULL) || (uap->aiocbp == cbe->uuaiocb))) { + remove = 0; + mtx_lock(&aio_job_mtx); if (cbe->jobstate == JOBST_JOBQGLOBAL) { TAILQ_REMOVE(&aio_jobs, cbe, list); - mtx_unlock(&aio_job_mtx); + remove = 1; + } else if (cbe->jobstate == JOBST_JOBQSOCK) { + MPASS(fp->f_type == DTYPE_SOCKET); + so = fp->f_data; + TAILQ_REMOVE(&so->so_aiojobq, cbe, list); + remove = 1; + } + mtx_unlock(&aio_job_mtx); + + if (remove) { TAILQ_REMOVE(&ki->kaio_jobqueue, cbe, plist); cbe->uaiocb._aiocb_private.status = -1; cbe->uaiocb._aiocb_private.error = ECANCELED; aio_bio_done_notify(p, cbe, DONE_QUEUE); cancelled++; } else { - mtx_unlock(&aio_job_mtx); notcancelled++; } + if (uap->aiocbp != NULL) + break; } } PROC_UNLOCK(p); done: fdrop(fp, td); + + if (uap->aiocbp != NULL) { + if (cancelled) { + td->td_retval[0] = AIO_CANCELED; + return (0); + } + } + if (notcancelled) { td->td_retval[0] = AIO_NOTCANCELED; return (0); } + if (cancelled) { td->td_retval[0] = AIO_CANCELED; return (0); } + td->td_retval[0] = AIO_ALLDONE; return (0); ==== //depot/projects/hammer/sys/net80211/ieee80211.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.26 2005/12/30 00:40:36 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.27 2006/01/23 20:57:30 sam Exp $"); /* * IEEE 802.11 generic handler @@ -190,7 +190,7 @@ if (ic->ic_bintval == 0) ic->ic_bintval = IEEE80211_BINTVAL_DEFAULT; - ic->ic_bmisstimeout = 7*ic->ic_bintval; /* default 7 beacons */ + ic->ic_bmissthreshold = 7; /* default 7 beacons */ ic->ic_dtim_period = IEEE80211_DTIM_DEFAULT; IEEE80211_BEACON_LOCK_INIT(ic, "beacon"); ==== //depot/projects/hammer/sys/net80211/ieee80211_input.c#29 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.86 2006/01/23 19:31:00 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.87 2006/01/23 21:02:48 sam Exp $"); #include #include @@ -1901,6 +1901,9 @@ /* record tsf of last beacon */ memcpy(ni->ni_tstamp.data, scan.tstamp, sizeof(ni->ni_tstamp)); + /* count beacon frame for s/w bmiss handling */ + ic->ic_swbmiss_count++; + ic->ic_bmiss_count = 0; if (ni->ni_erp != scan.erp) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, "[%s] erp change: was 0x%x, now 0x%x\n", @@ -1944,7 +1947,6 @@ if (ic->ic_flags & IEEE80211_F_SCAN) ieee80211_add_scan(ic, &scan, wh, subtype, rssi, rstamp); - ic->ic_bmiss_count = 0; return; } /* ==== //depot/projects/hammer/sys/net80211/ieee80211_proto.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.27 2006/01/02 17:16:27 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.28 2006/01/23 21:02:49 sam Exp $"); /* * IEEE 802.11 protocol support. @@ -98,6 +98,7 @@ ic->ic_fragthreshold = IEEE80211_FRAG_DEFAULT; ic->ic_fixed_rate = IEEE80211_FIXED_RATE_NONE; ic->ic_bmiss_max = IEEE80211_BMISS_MAX; + callout_init(&ic->ic_swbmiss, CALLOUT_MPSAFE); ic->ic_mcast_rate = IEEE80211_MCAST_RATE_DEFAULT; ic->ic_protmode = IEEE80211_PROT_CTSONLY; ic->ic_roaming = IEEE80211_ROAMING_AUTO; @@ -855,7 +856,27 @@ ieee80211_new_state(ic, IEEE80211_S_SCAN, 0); } +/* + * Software beacon miss handling. Check if any beacons + * were received in the last period. If not post a + * beacon miss; otherwise reset the counter. + */ static void +ieee80211_swbmiss(void *arg) +{ + struct ieee80211com *ic = arg; + + if (ic->ic_swbmiss_count == 0) { + ieee80211_beacon_miss(ic); + if (ic->ic_bmiss_count == 0) /* don't re-arm timer */ + return; + } else + ic->ic_swbmiss_count = 0; + callout_reset(&ic->ic_swbmiss, ic->ic_swbmiss_period, + ieee80211_swbmiss, ic); +} + +static void sta_disassoc(void *arg, struct ieee80211_node *ni) { struct ieee80211com *ic = arg; @@ -888,6 +909,8 @@ ieee80211_state_name[ostate], ieee80211_state_name[nstate]); ic->ic_state = nstate; /* state transition */ ni = ic->ic_bss; /* NB: no reference held */ + if (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS) + callout_stop(&ic->ic_swbmiss); switch (nstate) { case IEEE80211_S_INIT: switch (ostate) { @@ -1093,6 +1116,20 @@ if_start(ifp); /* XXX not authorized yet */ break; } + if (ostate != IEEE80211_S_RUN && + ic->ic_opmode == IEEE80211_M_STA && + (ic->ic_flags_ext & IEEE80211_FEXT_SWBMISS)) { + /* + * Start s/w beacon miss timer for devices w/o + * hardware support. We fudge a bit here since + * we're doing this in software. + */ + ic->ic_swbmiss_period = IEEE80211_TU_TO_TICKS( + 2 * ic->ic_bmissthreshold * ni->ni_intval); + ic->ic_swbmiss_count = 0; + callout_reset(&ic->ic_swbmiss, ic->ic_swbmiss_period, + ieee80211_swbmiss, ic); + } /* * Start/stop the authenticator when operating as an * AP. We delay until here to allow configuration to ==== //depot/projects/hammer/sys/net80211/ieee80211_var.h#23 (text+ko) ==== @@ -29,7 +29,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/sys/net80211/ieee80211_var.h,v 1.36 2006/01/02 16:57:20 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.38 2006/01/23 21:02:49 sam Exp $ */ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_ @@ -71,6 +71,7 @@ #define IEEE80211_BINTVAL_DEFAULT 100 /* default beacon interval (TU's) */ #define IEEE80211_BMISS_MAX 2 /* maximum consecutive bmiss allowed */ +#define IEEE80211_SWBMISS_THRESHOLD 50 /* s/w bmiss threshold (TU's) */ #define IEEE80211_PS_SLEEP 0x1 /* STA is in power saving mode */ #define IEEE80211_PS_MAX_QUEUE 50 /* maximum saved packets */ @@ -83,6 +84,7 @@ #define IEEE80211_MS_TO_TU(x) (((x) * 1024) / 1000) #define IEEE80211_TU_TO_MS(x) (((x) * 1000) / 1024) +#define IEEE80211_TU_TO_TICKS(x)(((x) * hz) / 1024) struct ieee80211_aclator; struct sysctl_ctx_list; @@ -144,8 +146,12 @@ int ic_mcast_rate; /* rate for mcast frames */ u_int16_t ic_rtsthreshold; u_int16_t ic_fragthreshold; + u_int8_t ic_bmissthreshold; u_int8_t ic_bmiss_count; /* current beacon miss count */ int ic_bmiss_max; /* max bmiss before scan */ + u_int16_t ic_swbmiss_count;/* beacons in last period */ + u_int16_t ic_swbmiss_period;/* s/w bmiss period */ + struct callout ic_swbmiss; /* s/w beacon miss timer */ struct ieee80211_node *(*ic_node_alloc)(struct ieee80211_node_table*); void (*ic_node_free)(struct ieee80211_node *); void (*ic_node_cleanup)(struct ieee80211_node *); @@ -157,7 +163,6 @@ u_int16_t ic_txmax; /* max tx retry count */ u_int16_t ic_txlifetime; /* tx lifetime */ u_int16_t ic_txpowlimit; /* global tx power limit */ - u_int16_t ic_bmisstimeout;/* beacon miss threshold (ms) */ u_int16_t ic_nonerpsta; /* # non-ERP stations */ u_int16_t ic_longslotsta; /* # long slot time stations */ int ic_mgt_timer; /* mgmt timeout */ @@ -247,6 +252,7 @@ /* 0x00000006 reserved */ #define IEEE80211_FEXT_BGSCAN 0x00000008 /* STATUS: enable full bgscan completion */ #define IEEE80211_FEXT_ERPUPDATE 0x00000200 /* STATUS: update ERP element */ +#define IEEE80211_FEXT_SWBMISS 0x00000400 /* CONF: do bmiss in s/w */ /* ic_caps */ #define IEEE80211_C_WEP 0x00000001 /* CAPABILITY: WEP available */ ==== //depot/projects/hammer/sys/netinet/in.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * @(#)in.c 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/in.c,v 1.92 2005/10/28 20:29:42 glebius Exp $ + * $FreeBSD: src/sys/netinet/in.c,v 1.93 2006/01/24 16:19:31 andre Exp $ */ #include "opt_carp.h" @@ -479,7 +479,8 @@ s = splnet(); TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link); TAILQ_REMOVE(&in_ifaddrhead, ia, ia_link); - LIST_REMOVE(ia, ia_hash); + if (ia->ia_addr.sin_family == AF_INET) + LIST_REMOVE(ia, ia_hash); IFAFREE(&ia->ia_ifa); splx(s); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 24 20:32:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 220AA16A422; Tue, 24 Jan 2006 20:32:18 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F016216A41F for ; Tue, 24 Jan 2006 20:32:17 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D47E43D58 for ; Tue, 24 Jan 2006 20:32:17 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0OKWHJw052562 for ; Tue, 24 Jan 2006 20:32:17 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0OKWGvu052558 for perforce@freebsd.org; Tue, 24 Jan 2006 20:32:16 GMT (envelope-from peter@freebsd.org) Date: Tue, 24 Jan 2006 20:32:16 GMT Message-Id: <200601242032.k0OKWGvu052558@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 Cc: Subject: PERFORCE change 90303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 20:32:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=90303 Change 90303 by peter@peter_melody on 2006/01/24 20:32:07 fix after merge Affected files ... .. //depot/projects/hammer/sys/netinet/ip_icmp.c#30 edit Differences ... ==== //depot/projects/hammer/sys/netinet/ip_icmp.c#30 (text+ko) ==== @@ -861,7 +861,6 @@ for (i = 0; i < size; i++) if (mtu > mtutab[i]) return mtutab[i]; - } } else { for (i = size - 1; i >= 0; i--) if (mtu < mtutab[i]) From owner-p4-projects@FreeBSD.ORG Tue Jan 24 21:41:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0EAC16A420; Tue, 24 Jan 2006 21:41:23 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 69D7916A422 for ; Tue, 24 Jan 2006 21:41:23 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F067043D5F for ; Tue, 24 Jan 2006 21:41:16 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0OLfG84065211 for ; Tue, 24 Jan 2006 21:41:16 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0OLfE9F065208 for perforce@freebsd.org; Tue, 24 Jan 2006 21:41:14 GMT (envelope-from wsalamon@computer.org) Date: Tue, 24 Jan 2006 21:41:14 GMT Message-Id: <200601242141.k0OLfE9F065208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 21:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=90305 Change 90305 by wsalamon@gretsch on 2006/01/24 21:40:43 Add the NMOUNT event to the event->class mapping. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#8 (text+ko) ==== @@ -306,6 +306,7 @@ 377:AUE_KQUEUE:kqueue(2):no 378:AUE_KEVENT:kevent(2):no 379:AUE_FSYNC:fsync(2):fm +380:AUE_NMOUNT:nmount(2):ad 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-p4-projects@FreeBSD.ORG Tue Jan 24 23:58:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9246516A422; Tue, 24 Jan 2006 23:58:05 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 507C216A41F for ; Tue, 24 Jan 2006 23:58:05 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0654243D45 for ; Tue, 24 Jan 2006 23:58:05 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0ONw4qn070691 for ; Tue, 24 Jan 2006 23:58:04 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ONw4AG070685 for perforce@freebsd.org; Tue, 24 Jan 2006 23:58:04 GMT (envelope-from wsalamon@computer.org) Date: Tue, 24 Jan 2006 23:58:04 GMT Message-Id: <200601242358.k0ONw4AG070685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 23:58:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90311 Change 90311 by wsalamon@gretsch on 2006/01/24 23:58:01 Integrate the new NMOUNT audit event from OpenBSM. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#7 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#7 (text+ko) ==== @@ -306,6 +306,7 @@ 377:AUE_KQUEUE:kqueue(2):no 378:AUE_KEVENT:kevent(2):no 379:AUE_FSYNC:fsync(2):fm +380:AUE_NMOUNT:nmount(2):ad 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo From owner-p4-projects@FreeBSD.ORG Wed Jan 25 00:55:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D810816A422; Wed, 25 Jan 2006 00:55:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7B2C316A41F for ; Wed, 25 Jan 2006 00:55:14 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4434B43D45 for ; Wed, 25 Jan 2006 00:55:14 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0P0tE8W080025 for ; Wed, 25 Jan 2006 00:55:14 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0P0tD18080022 for perforce@freebsd.org; Wed, 25 Jan 2006 00:55:13 GMT (envelope-from wsalamon@computer.org) Date: Wed, 25 Jan 2006 00:55:13 GMT Message-Id: <200601250055.k0P0tD18080022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 90312 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2006 00:55:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=90312 Change 90312 by wsalamon@gretsch on 2006/01/25 00:55:03 Fix up auditd to use the latest BSM API, where auditd is responsible for memory management of the audit event record. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/audit_supt/auditd/auditd.c#13 (text+ko) ==== @@ -564,7 +564,7 @@ */ int config_audit_controls(long flags) { - au_event_ent_t *ev; + au_event_ent_t ev, *evp; au_evclass_map_t evc_map; au_mask_t aumask; int ctr = 0; @@ -578,23 +578,29 @@ * but should. We need a way to get a count of the events. */ - setauevent(); - while((ev = getauevent()) != NULL) { - evc_map.ec_number = ev->ae_number; - evc_map.ec_class = ev->ae_class; + ev.ae_name = (char *)malloc(AU_EVENT_NAME_MAX); + ev.ae_desc = (char *)malloc(AU_EVENT_DESC_MAX); + if ((ev.ae_name == NULL) || (ev.ae_desc == NULL)) { + syslog(LOG_ERR, + "Memory allocation error when configuring audit controls."); + return (-1); + } + evp = &ev; + while((evp = getauevent_r(evp)) != NULL) { + evc_map.ec_number = evp->ae_number; + evc_map.ec_class = evp->ae_class; 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); + evp->ae_name); } else { ctr++; } - free(ev->ae_name); - free(ev->ae_desc); - free(ev); } endauevent(); + free(ev.ae_name); + free(ev.ae_desc); if (ctr == 0) syslog(LOG_ERR, "No events to class mappings registered."); else From owner-p4-projects@FreeBSD.ORG Wed Jan 25 01:05:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA7D616A422; Wed, 25 Jan 2006 01:05:05 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 81D4916A41F for ; Wed, 25 Jan 2006 01:05:05 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0514943D48 for ; Wed, 25 Jan 2006 01:05:04 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0P154UT080477 for ; Wed, 25 Jan 2006 01:05:04 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0P14do7080423 for perforce@freebsd.org; Wed, 25 Jan 2006 01:04:39 GMT (envelope-from cognet@freebsd.org) Date: Wed, 25 Jan 2006 01:04:39 GMT Message-Id: <200601250104.k0P14do7080423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 90313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2006 01:05:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90313 Change 90313 by cognet@cognet on 2006/01/25 01:03:48 IFC, hopefully I wasn't too wrong in merging vm stuff and didn't re-introduce too many bugs fixed in CVS. Affected files ... .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/faq/book.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/Makefile#4 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/building-products/Makefile#1 branch .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/building-products/article.sgml#1 branch .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#6 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#5 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#1 branch .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#1 branch .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/dma/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/introduction/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/ipv6/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/kerneldebug/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/kerneldebug/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/l10n/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/policies/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/policies/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/secure/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/sockets/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/tools/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/x86/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#4 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#4 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#5 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/faq/book.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/translators.ent#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/su.c#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#1 branch .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/books.ent#1 branch .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/colophon.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/superpages/doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/fonts/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/fonts/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/freebsd-questions/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/laptop/Makefile#1 branch .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/laptop/article.sgml#1 branch .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/mh/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/mh/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/new-users/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/version-guide/Makefile#1 branch .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/version-guide/article.sgml#1 branch .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/zip-drive/Makefile#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/articles/zip-drive/article.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/network-servers/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/superpages/doc/ru_RU.KOI8-R/share/sgml/teams.ent#2 integrate .. //depot/projects/superpages/doc/share/images/articles/building-products/freebsd-branches.pic#1 branch .. //depot/projects/superpages/doc/share/images/articles/building-products/freebsd-organization.pic#1 branch .. //depot/projects/superpages/doc/share/images/articles/releng/branches-head.pic#2 integrate .. //depot/projects/superpages/doc/share/images/articles/releng/branches-releng5.pic#2 integrate .. //depot/projects/superpages/doc/share/images/articles/releng/branches-releng6.pic#1 branch .. //depot/projects/superpages/doc/share/mk/doc.docbook.mk#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/README#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/aaron.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/addkey.sh#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/anray.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/dougb.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/ehaupt.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/gerald.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/glebius.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/gnn.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/imp.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/marck.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/matteo.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/matusita.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/novel.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/oleg.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/pgpkeys-core.sgml#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/pgpkeys-developers.sgml#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/pgpkeys-officers.sgml#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/pgpkeys.ent#4 integrate .. //depot/projects/superpages/doc/share/pgpkeys/portmgr-secretary.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/rees.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/rik.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/rink.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/roam.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/roberto.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/sem.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/tdb.key#1 branch .. //depot/projects/superpages/doc/share/pgpkeys/tmclaugh.key#2 integrate .. //depot/projects/superpages/doc/share/pgpkeys/vd.key#1 branch .. //depot/projects/superpages/doc/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/superpages/doc/share/sgml/freebsd.ent#3 integrate .. //depot/projects/superpages/doc/share/sgml/man-refs.ent#4 integrate .. //depot/projects/superpages/doc/share/sgml/mirrors.xml#4 integrate .. //depot/projects/superpages/doc/share/sgml/urls.ent#2 integrate .. //depot/projects/superpages/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/articles/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/articles/Makefile.inc#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/articles/cvs-freebsd/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/articles/cvs-freebsd/article.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/Makefile#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/faq/book.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/advanced-networking/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/appendix.decl#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/audit/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/example-dir1.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/example-dir2.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/example-dir3.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/example-dir4.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/basics/example-dir5.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/book.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/boot/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/chapter.decl#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/chapters.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/colophon.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/config/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/cutting-edge/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/desktop/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/disks/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/disks/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/eresources/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/eresources/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/firewalls/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/firewalls/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/geom/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/geom/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/introduction/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/introduction/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/kernelconfig/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/l10n/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/l10n/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/linuxemu/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mac/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mac/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mail/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mail/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mirrors/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mirrors/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/network-servers/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/network-servers/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/pgpkeys/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ports/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ppp-and-slip/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ppp-and-slip/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/printing/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/printing/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/security/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/security/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/serialcomms/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/serialcomms/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/txtfiles.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/users/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/vinum/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/x11/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/x11/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/porters-handbook/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/porters-handbook/book.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/porters-handbook/freebsd.dsl#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/authors.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapter.decl#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/ack.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/charmap.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/compose.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/converter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/devel.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/dict.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/difficult.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/faq.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/fonts.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/l10n.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/mailclient.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/message.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/multimedia.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/net.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/note#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/other.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/outta.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/preface.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/print.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/software.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/stepbystep.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/view.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/wm.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/chapters/xwin.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/freebsd.dsl#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/20020527-2.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/20020527.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/Eterm.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/IglooFTP.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/abiword.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/acroread.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/applet.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/arphicttf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/aterm.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/bbsnet.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/bg5pdf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/bg5ps.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/big5con.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/bluefish.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cccii.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cce.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cid-gv.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cjk-lyx.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cjk.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cwtexttf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/cxterm.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/dict.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/dvipdfmx.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/edict-big5.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/fortunetw.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/fzzdxfw.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/gaim.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/gnuls.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/hanzim.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/hztty.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/image#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/irssi.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/joe.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/kde-print.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/kfont_3_1.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/kmerlin.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/konq_3_1.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/konq_3_2.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/konq_3_3.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/konq_3_4.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/konqueror.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/konsole.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/ldap.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/licq.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/lynx.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/man.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/mlterm.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/moefonts-cid.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/moettf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/mozilla.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/mplayer.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/mutt.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/nautilus.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/ncftp3.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/ntfs.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/ntuttf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/openoffice.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/oxford.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/php-imagettftext.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/php-pdf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/pydict.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/qe.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/qkmj.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/qterm.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/rxvt.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/showttf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/stardict.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/stardict2.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/swing.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/sylpheed.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/tcltk.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/tcsh.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/tin.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/tintin++.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/ttf2pt1.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/ve.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/vim.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/vnc.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/wangttf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/windowmaker.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/xchat.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/xcin25.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/xmms.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/xpdf.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/images/zhcon.png#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/zh-tut/zh-tut.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/bookinfo.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/catalog#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/l10n.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/trademarks.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/urls.ent#1 branch .. //depot/projects/superpages/src/COPYRIGHT#2 integrate .. //depot/projects/superpages/src/LOCKS#2 integrate .. //depot/projects/superpages/src/MAINTAINERS#2 integrate .. //depot/projects/superpages/src/Makefile#2 integrate .. //depot/projects/superpages/src/Makefile.inc1#3 integrate .. //depot/projects/superpages/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/superpages/src/UPDATING#3 integrate .. //depot/projects/superpages/src/bin/date/date.1#2 integrate .. //depot/projects/superpages/src/bin/kenv/kenv.1#2 integrate .. //depot/projects/superpages/src/bin/ls/ls.1#2 integrate .. //depot/projects/superpages/src/bin/ls/ls.c#2 integrate .. //depot/projects/superpages/src/bin/ls/util.c#2 integrate .. //depot/projects/superpages/src/bin/rm/rm.1#2 integrate .. //depot/projects/superpages/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/superpages/src/bin/sh/builtins.def#2 integrate .. //depot/projects/superpages/src/bin/sh/eval.c#2 integrate .. //depot/projects/superpages/src/bin/sh/eval.h#2 integrate .. //depot/projects/superpages/src/bin/sh/exec.c#2 integrate .. //depot/projects/superpages/src/bin/sh/exec.h#2 integrate .. //depot/projects/superpages/src/bin/sh/jobs.c#2 integrate .. //depot/projects/superpages/src/bin/sh/memalloc.c#2 integrate .. //depot/projects/superpages/src/bin/sh/memalloc.h#2 integrate .. //depot/projects/superpages/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/superpages/src/bin/sh/options.c#2 integrate .. //depot/projects/superpages/src/bin/sh/output.c#2 integrate .. //depot/projects/superpages/src/bin/sh/sh.1#2 integrate .. //depot/projects/superpages/src/bin/sh/trap.c#2 integrate .. //depot/projects/superpages/src/contrib/bc/bc/main.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/superpages/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/superpages/src/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/superpages/src/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/superpages/src/contrib/bind9/FREEBSD-Xlist#2 integrate .. //depot/projects/superpages/src/contrib/bind9/README#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/superpages/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/config.threads.in#1 branch .. //depot/projects/superpages/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/superpages/src/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/superpages/src/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/superpages/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/print.c#2 integrate .. //depot/projects/superpages/src/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/superpages/src/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/superpages/src/contrib/bind9/version#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/superpages/src/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/superpages/src/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/superpages/src/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/superpages/src/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/superpages/src/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/superpages/src/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/superpages/src/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/superpages/src/contrib/cpio/src/global.c#2 integrate .. //depot/projects/superpages/src/contrib/cpio/src/main.c#2 integrate .. //depot/projects/superpages/src/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/superpages/src/contrib/groff/tmac/doc-common#3 integrate .. //depot/projects/superpages/src/contrib/groff/tmac/groff_mdoc.man#3 integrate .. //depot/projects/superpages/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/BSD/Makefile.ipsend#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/BSD/kupgrade#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/iplang/iplang_l.l#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsd/ipsd.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsd/ipsdr.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/arp.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/ip.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/ipresend.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/ipsopt.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/iptest.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/larp.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/sdlpi.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/slinux.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/snit.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipsend/tcpip.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/kmem.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/l4check/http.ok#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/addkeep.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/extras.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/genmask.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/getline.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/hostmask.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/hostnum.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/inet_addr.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/loglevel.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/make_range.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/natparse.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/parse.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/portnum.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ports.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/printproto.c#1 branch .. //depot/projects/superpages/src/contrib/ipfilter/lib/printstate.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ratoi.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/ratoui.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/tcpoptnames.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/to_interface.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/man/ipf.5#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/man/ipftest.1#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/man/ipnat.5#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/man/ipnat.8#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/mlfk_rule.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/opts.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/perl/ipf-mrtg.pl#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/perl/logfilter.pl#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.1#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.10#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.11#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.12#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.13#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.2#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.3#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.4#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.5#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.6#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.7#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.8#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.9#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/rules/example.sr#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/samples/ipfilter-pb.gif#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/samples/relay.c#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/snoop.h#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/dotest#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/bpf1#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/f17#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/f18#1 branch .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/f19#1 branch .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/f7#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/f9#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i12#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i14#2 integrate .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i16#1 branch .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i17#1 branch .. //depot/projects/superpages/src/contrib/ipfilter/test/expected/i18#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 25 02:28:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB3C916A420; Wed, 25 Jan 2006 02:28:54 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9506716A422 for ; Wed, 25 Jan 2006 02:28:54 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 272CE43D45 for ; Wed, 25 Jan 2006 02:28:54 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0P2SsBZ089873 for ; Wed, 25 Jan 2006 02:28:54 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0P2Srjv089870 for perforce@freebsd.org; Wed, 25 Jan 2006 02:28:53 GMT (envelope-from cognet@freebsd.org) Date: Wed, 25 Jan 2006 02:28:53 GMT Message-Id: <200601250228.k0P2Srjv089870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 90319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2006 02:28:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=90319 Change 90319 by cognet@cognet on 2006/01/25 02:27:55 Fix merge. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.c#10 edit .. //depot/projects/superpages/src/sys/vm/vm_page.h#4 edit .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#4 edit .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.c#10 (text+ko) ==== @@ -390,7 +390,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); --mem->hold_count; KASSERT(mem->hold_count >= 0, ("vm_page_unhold: hold count < 0!!!")); - if (mem->hold_count == 0 && VM_PAGE_INQUEUE2(mem, PQ_HOLD)) + if (mem->hold_count == 0 && mem->queue == PQ_HOLD) vm_page_free_toq(mem); } @@ -1230,7 +1230,7 @@ /* * Ignore if already inactive. */ - if (VM_PAGE_INQUEUE2(m, PQ_INACTIVE)) + if (m->queue == PQ_INACTIVE) return; if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) { if (m->queue == PQ_CACHE) @@ -1241,7 +1241,7 @@ TAILQ_INSERT_HEAD(&vm_page_queues[PQ_INACTIVE].pl, m, pageq); else TAILQ_INSERT_TAIL(&vm_page_queues[PQ_INACTIVE].pl, m, pageq); - VM_PAGE_SETQUEUE2(m, PQ_INACTIVE); + m->queue = PQ_INACTIVE; vm_page_queues[PQ_INACTIVE].lcnt++; cnt.v_inactive_count++; } ==== //depot/projects/superpages/src/sys/vm/vm_page.h#4 (text+ko) ==== @@ -159,22 +159,10 @@ int lcnt; }; -struct pq_coloring { - int numcolors; - int colormask; - int prime1; - int prime2; - int inactive; - int active; - int cache; - int hold; - int count; - int maxlength; -}; +extern struct vpgqueues vm_page_queues[PQ_COUNT]; +extern struct mtx vm_page_queue_free_mtx; -extern struct vpgqueues vm_page_queues[PQ_MAXCOUNT]; -extern struct mtx vm_page_queue_free_mtx; -extern struct pq_coloring page_queue_coloring; +#endif /* * These are the flags defined for vm_page. ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#4 (text+ko) ==== @@ -740,7 +740,7 @@ cnt.v_pdpages++; - if (VM_PAGE_GETQUEUE(m) != PQ_INACTIVE) { + if (m->queue != PQ_INACTIVE) { goto rescan0; } @@ -956,7 +956,7 @@ * reused for another vnode. The object might * have been reused for another vnode. */ - if (VM_PAGE_GETQUEUE(m) != PQ_INACTIVE || + if (m->queue != PQ_INACTIVE || m->object != object || object->handle != vp) { if (object->flags & OBJ_MIGHTBEDIRTY) ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#5 (text+ko) ==== @@ -52,89 +52,8 @@ #include -static void vm_coloring_init(void); -void setPQL2(int *const size, int *const ways); - -struct vpgqueues vm_page_queues[PQ_MAXCOUNT]; -struct pq_coloring page_queue_coloring; - -static int pq_cachesize = 0; /* size of the cache in KB */ -static int pq_cachenways = 0; /* associativity of the cache */ - -SYSCTL_DECL(_vm_stats); -SYSCTL_NODE(_vm_stats, OID_AUTO, pagequeue, CTLFLAG_RW, 0, "VM meter stats"); -SYSCTL_INT(_vm_stats_pagequeue, OID_AUTO, page_colors, CTLFLAG_RD, - &(PQ_NUMCOLORS), 0, "Number of colors in the page queue"); -SYSCTL_INT(_vm_stats_pagequeue, OID_AUTO, cachesize, CTLFLAG_RD, - &pq_cachesize, 0, "Size of the processor cache in KB"); -SYSCTL_INT(_vm_stats_pagequeue, OID_AUTO, cachenways, CTLFLAG_RD, - &pq_cachenways, 0, "Associativity of the processor cache"); -SYSCTL_INT(_vm_stats_pagequeue, OID_AUTO, prime1, CTLFLAG_RD, - &(PQ_PRIME1), 0, "Cache tuning value"); -SYSCTL_INT(_vm_stats_pagequeue, OID_AUTO, prime2, CTLFLAG_RD, - &(PQ_PRIME2), 0, "Cache tuning value"); - -static void -vm_coloring_init(void) -{ -#ifdef PQ_NOOPT - PQ_NUMCOLORS = PQ_PRIME1 = PQ_PRIME2 = 1; -#else - - setPQL2(&pq_cachesize, &pq_cachenways); - - CTASSERT(PAGE_SIZE/1024 > 0); - - if (pq_cachesize > 0 && pq_cachenways > 0) - PQ_NUMCOLORS = pq_cachesize / (PAGE_SIZE/1024) / \ - pq_cachenways; - else - PQ_NUMCOLORS = 32; - - if (PQ_MAXCOLORS < PQ_NUMCOLORS) { - printf("VM-PQ color limit (PQ_MAXCOLORS=%u) exceeded (%u), see vm_page.h", PQ_MAXCOLORS, PQ_NUMCOLORS); - PQ_NUMCOLORS = PQ_MAXCOLORS; - } +struct vpgqueues vm_page_queues[PQ_COUNT]; - if (PQ_NUMCOLORS >= 128) { - PQ_PRIME1 = 31; - PQ_PRIME2 = 23; - } else if (PQ_NUMCOLORS >= 64) { - PQ_PRIME1 = 13; - PQ_PRIME2 = 7; - } else if (PQ_NUMCOLORS >= 32) { - PQ_PRIME1 = 9; - PQ_PRIME2 = 5; - } else if (PQ_NUMCOLORS >= 16) { - PQ_PRIME1 = 5; - PQ_PRIME2 = 3; - } else - PQ_NUMCOLORS = PQ_PRIME1 = PQ_PRIME2 = 1; -#endif - - /* - * PQ_CACHE represents a - * PQ_NUMCOLORS consecutive queue. - */ - PQ_COLORMASK = PQ_NUMCOLORS - 1; - PQ_INACTIVE = 1 + PQ_NUMCOLORS; - PQ_ACTIVE = 2 + PQ_NUMCOLORS; - PQ_CACHE = 3 + PQ_NUMCOLORS; - PQ_HOLD = 3 + 2 * PQ_NUMCOLORS; - PQ_COUNT = 4 + 2 * PQ_NUMCOLORS; - PQ_MAXLENGTH = PQ_NUMCOLORS / 3 + PQ_PRIME1; - -#if 0 - /* XXX: is it possible to allocate vm_page_queues[PQ_COUNT] here? */ -#error XXX: vm_page_queues = malloc(PQ_COUNT * sizeof(struct vpgqueues)); -#endif - - if (bootverbose) - if (PQ_NUMCOLORS > 1) - printf("Using %d colors for the VM-PQ tuning (%d, %d)\n", - PQ_NUMCOLORS, pq_cachesize, pq_cachenways); -} - void vm_pageq_init(void) { @@ -156,7 +75,7 @@ void vm_pageq_requeue(vm_page_t m) { - int queue = VM_PAGE_GETQUEUE(m); + int queue = m->queue; struct vpgqueues *vpq; if (queue != PQ_NONE) { @@ -176,7 +95,7 @@ struct vpgqueues *vpq; vpq = &vm_page_queues[queue]; - VM_PAGE_SETQUEUE2(m, queue); + m->queue = queue; TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); ++*vpq->cnt; ++vpq->lcnt; @@ -244,12 +163,12 @@ void vm_pageq_remove_nowakeup(vm_page_t m) { - int queue = VM_PAGE_GETQUEUE(m); + int queue = m->queue; struct vpgqueues *pq; if (queue != PQ_NONE) { pq = &vm_page_queues[queue]; - VM_PAGE_SETQUEUE2(m, PQ_NONE); + m->queue = PQ_NONE; TAILQ_REMOVE(&pq->pl, m, pageq); (*pq->cnt)--; pq->lcnt--; @@ -267,11 +186,11 @@ void vm_pageq_remove(vm_page_t m) { - int queue = VM_PAGE_GETQUEUE(m); + int queue = m->queue; struct vpgqueues *pq; if (queue != PQ_NONE) { - VM_PAGE_SETQUEUE2(m, PQ_NONE); + m->queue = PQ_NONE; pq = &vm_page_queues[queue]; KASSERT((m->queue - m->buddyq) != PQ_BUDDY,("vm_pageq_remove: page is un buddy allocator")); TAILQ_REMOVE(&pq->pl, m, pageq); From owner-p4-projects@FreeBSD.ORG Wed Jan 25 23:19:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5630C16A424; Wed, 25 Jan 2006 23:19:00 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 1293916A420 for ; Wed, 25 Jan 2006 23:19:00 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE71543D53 for ; Wed, 25 Jan 2006 23:18:59 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0PNIxub095890 for ; Wed, 25 Jan 2006 23:18:59 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0PNIxca095887 for perforce@freebsd.org; Wed, 25 Jan 2006 23:18:59 GMT (envelope-from alc@freebsd.org) Date: Wed, 25 Jan 2006 23:18:59 GMT Message-Id: <200601252318.k0PNIxca095887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2006 23:19:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=90366 Change 90366 by alc@alc_home on 2006/01/25 23:18:09 Fix merge: opt_vmpage.h no longer exists in the superpage-enabled kernel. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#6 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#6 (text+ko) ==== @@ -28,8 +28,6 @@ #include __FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.22 2006/01/24 19:24:54 alc Exp $"); -#include "opt_vmpage.h" - #include #include #include From owner-p4-projects@FreeBSD.ORG Thu Jan 26 02:11:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A3DF16A423; Thu, 26 Jan 2006 02:11:04 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F290B16A420 for ; Thu, 26 Jan 2006 02:11:03 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7915D43D46 for ; Thu, 26 Jan 2006 02:11:03 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0Q2B3IV012191 for ; Thu, 26 Jan 2006 02:11:03 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0Q2B3Iw012188 for perforce@freebsd.org; Thu, 26 Jan 2006 02:11:03 GMT (envelope-from alc@freebsd.org) Date: Thu, 26 Jan 2006 02:11:03 GMT Message-Id: <200601260211.k0Q2B3Iw012188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 02:11:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=90376 Change 90376 by alc@alc_home on 2006/01/26 02:10:43 Merge the rewritten get_pv_entry(). It has to understand superpages. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#5 (text+ko) ==== @@ -1421,7 +1421,7 @@ static const struct timeval printinterval = { 60, 0 }; static struct timeval lastprint; struct vpgqueues *vpq; - pd_entry_t ptepde; + pd_entry_t *pde; pmap_t pmap; pt_entry_t *pte, tpte; pv_entry_t allocated_pv, next_pv, pv; @@ -1461,7 +1461,22 @@ else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) continue; pmap->pm_stats.resident_count--; - pte = pmap_pte_pde(pmap, va, &ptepde); + pde = pmap_pde(pmap, va); + if ((*pde & PG_PS) != 0 && + !pmap_demote(pmap, pde, va)) { + /* + * All mappings within the same 2mpage were + * destroyed and pv was freed. + */ + if (pmap != locked_pmap) + PMAP_UNLOCK(pmap); + if (allocated_pv == NULL) { + allocated_pv = uma_zalloc(pvzone, + M_NOWAIT); + } + continue; + } + pte = pmap_pde_to_pte(pde, va); tpte = pte_load_clear(pte); KASSERT((tpte & PG_W) == 0, ("get_pv_entry: wired pte %#lx", tpte)); @@ -1480,7 +1495,7 @@ if (TAILQ_EMPTY(&m->md.pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); m->md.pv_list_count--; - pmap_unuse_pt(pmap, va, ptepde); + pmap_unuse_pt(pmap, va, *pde); if (pmap != locked_pmap) PMAP_UNLOCK(pmap); if (allocated_pv == NULL) From owner-p4-projects@FreeBSD.ORG Thu Jan 26 06:00:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27D0A16A423; Thu, 26 Jan 2006 06:00:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DCA8116A420 for ; Thu, 26 Jan 2006 06:00:47 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82ACB43D46 for ; Thu, 26 Jan 2006 06:00:47 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0Q60lQS032069 for ; Thu, 26 Jan 2006 06:00:47 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0Q60kkn032061 for perforce@freebsd.org; Thu, 26 Jan 2006 06:00:46 GMT (envelope-from alc@freebsd.org) Date: Thu, 26 Jan 2006 06:00:46 GMT Message-Id: <200601260600.k0Q60kkn032061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 06:00:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=90389 Change 90389 by alc@alc_home on 2006/01/26 06:00:35 IFC @90388 Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/superpages/src/etc/services#2 integrate .. //depot/projects/superpages/src/include/printf.h#2 integrate .. //depot/projects/superpages/src/lib/Makefile#3 integrate .. //depot/projects/superpages/src/lib/libarchive/Makefile#5 integrate .. //depot/projects/superpages/src/lib/libarchive/archive_read_support_format_tp.c#2 integrate .. //depot/projects/superpages/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/superpages/src/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/superpages/src/lib/libc/stdio/xprintf.c#2 integrate .. //depot/projects/superpages/src/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/superpages/src/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/superpages/src/lib/libc/stdio/xprintf_vis.c#2 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/superpages/src/lib/libdisk/disk.c#2 integrate .. //depot/projects/superpages/src/lib/libdisk/libdisk.h#2 integrate .. //depot/projects/superpages/src/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/superpages/src/lib/libgssapi/gss_accept_sec_context.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_acquire_cred.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_add_cred.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_add_oid_set_member.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_canonicalize_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_compare_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_context_time.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_delete_sec_context.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_display_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_display_status.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_duplicate_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_export_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_export_sec_context.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_get_mic.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_import_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_import_sec_context.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_indicate_mechs.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_init_sec_context.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_inquire_context.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_inquire_cred.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_process_context_token.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_release_buffer.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_release_cred.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_release_name.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_release_oid_set.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_test_oid_set_member.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_unwrap.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_verify_mic.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_wrap.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gss_wrap_size_limit.3#2 integrate .. //depot/projects/superpages/src/lib/libgssapi/gssapi.3#2 integrate .. //depot/projects/superpages/src/lib/libutil/pty.c#2 integrate .. //depot/projects/superpages/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/superpages/src/release/doc/share/misc/dev.archlist.txt#4 integrate .. //depot/projects/superpages/src/sbin/rcorder/Makefile#2 integrate .. //depot/projects/superpages/src/share/man/man4/ata.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/pcm.4#4 integrate .. //depot/projects/superpages/src/share/man/man4/pty.4#2 integrate .. //depot/projects/superpages/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/superpages/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/superpages/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/superpages/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/superpages/src/sys/conf/files#7 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/superpages/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/superpages/src/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/superpages/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/superpages/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/superpages/src/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/superpages/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/superpages/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/superpages/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/superpages/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/superpages/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/superpages/src/sys/kern/tty_pts.c#1 branch .. //depot/projects/superpages/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/superpages/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/superpages/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/superpages/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/superpages/src/sys/sys/ktr.h#3 integrate .. //depot/projects/superpages/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/superpages/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/superpages/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/superpages/src/tools/tools/mfc/mfc.pl#2 integrate .. //depot/projects/superpages/www/en/donations/wantlist.sgml#6 integrate .. //depot/projects/superpages/www/en/platforms/arm.sgml#3 integrate .. //depot/projects/superpages/www/en/platforms/index.sgml#4 integrate .. //depot/projects/superpages/www/en/releases/5.4R/errata.html#3 integrate .. //depot/projects/superpages/www/en/releases/5.5R/Makefile#1 branch .. //depot/projects/superpages/www/en/releases/5.5R/approvals.sgml#1 branch .. //depot/projects/superpages/www/en/releases/5.5R/todo.sgml#1 branch .. //depot/projects/superpages/www/en/releases/6.0R/errata.html#2 integrate .. //depot/projects/superpages/www/en/releases/6.1R/Makefile#1 branch .. //depot/projects/superpages/www/en/releases/6.1R/approvals.sgml#1 branch .. //depot/projects/superpages/www/en/releases/6.1R/stress.xsl#1 branch .. //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#1 branch .. //depot/projects/superpages/www/en/releases/Makefile#2 integrate .. //depot/projects/superpages/www/share/sgml/advisories.xml#4 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -387,16 +387,8 @@ (Use cvs login and enter the password anoncvs when prompted.) + USA: anoncvs@anoncvs1.FreeBSD.org:/home/ncvs (ssh only - no ==== //depot/projects/superpages/src/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.102 2004/08/16 11:52:22 cperciva Exp $ +# $FreeBSD: src/etc/services,v 1.103 2006/01/25 17:37:15 maxim Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1917,6 +1917,8 @@ eppc 3031/udp #Remote AppleEvents/PPC Toolbox NSWS 3049/tcp NSWS 3049/udp +gds_db 3050/tcp #InterBase Database Remote Protocol +gds_db 3050/udp #InterBase Database Remote Protocol sj3 3086/tcp #SJ3 (kanji input) vmodem 3141/tcp vmodem 3141/udp ==== //depot/projects/superpages/src/include/printf.h#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/include/printf.h,v 1.1 2005/12/16 18:56:38 phk Exp $ + * $FreeBSD: src/include/printf.h,v 1.2 2006/01/25 12:45:24 phk Exp $ */ #ifndef _PRINTF_H_ @@ -124,16 +124,28 @@ int register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo); int register_printf_render_std(const unsigned char *specs); +/* vprintf_errno.c */ +printf_arginfo_function __printf_arginfo_errno; +printf_render __printf_render_errno; + /* vprintf_float.c */ printf_arginfo_function __printf_arginfo_float; printf_render __printf_render_float; +/* vprintf_hexdump.c */ +printf_arginfo_function __printf_arginfo_hexdump; +printf_render __printf_render_hexdump; + /* vprintf_int.c */ printf_arginfo_function __printf_arginfo_ptr; printf_arginfo_function __printf_arginfo_int; printf_render __printf_render_ptr; printf_render __printf_render_int; +/* vprintf_quoute.c */ +printf_arginfo_function __printf_arginfo_quote; +printf_render __printf_render_quote; + /* vprintf_str.c */ printf_arginfo_function __printf_arginfo_chr; printf_render __printf_render_chr; @@ -144,10 +156,6 @@ printf_arginfo_function __printf_arginfo_time; printf_render __printf_render_time; -/* vprintf_hexdump.c */ -printf_arginfo_function __printf_arginfo_hexdump; -printf_render __printf_render_hexdump; - /* vprintf_vis.c */ printf_arginfo_function __printf_arginfo_vis; printf_render __printf_render_vis; ==== //depot/projects/superpages/src/lib/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $ +# $FreeBSD: src/lib/Makefile,v 1.210 2006/01/25 11:24:37 cognet Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -26,7 +26,7 @@ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ - libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ + libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ @@ -68,10 +68,6 @@ _libc_r= .endif -.if ${MACHINE_ARCH} != "arm" -_libdisk= libdisk -.endif - .if ${MACHINE_ARCH} == "alpha" _libio= libio .endif ==== //depot/projects/superpages/src/lib/libarchive/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.44 2006/01/18 06:26:42 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.45 2006/01/26 05:28:56 kientzle Exp $ # This Makefile is for use with the FreeBSD buid system. For # non-FreeBSD systems, you should first "make distfile" on FreeBSD, @@ -68,6 +68,7 @@ archive_read_support_format_cpio.c \ archive_read_support_format_iso9660.c \ archive_read_support_format_tar.c \ + archive_read_support_format_tp.c \ archive_read_support_format_zip.c \ archive_string.c \ archive_string_sprintf.c \ ==== //depot/projects/superpages/src/lib/libarchive/archive_read_support_format_tp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tp.c,v 1.1 2006/01/17 03:40:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tp.c,v 1.2 2006/01/26 05:28:56 kientzle Exp $"); #include @@ -274,6 +274,7 @@ struct stat st; struct tp *tp; struct file_info *file; + const void *v; const char *p; ssize_t bytes_read; int r; @@ -283,8 +284,7 @@ /* Read the entire TOC first. */ if (!tp->toc_read) { /* Skip the initial block. */ - bytes_read = (a->compression_read_ahead)(a, - (const void **)&p, 512); + bytes_read = (a->compression_read_ahead)(a, &v, 512); if (bytes_read < 512) return (ARCHIVE_FATAL); bytes_read = 512; @@ -294,12 +294,13 @@ /* Consume TOC entries. */ do { bytes_read = (a->compression_read_ahead)(a, - (const void **)&p, tp->toc_size); + &v, tp->toc_size); if (bytes_read < tp->toc_size) return (ARCHIVE_FATAL); bytes_read = tp->toc_size; tp->current_position += bytes_read; (a->compression_read_consume)(a, bytes_read); + p = (const char *)v; file = (*tp->parse_file_info)(a, p); if (file != NULL) add_entry(tp, file); ==== //depot/projects/superpages/src/lib/libc/gen/getttyent.c#2 (text+ko) ==== @@ -35,19 +35,25 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.14 2006/01/26 01:34:26 cognet Exp $"); #include #include #include #include #include +#include +#include static char zapchar; static FILE *tf; +static int maxpts = 0; +static int curpts = 0; +static int pts_valid = 0; static size_t lbsize; static char *line; +#define PTS "pts/" #define MALLOCCHUNK 100 static char *skip(char *); @@ -73,6 +79,7 @@ getttyent() { static struct ttyent tty; + static char devpts_name[] = "pts/4294967295"; char *p; int c; size_t i; @@ -80,8 +87,19 @@ if (!tf && !setttyent()) return (NULL); for (;;) { - if (!fgets(p = line, lbsize, tf)) + if (!fgets(p = line, lbsize, tf)) { + if (pts_valid == 1 && curpts <= maxpts) { + sprintf(devpts_name, "pts/%d", curpts++); + tty.ty_name = devpts_name; + tty.ty_getty = tty.ty_type = NULL; + tty.ty_status = TTY_NETWORK; + tty.ty_window = NULL; + tty.ty_comment = NULL; + tty.ty_group = _TTYS_NOGROUP; + return (&tty); + } return (NULL); + } /* extend buffer if line was too big, and retry */ while (!index(p, '\n')) { i = strlen(p); @@ -209,12 +227,30 @@ int setttyent() { + DIR *devpts_dir; if (line == NULL) { if ((line = malloc(MALLOCCHUNK)) == NULL) return (0); lbsize = MALLOCCHUNK; } + devpts_dir = opendir(_PATH_DEV PTS); + if (devpts_dir) { + struct dirent *dp; + + while ((dp = readdir(devpts_dir))) { + if (strcmp(dp->d_name, ".") != 0 && + strcmp(dp->d_name, "..") != 0) { + if (atoi(dp->d_name) > maxpts) { + maxpts = atoi(dp->d_name); + pts_valid = 1; + curpts = 0; + } + } + } + closedir(devpts_dir); + } + printf("it is %d %d\n", maxpts, curpts); if (tf) { rewind(tf); return (1); @@ -228,6 +264,7 @@ { int rval; + pts_valid = 0; /* * NB: Don't free `line' because getttynam() * may still be referencing it ==== //depot/projects/superpages/src/lib/libc/stdio/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.34 2005/12/16 18:56:38 phk Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.35 2006/01/25 12:45:24 phk Exp $ # stdio sources .PATH: ${.CURDIR}/stdio @@ -24,7 +24,8 @@ wsetup.c SRCS+= xprintf.c xprintf_float.c xprintf_int.c xprintf_str.c -SRCS+= xprintf_hexdump.c xprintf_time.c xprintf_vis.c +SRCS+= xprintf_errno.c xprintf_hexdump.c xprintf_quote.c +SRCS+= xprintf_time.c xprintf_vis.c MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ flockfile.3 \ ==== //depot/projects/superpages/src/lib/libc/stdio/xprintf.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.1 2005/12/16 18:56:38 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.2 2006/01/25 12:45:24 phk Exp $ */ #include @@ -655,6 +655,16 @@ __printf_render_hexdump, __printf_arginfo_hexdump); break; + case 'M': + register_printf_render(*specs, + __printf_render_errno, + __printf_arginfo_errno); + break; + case 'Q': + register_printf_render(*specs, + __printf_render_quote, + __printf_arginfo_quote); + break; case 'T': register_printf_render(*specs, __printf_render_time, ==== //depot/projects/superpages/src/lib/libc/stdio/xprintf_vis.c#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/lib/libc/stdio/xprintf_vis.c,v 1.1 2005/12/16 18:56:39 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf_vis.c,v 1.2 2006/01/25 12:45:24 phk Exp $ */ #include @@ -54,6 +54,8 @@ ret = 0; p = *((char **)arg[0]); + if (p == NULL) + return (__printf_out(io, pi, "(null)", 6)); if (pi->prec >= 0) l = pi->prec; else ==== //depot/projects/superpages/src/lib/libc/stdlib/grantpt.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #include #ifndef lint -__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.4 2005/07/07 17:48:40 marcus Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.5 2006/01/26 01:33:55 cognet Exp $"); #endif /* not lint */ #include "namespace.h" @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include @@ -56,6 +58,8 @@ #define PTM_PREFIX "pty" /* pseudo tty master naming convention */ #define PTS_PREFIX "tty" /* pseudo tty slave naming convention */ +#define NEWPTS_PREFIX "pts/" +#define PTMX "ptmx" /* * The following are range values for pseudo TTY devices. Pseudo TTYs have a @@ -78,6 +82,29 @@ minor((x).st_rdev) >= 0 && \ minor((x).st_rdev) < PT_MAX) + +static int +is_pts(int fd) +{ + int nb; + + return (_ioctl(fd, TIOCGPTN, &nb) == 0); +} + +int +__use_pts(void) +{ + int use_pts; + size_t len; + int error; + + len = sizeof(use_pts); + error = sysctlbyname("kern.pts.enable", &use_pts, &len, NULL, 0); + if (error) + return (0); + return (use_pts); +} + /* * grantpt(): grant ownership of a slave pseudo-terminal device to the * current user. @@ -180,6 +207,10 @@ if (oflag & ~(O_RDWR | O_NOCTTY)) errno = EINVAL; else { + if (__use_pts()) { + fildes = _open(_PATH_DEV PTMX, oflag); + return (fildes); + } mc1 = master + strlen(_PATH_DEV PTM_PREFIX); mc2 = mc1 + 1; @@ -214,6 +245,7 @@ ptsname(int fildes) { static char slave[] = _PATH_DEV PTS_PREFIX "XY"; + static char new_slave[] = _PATH_DEV NEWPTS_PREFIX "4294967295"; char *retval; struct stat sbuf; @@ -223,11 +255,19 @@ if (!ISPTM(sbuf)) errno = EINVAL; else { - (void)snprintf(slave, sizeof(slave), - _PATH_DEV PTS_PREFIX "%s", - devname(sbuf.st_rdev, S_IFCHR) + - strlen(PTM_PREFIX)); - retval = slave; + if (!is_pts(fildes)) { + (void)snprintf(slave, sizeof(slave), + _PATH_DEV PTS_PREFIX "%s", + devname(sbuf.st_rdev, S_IFCHR) + + strlen(PTM_PREFIX)); + retval = slave; + } else { + (void)snprintf(new_slave, sizeof(new_slave), + _PATH_DEV NEWPTS_PREFIX "%s", + devname(sbuf.st_rdev, S_IFCHR) + + strlen(PTM_PREFIX)); + retval = new_slave; + } } } ==== //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#3 (text+ko) ==== @@ -136,7 +136,7 @@ #define MALLOC_DEBUG #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.103 2006/01/23 03:32:38 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.105 2006/01/25 05:41:02 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -303,12 +303,6 @@ */ uint64_t nfit; - /* - * Number of allocation requests that were successfully serviced by this - * bin, but that a smaller bin could have serviced. - */ - uint64_t noverfit; - /* High-water marks for this bin. */ unsigned long highcached; @@ -837,6 +831,7 @@ static void arena_large_cache(arena_t *arena, region_t *reg, bool lru); static void arena_lru_cache(arena_t *arena, region_t *reg); static void arena_delay_cache(arena_t *arena, region_t *reg); +static region_t *arena_frag_reg_alloc(arena_t *arena, size_t size, bool fit); static region_t *arena_split_reg_alloc(arena_t *arena, size_t size, bool fit); static void arena_reg_fit(arena_t *arena, size_t size, region_t *reg, bool restore_split); @@ -1190,7 +1185,6 @@ stats_arenas->bins[i].nrequests += arena->stats.bins[i].nrequests; stats_arenas->bins[i].nfit += arena->stats.bins[i].nfit; - stats_arenas->bins[i].noverfit += arena->stats.bins[i].noverfit; if (arena->stats.bins[i].highcached > stats_arenas->bins[i].highcached) { stats_arenas->bins[i].highcached @@ -1238,14 +1232,13 @@ stats_arenas->frag.nrequests, stats_arenas->frag.nserviced); malloc_printf("bins:\n"); - malloc_printf(" %4s%7s%13s%13s%13s%11s\n", "bin", - "size", "nrequests", "nfit", "noverfit", "highcached"); + malloc_printf(" %4s%7s%13s%13s%11s\n", "bin", + "size", "nrequests", "nfit", "highcached"); for (i = 0; i < NBINS; i++) { malloc_printf( - " %4u%7u%13llu%13llu%13llu%11lu\n", + " %4u%7u%13llu%13llu%11lu\n", i, ((i + bin_shift) << opt_quantum_2pow), stats_arenas->bins[i].nrequests, stats_arenas->bins[i].nfit, - stats_arenas->bins[i].noverfit, stats_arenas->bins[i].highcached); } @@ -1656,12 +1649,6 @@ if (bit != 0) { /* Usable allocation found. */ ret = (i * (sizeof(int) << 3)) + bit - 1; -#ifdef MALLOC_STATS - if (ret == minbin) - arena->stats.bins[minbin].nfit++; - else - arena->stats.bins[ret].noverfit++; -#endif goto RETURN; } } @@ -1765,7 +1752,7 @@ } } -/* Try to coalesce reg with its neighbors. Return NULL if coalescing fails. */ +/* Try to coalesce reg with its neighbors. Return false if coalescing fails. */ static bool arena_coalesce(arena_t *arena, region_t **reg, size_t size) { @@ -2134,6 +2121,16 @@ ret = qr_next(&tbin->regions, next.u.s.link); assert(region_next_size_get(&ret->sep) == ((bin + bin_shift) << opt_quantum_2pow)); + if (region_next_free_get(&ret->sep) == false) { + /* + * Use delayed regions in LIFO order, in order to increase + * locality of use, and thereby (hopefully) reduce + * fragmentation. + */ + ret = qr_prev(&tbin->regions, next.u.s.link); + assert(region_next_size_get(&ret->sep) + == ((bin + bin_shift) << opt_quantum_2pow)); + } qr_remove(ret, next.u.s.link); #ifdef MALLOC_STATS arena->stats.bins[bin].nregions--; @@ -2263,6 +2260,7 @@ >= QUANTUM_CEILING(sizeof(region_small_sizer_t))); size = region_next_size_get(®->sep); + assert(arena_coalesce(arena, ®, size) == false); if (size <= bin_maxsize) { arena_bin_append(arena, (size >> opt_quantum_2pow) - bin_shift, reg); @@ -2289,6 +2287,7 @@ assert(region_next_size_get(®->sep) >= QUANTUM_CEILING(sizeof(region_small_sizer_t))); assert(size == region_next_size_get(®->sep)); + assert(arena_coalesce(arena, ®, size) == false); if (size <= bin_maxsize) { arena_bin_push(arena, (size >> opt_quantum_2pow) - bin_shift, @@ -2431,16 +2430,48 @@ } } -static __inline region_t * +static region_t * arena_frag_reg_alloc(arena_t *arena, size_t size, bool fit) { region_t *ret; + size_t total_size +#ifdef MALLOC_DEBUG + = 0 /* for assert() below. */ +#endif + ; + bool refill; + /* + * Clear frag if it is too small to carve a maximally sized small + * region from. + */ + if (arena->frag != NULL) { + if ((total_size = region_next_size_get(&arena->frag->sep)) + < size && size <= bin_maxsize) { + region_t *reg; + + reg = arena->frag; + region_next_contig_set(®->sep); + + arena->frag = NULL; + + arena_delay_cache(arena, reg); + refill = true; + } else { + /* + * No need to refill. Note that total_size was set + * above. + */ + refill = false; + } + } else + refill = true; + /* * Try to fill frag if it's empty. Frag needs to be marked as * allocated. */ - if (arena->frag == NULL) { + if (refill) { region_node_t *node; node = RB_MIN(region_tree_s, &arena->large_regions); @@ -2456,101 +2487,109 @@ assert(region_next_free_get(&frag->sep)); region_next_free_unset(&frag->sep); - next = (region_t *)&((char *)frag)[region_next_size_get( - &frag->sep)]; + total_size = region_next_size_get(&frag->sep); + next = (region_t *)&((char *)frag)[total_size]; assert(region_prev_free_get(&next->sep)); region_prev_free_unset(&next->sep); arena->frag = frag; + } else { + unsigned bin; + + /* Look in bins for a large enough region. */ + if ((bin = arena_bins_search(arena, size)) + != UINT_MAX) { + /* Use the smallest available region. */ + arena->frag = arena_bin_pop(arena, bin); +#ifdef MALLOC_STATS + arena->stats.frag.ncached++; +#endif + total_size = + region_next_size_get(&arena->frag->sep); + assert(total_size >= size); + } else { + /* Unable to fill frag. */ + return (NULL); + } } } + assert(arena->frag != NULL); + /* total_size has been set in all possible paths that lead to here. */ + assert(total_size != 0); - if (arena->frag != NULL) { #ifdef MALLOC_STATS - arena->stats.frag.nrequests++; + arena->stats.frag.nrequests++; #endif - if (region_next_size_get(&arena->frag->sep) >= size) { - if (fit) { - size_t total_size; + if (total_size < size) { + /* + * Frag isn't large enough to service this request. Note that + * this is only possible for a large request, since the refill + * code always makes sure to refill frag if it's too small to + * service a current small request. + */ + assert(size > bin_maxsize); + return (NULL); + } - /* - * Use frag, but try to use the beginning for - * smaller regions, and the end for larger - * regions. This reduces fragmentation in some - * pathological use cases. It tends to group - * short-lived (smaller) regions, which - * increases the effectiveness of coalescing. - */ + if (fit) { + /* + * Use frag, but try to use the beginning for smaller regions, + * and the end for larger regions. This reduces fragmentation + * in some pathological use cases. It tends to group + * short-lived (smaller) regions, which increases the + * effectiveness of coalescing. + */ - total_size = - region_next_size_get(&arena->frag->sep); - assert(size % quantum == 0); + assert(size % quantum == 0); - if (total_size - size >= QUANTUM_CEILING( - sizeof(region_small_sizer_t))) { - if (size <= bin_maxsize) { - region_t *next; + if (total_size - size >= + QUANTUM_CEILING(sizeof(region_small_sizer_t))) { + if (size <= bin_maxsize) { + region_t *next; - /* - * Carve space from the - * beginning of frag. - */ + /* Carve space from the beginning of frag. */ - /* ret. */ - ret = arena->frag; - region_next_size_set(&ret->sep, - size); - assert(region_next_free_get( - &ret->sep) == false); + /* ret. */ + ret = arena->frag; + region_next_size_set(&ret->sep, size); + assert(region_next_free_get(&ret->sep) + == false); - /* next. */ - next = (region_t *)&((char *) - ret)[size]; - region_next_size_set(&next->sep, - total_size - size); - assert(size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - region_prev_free_unset( - &next->sep); - region_next_free_unset( - &next->sep); + /* next. */ + next = (region_t *)&((char *)ret)[size]; + region_next_size_set(&next->sep, + total_size - size); + assert(size >= QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + region_prev_free_unset(&next->sep); + region_next_free_unset(&next->sep); - /* Update frag. */ - arena->frag = next; - } else { - region_t *prev; - size_t prev_size; + /* Update frag. */ + arena->frag = next; + } else { + region_t *prev; + size_t prev_size; - /* - * Carve space from the end of - * frag. - */ + /* Carve space from the end of frag. */ - /* prev. */ - prev_size = total_size - size; - prev = arena->frag; - region_next_size_set(&prev->sep, - prev_size); - assert(prev_size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - assert(region_next_free_get( - &prev->sep) == false); + /* prev. */ + prev_size = total_size - size; + prev = arena->frag; + region_next_size_set(&prev->sep, prev_size); + assert(prev_size >= QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + assert(region_next_free_get(&prev->sep) + == false); - /* ret. */ - ret = (region_t *)&((char *) - prev)[prev_size]; - region_next_size_set(&ret->sep, - size); - region_prev_free_unset( - &ret->sep); - region_next_free_unset( - &ret->sep); + /* ret. */ + ret = (region_t *)&((char *)prev)[prev_size]; + region_next_size_set(&ret->sep, size); + region_prev_free_unset(&ret->sep); + region_next_free_unset(&ret->sep); #ifdef MALLOC_DEBUG - { + { region_t *next; /* next. */ @@ -2558,83 +2597,57 @@ [region_next_size_get(&ret->sep)]; assert(region_prev_free_get(&next->sep) == false); - } + } #endif - } + } #ifdef MALLOC_STATS - arena->stats.nsplit++; + arena->stats.nsplit++; #endif - } else { - /* - * frag is close enough to the right - * size that there isn't enough room to - * create a neighboring region. - */ + } else { + /* + * Frag is close enough to the right size that there + * isn't enough room to create a neighboring region. + */ - /* ret. */ - ret = arena->frag; - arena->frag = NULL; - assert(region_next_free_get(&ret->sep) - == false); + /* ret. */ + ret = arena->frag; + arena->frag = NULL; + assert(region_next_free_get(&ret->sep) == false); #ifdef MALLOC_DEBUG - { - region_t *next; + { + region_t *next; - /* next. */ - next = (region_t *)&((char *) - ret)[region_next_size_get( - &ret->sep)]; - assert(region_prev_free_get( - &next->sep) == false); - } + /* next. */ + next = (region_t *)&((char *)ret)[total_size]; + assert(region_prev_free_get(&next->sep) + == false); + } #endif - } + } #ifdef MALLOC_STATS - arena->stats.frag.nserviced++; + arena->stats.frag.nserviced++; #endif - } else { - /* Don't fit to the allocation size. */ + } else { + /* Don't fit to the allocation size. */ - /* ret. */ - ret = arena->frag; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 26 15:09:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 508B116A424; Thu, 26 Jan 2006 15:09:24 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C8B8A16A422 for ; Thu, 26 Jan 2006 15:09:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8961B43D46 for ; Thu, 26 Jan 2006 15:09: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.13.1/8.13.1) with ESMTP id k0QF9N7i077317 for ; Thu, 26 Jan 2006 15:09:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QF9N7R077312 for perforce@freebsd.org; Thu, 26 Jan 2006 15:09:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 26 Jan 2006 15:09:23 GMT Message-Id: <200601261509.k0QF9N7R077312@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 Cc: Subject: PERFORCE change 90406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 15:09:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=90406 Change 90406 by rwatson@rwatson_fledge on 2006/01/26 15:08:21 Since we don't want to list every copyright and license variation in the central license file, simply list a prototype license and refer consumers to specific files for details. Affected files ... .. //depot/projects/trustedbsd/openbsm/LICENSE#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/LICENSE#3 (text+ko) ==== @@ -1,41 +1,14 @@ -OpenBSM is covered by a number of copyrights, with two variants of the BSD -license depending on origination. The TrustedBSD Project would appreciate -the contribution of fixes and enhancements under identical of substantially -similar licenses. +OpenBSM is covered by a number of copyrights, with licenses being either two +or three clause BSD licenses. Individual file headers should be consulted +for specific copyrights on specific components. The TrustedBSD Project would +appreciate the contribution of fixes and enhancements under identical or +substantially similar licenses: - * Copyright (c) 2004 Apple Computer, Inc. + * Copyright (c) * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * * - * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRING LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - - * Copyright (c) 2005 SPARTA, Inc. - * All rights reserved. - * - * This code was developed in part by Robert N. M. Watson, Senior Principal - * Scientist, SPARTA, Inc. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -56,3 +29,4 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + From owner-p4-projects@FreeBSD.ORG Thu Jan 26 19:36:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FA7616A423; Thu, 26 Jan 2006 19:36:51 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2155416A420 for ; Thu, 26 Jan 2006 19:36:51 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E37F443D46 for ; Thu, 26 Jan 2006 19:36:50 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0QJaoXH000910 for ; Thu, 26 Jan 2006 19:36:50 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QJaoNp000907 for perforce@freebsd.org; Thu, 26 Jan 2006 19:36:50 GMT (envelope-from alc@freebsd.org) Date: Thu, 26 Jan 2006 19:36:50 GMT Message-Id: <200601261936.k0QJaoNp000907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 19:36:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=90416 Change 90416 by alc@alc_home on 2006/01/26 19:36:25 Replace calls to pmap_nw_modified() by assertions; pmap_nw_modified() no longer exists. Affected files ... .. //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#6 edit .. //depot/projects/superpages/src/sys/i386/i386/pmap.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -1590,13 +1590,9 @@ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME); va < eva; va += PAGE_SIZE, m++) { if (oldpde & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) oldpde)) { - printf( - "pmap_remove_pde: modified 2mpage not writable: va: 0x%lx, pde: 0x%lx\n", - va, oldpde); - } -#endif + KASSERT((oldpde & PG_RW) != 0, + ("pmap_remove_pde: modified 2mpage not writable: va: %#lx, pde: %#lx", + va, oldpde)); if (pmap_track_modified(va)) vm_page_dirty(m); } ==== //depot/projects/superpages/src/sys/i386/i386/pmap.c#5 (text+ko) ==== @@ -1605,13 +1605,9 @@ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME); va < eva; va += PAGE_SIZE, m++) { if (oldpde & PG_M) { -#if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) oldpde)) { - printf( - "pmap_remove_pde: modified 4mpage not writable: va: 0x%x, pde: 0x%x\n", - va, oldpde); - } -#endif + KASSERT((oldpde & PG_RW) != 0, + ("pmap_remove_pde: modified 4mpage not writable: va: %#x, pde: %#jx", + va, (uintmax_t)oldpde)); if (pmap_track_modified(va)) vm_page_dirty(m); } From owner-p4-projects@FreeBSD.ORG Thu Jan 26 19:46:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C9816A423; Thu, 26 Jan 2006 19:46:03 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8A98016A420 for ; Thu, 26 Jan 2006 19:46:03 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3730C43D45 for ; Thu, 26 Jan 2006 19:46:03 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0QJk3Bp001289 for ; Thu, 26 Jan 2006 19:46:03 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QJk2Q1001286 for perforce@freebsd.org; Thu, 26 Jan 2006 19:46:02 GMT (envelope-from alc@freebsd.org) Date: Thu, 26 Jan 2006 19:46:02 GMT Message-Id: <200601261946.k0QJk2Q1001286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 19:46:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=90417 Change 90417 by alc@alc_home on 2006/01/26 19:45:50 IFC @90416 Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/Makefile#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/faq/book.sgml#3 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/Makefile#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/book.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/geom/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/superpages/doc/zh_TW.Big5/share/mk/doc.local.mk#1 branch .. //depot/projects/superpages/doc/zh_TW.Big5/share/sgml/glossary/freebsd-glossary.sgml#2 integrate .. //depot/projects/superpages/src/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/superpages/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/superpages/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#3 integrate .. //depot/projects/superpages/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/superpages/src/sys/kern/vfs_aio.c#4 integrate .. //depot/projects/superpages/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/superpages/src/sys/modules/nwfs/Makefile#4 integrate .. //depot/projects/superpages/src/sys/modules/smbfs/Makefile#4 integrate .. //depot/projects/superpages/src/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_pppoe.c#3 integrate .. //depot/projects/superpages/src/sys/sys/param.h#4 integrate .. //depot/projects/superpages/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/superpages/www/en/community/mailinglists.sgml#4 integrate .. //depot/projects/superpages/www/en/news/status/Makefile#3 integrate .. //depot/projects/superpages/www/en/news/status/report-oct-2005-dec-2005.xml#1 branch .. //depot/projects/superpages/www/en/news/status/status.sgml#5 integrate .. //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#2 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#7 (text+ko) ==== @@ -1,4 +1,4 @@ - + 700013 + + 7-0.CURRENT after pts import. + 700014 + ==== //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 (text+ko) ==== @@ -1,15 +1,15 @@ - Networking Avanzado + Networking avanzado - Networking Avanzado + Networking avanzado Resumen @@ -29,7 +29,7 @@ Los conceptos básicos de pasarelas y - encaminadores (gateways y routers). + routers. @@ -122,7 +122,7 @@ - Pasarelas y Encaminadores + Pasarelas y <quote>routers</quote> routing gateway @@ -152,8 +152,8 @@ Ejemplo Para ilustrar diferentes aspectos del sistema de - encaminamiento veamos el siguiente ejemplo obtenido mediante el - comando netstat. + encaminamiento veamos el siguiente ejemplo obtenido mediante + netstat. &prompt.user; netstat -r Routing tables @@ -320,7 +320,7 @@ - Rutas por Defecto + Rutas por defecto default route Cuando el sistema local necesita realizar una conexión con @@ -333,7 +333,8 @@ Si todos los caminos conocidos fallan al sistema le queda una única opción: la ruta por defecto. Esta ruta está constituída por un tipo especial de - pasarela (normalmente el único encaminador presente en la red + pasarela (normalmente el único router + presente en la red área local) y siempre posée el flag c en el campo de flags. En una LAN, la pasarela es la máquina que posée @@ -342,7 +343,8 @@ Si se configura la ruta por defecto en una máquina que está actuando como pasarela hacia el mundo exterior - la ruta por defecto será el encaminador que se encuentre en + la ruta por defecto será el router + que se encuentre en posesión del proveedor de servicios de internet (ISP). Vamos a examinar un ejemplo que utiliza rutas por defecto. @@ -400,7 +402,7 @@ Una pregunta bastante frecuente es ¿Por qué (o cómo) hacer que la máquina - T1-GW sea el encaminador por defecto para + T1-GW sea el router por defecto para Local1 en vez de que sea el servidor del ISP al cual se está conectando?. @@ -450,7 +452,7 @@ defaultrouter="10.20.30.1" También se puede hacer directamente desde la línea - de comandos mediante &man.route.8;: + de órdenes mediante &man.route.8;: &prompt.root; route add default 10.20.30.1 @@ -460,7 +462,7 @@ - Máquinas con Doble Pertenencia (Dual Homed Hosts) + Máquinas con doble pertenencia (Dual Homed Hosts) dual homed hosts Existe otro tipo de configuración que debemos describir y que se produce cuando una máquina se sitúa en dos @@ -486,7 +488,8 @@ que cada subred sepa que la máquina es la pasarela definida definida (inbound route) para la otra subred. Ésta configuración en la que la máquina - actúa como encaminador entre las dos subredes se usa a menudo + actúa como router entre las dos subredes se + usa a menudo cuando queremos implementar filtrado de paquetes o cortafuegos seguridad en un sentido o en ambos. @@ -497,12 +500,12 @@ - Construcción de un Encaminador + Construcción de un <quote>route</quote> router - Un encaminador de red, también llamado pasarela o - router, es simplemente un sistema que reenvía + Un router de red, también llamado pasarela o + route, es simplemente un sistema que reenvía paquetes desde un interfaz hacia otro interfaz. Los estándares Internet y el sentido común aplicado a la ingeniería de redes impiden que FreeBSD incluya por defecto ésta @@ -515,11 +518,13 @@ Esta opción modificará la variable de &man.sysctl.8; net.inet.ip.forwarding al valor 1. Si en algún momento se necesita - detener el encaminador de forma temporal basta con asignar a dicha + detener el router de forma temporal basta con + asignar a dicha variable el valor 0. Consulte &man.sysctl.8; para más detalles. - Nuestro recién activado encaminador necesita rutas para + Nuestro recién activado router + necesita rutas para saber a dónde debe enviar el tráfico recibido. Si nuestra red es ña se pueden definir rutas estáticas. FreeBSD incluye por defecto el dæmon de encaminamiento BSD, @@ -537,7 +542,7 @@ Incluso cuando FreeBSD se configura del modo descrito no se cumple completamente con los estándares de Internet - respecto a los encaminadores de red. Bastará no obstante + respecto a los routers. Bastará no obstante para poder usarse. @@ -552,10 +557,10 @@ - Configuración de Rutas Estáticas + Configuración de rutas estáticas - Configuración Manual + Configuración manual Vamos a suponer que tenemos la siguiente topología de red: @@ -595,7 +600,8 @@ Esto es sencillo viendo nuestra topología de red, basta con añadir una ruta por defecto en la máquina RouterB utilizando - 192.168.1.1 como encaminador. + 192.168.1.1 como + router. Si observamos la tabla de rutas de RouterA veremos algo como lo siguiente: @@ -614,8 +620,8 @@ no es capaz de alcanzar la red interna 2. Esto es así porque no posee ninguna ruta para la red 192.168.2.0/24. Una forma de - mitigar esto es añadir de forma manual la ruta que falta. El - siguiente comando añade la red interna 2 a la tabla de rutas + mitigar esto es añadir de forma manual la ruta que falta. La + siguiente orden añade la red interna 2 a la tabla de rutas de la máquina RouterA utilizando 192.168.1.2 como siguiente salto: @@ -628,7 +634,7 @@ - Cómo Hacer la Configuración Persistente + Cómo hacer la configuración persistente El ejemplo anterior es perfecto en tanto que resuelve el problema de encaminamiento entre redes pero existe un problema. @@ -654,8 +660,8 @@ donde se escriben todos los parámetros de configuración que normalmente utilizaríamos normalmente utilizaríamos con &man.route.8;. - En el ejemplo que estamos comentando se utilizaría el - siguiente comando: + En el ejemplo que estamos comentando se utilizaría la + siguiente orden: &prompt.root; route add -net 192.168.2.0/24 192.168.1.2 @@ -679,7 +685,7 @@ - Propagación del Encaminamiento + Propagación de rutas routing propagation Ya hemos comentado cómo se definen las rutas para el mundo exterior pero no hemos comentado nada sobre cómo @@ -727,13 +733,13 @@ - Depuración de Problemas + Solución de problemas traceroute En algunas ocasiones surgen problemas con la propagación de las rutas y algunas organizaciones son incapaces de conectarse con - nuestra subred. Quizá el comando más útil para + nuestra subred. Quizá la orden más útil para averiguar dónde se está interrumpiendo el sistema de encaminamiento sea &man.traceroute.8;. Se puede usar también cuando somos nosotros los que no podemos alcanzar @@ -741,7 +747,7 @@ &man.traceroute.8; se ejecuta pasandole como parámetro el nombre de la máquina remota a la que nos queremos - conectar. El comando muestra por pantalla lás máquinas + conectar. Esta orden muestra por pantalla lás máquinas que actúan de pasarela a lo largo del camino. El proceso termina bien porque se alcanza el destino o bien porque algún router intermedio no puede conectarse con el siguiente @@ -752,7 +758,7 @@ - Encaminamiento Multicast + Rutas multicast multicast options MROUTING @@ -803,7 +809,7 @@ - Modos de Operación Wireless + Modos de operación Wireless Existen dos formas diferentes de configurar dispositivos wireless 802.11: BSS e IBSS. @@ -847,9 +853,9 @@ - Modo Infraestructura + Modo infraestructura - Puntos de Acceso + Puntos de acceso Los puntos de acceso son dispositivos de red wireless que funcionan de forma equivalente a los @@ -876,10 +882,10 @@ - Construcción de un Punto de Acceso basado en - FreeBSD + Construcción de un punto de acceso basado en + &os; wireless networking - Punto de Acceso + Punto de acceso Requisitos @@ -911,7 +917,7 @@ - Puesta en Marcha del Sistema + Puesta en marcha del sistema Primero debemos asegurarnos de que el sistema reconoce la tarjeta wireless: &prompt.root; ifconfig -a @@ -938,12 +944,12 @@ A continuación, para que podamos disponer de un bridge deberá cargar el módulo del kernel &man.bridge.4; por el sencillo procedimiento de - ejecutar el siguiente comando: + ejecutar la siguiente orden: &prompt.root; kldload bridge No debería aparecer mensaje de error alguno al ejecutar - dicho comando. Si apareciera alguno quizás deba compilar + dicha orden. Si apareciera alguno quizás deba compilar el kernel del sistema con &man.bridge.4; incluído. La sección Bridging de éste @@ -966,7 +972,7 @@ &prompt.root; sysctl net.inet.ip.forwarding=1 Ahora es el momento de configurar la tarjeta de red - inalámbrica. El siguiente comando convierte la tarjeta en + inalámbrica. La siguiente orden convierte la tarjeta en un punto de acceso: @@ -999,7 +1005,7 @@ - Información de Estado + Información de estado Una vez que el punto de acceso estáconfigurado resulta interesante poder obtener información acerca de los clientes que estén asociados. La persona encargada de la @@ -1048,7 +1054,7 @@ - Ejecución de un cliente inalámbrico FreeBSD + Ejecución de un cliente inalámbrico &os; Para utilizar una red inalámbrica se necesitan conocer algunos conceptos básicos de redes @@ -1160,8 +1166,8 @@ 0x1234567890 media DS/11Mbps mediaopt hostap - y en un cliente inalámbrico mediante el siguiente - comando: + y en un cliente inalámbrico mediante la siguiente + orden: &prompt.root; ifconfig wi0 inet 192.168.0.20 netmask 255.255.255.0 ssid mi_red wepmode on wepkey 0x1234567890 @@ -1212,9 +1218,9 @@ acceso dstumbler puede ser muy útil. Para probar la seguridad de la red inalámbrica se puede usar - dweputils, concretamente los comandos + dweputils, concretamente las órdenes dwepcrack, dwepdump y - dwepkeygen. Estos comandos permiten determinar hasta + dwepkeygen. Estas órdenes permiten determinar hasta qué punto la seguridad que ofrece WEP es suficiente para nuestras necesidades. @@ -1231,7 +1237,7 @@ ejemplo utiliza el interfaz wi0. Si se posée una tarjeta wireless de Cisco dicha tarjeta se mostrará en el sistema mediante el interfaz - an0 y por lo tanto el comando equivalente que se debe usar + an0 y por lo tanto la orden equivalente que se debe usar será &man.ancontrol.8;. @@ -1251,9 +1257,9 @@ - Tarjetas de Red Inalámbricas Soportadas + Tarjetas de Red inalámbricas soportadas - Puntos de Acceso + Puntos de acceso Las únicas tarjetas que soportan el modo de funcionamiento funcionamiento BSS (pueden funcionar como puntos de acceso) son los @@ -1323,7 +1329,7 @@ - Instalación del Dispositivo + Instalación del dispositivo Por defecto los controladores de los dispositivos Bluetooth se encuentran disponibles como módulos del kernel. Antes de enchufar el dispositivo Bluetooth se debe cargar el módulo @@ -1372,16 +1378,16 @@ HCI - Interfaz de la Controladora de la Máquina (HCI) + Interfaz de la controladora de la máquina (HCI) La interfaz de la Controladora de la Máquina (Host - Controller Interface) proporciona una interfaz de comandos + Controller Interface) proporciona una interfaz de órdenes para la controladora de banda base y para el gestor de enlace, y permite acceder al estado del hardware y a los registros de control. Esta interfaz proporciona una capa de acceso homogénea para todos los dispositivos Bluetooth de banda base. La capa HCI de la máquina intercambia - comandos y datos con el firmware del HCI presente en el + órdenes y datos con el firmware del HCI presente en el dispositivo Bluetooth. El driver de la capa de transporte de la controladora de la máquina (es decir, el driver del bus físico) proporciona @@ -1468,17 +1474,17 @@ Connection handle: 41 Reason: Connection terminated by local host [0x16] - Se ruega consultar la salida del comando + Se ruega consultar la salida de la orden hccontrol help para obtener un listado completo de - los comandos HCI que se encuentran disponibles. La mayoría de - éstos comandos no requiren privilegios de superusuario. + las órdenes HCI disponibles. La mayoría de + estas órdenes no requiren privilegios de superusuario. L2CAP - Protocolo de Adaptación y de Control de Enlace a - nivel Lógico (L2CAP) + Protocolo de adaptación y de control de enlace a + nivel lógico (L2CAP) El protocolo L2CAP (Logical Link Control and Adaptation Protocol) proporciona servicios de datos tanto orientados a @@ -1505,8 +1511,8 @@ Para obtener más detalles se ruega consultar la página del manual &man.ng.l2cap.4;. - Un comando muy útil es el &man.l2ping.8;, el cual se puede - utilizar para hacer ping a otros dispositivos. Algunas + &man.l2ping.8; le será muy útil para + hacer ping a otros dispositivos. Algunas implementaciones de Bluetooth no devuelven todos los datos que se envían, de tal forma que el valor 0 bytes que se observa a continuación es normal: @@ -1533,7 +1539,7 @@ 00:07:e0:00:0b:ca 41 O 0 OPEN Otra herramienta de diagnóstico interesante es - &man.btsockstat.1;. Realiza un trabajo similar al comando + &man.btsockstat.1;. Realiza un trabajo similar a la orden &man.netstat.1;, pero en este caso para las estructuras de datos relacionadas con el sistema Bluetooth. A continuación se muestra la información relativa a la misma conexión @@ -1587,7 +1593,7 @@ pairing - Enparejamiento de Dispositivos + Enparejamiento de dispositivos Por defecto, la comunicación Bluetooth no se valida, por lo que cualquier dispositivo puede en principio hablar con cualquier @@ -1657,7 +1663,8 @@ SDP - Protocolo de Descubrimiento de Servicios (SDP) + Protocolo de descubrimiento de servicios (SDP) + El Protocolo de Descubrimiento de Servicios (Service Discovery Protocol o SDP) permite a las aplicaciones cliente descubrir la existencia de diversos servicios @@ -1691,7 +1698,7 @@ browsing. El servidor Bluetooth SDP denominado &man.sdpd.8; y el cliente de - línea de comando denominado &man.sdpcontrol.8; se incluyen en + línea de órdenes &man.sdpcontrol.8; se incluyen en la instalación estándar de &os;. El siguiente ejemplo muestra cómo realizar una consulta de navegación una consulta de navegación SDP. @@ -1753,7 +1760,7 @@ - Acceso Telefónico a Redes (DUN) y Acceso a Redes mediante + <title>Acceso telefónico a redes (DUN) y acceso a redes mediante perfiles PPP (LAN) El perfil de Acceso Telefónico a Redes (Dial-Up Networking @@ -1789,7 +1796,7 @@ - En &os; ambos perfiles se implementan bajo los comandos + En &os; ambos perfiles se implementan bajo las órdenes &man.ppp.8; y &man.rfcomm.pppd.8;, un encapsulador que convierte la conexión RFCOMM de Bluetooth en algo que puede ser utilizado por PPP. Antes de que se puedan utilizar los perfiles se debe @@ -1804,7 +1811,7 @@ Networking). El número de canal RFCOMM se obtiene a partir del dispositivo remoto a través de SDP. Es posible especificar el canal RFCOMM a mano, en cuyo caso &man.rfcomm.pppd.8; no - realizará ninguna consulta SDP. Se puede utilizar el comando + realizará ninguna consulta SDP. Se puede utilizar la orden &man.sdpcontrol.8; para descubrir el canal RFCOMM utilizado en el dispositivo remoto. @@ -1882,7 +1889,7 @@ - Perfil de Puerto Serie (SP) + Perfil de puerto serie (SP) El perfil de puerto serie (Serial Port o SP) permite que dispositivos Bluetooth realicen emulación de RS232 (o similar). El escenario cubierto por este perfil trata con @@ -1897,7 +1904,7 @@ Observe que no necesita especificarse el canal RFCOMM: &man.rfcomm.sppd.1; puede obtenerlo del dispotivo remoto via SDP. Si necesita especificarlo por alguna razón - hágalo en la propia línea de comandos. + hágalo en la propia línea de órdenes. &prompt.root; rfcomm_sppd -a 00:07:E0:00:0B:CA -t /dev/ttyp6 rfcomm_sppd[94692]: Starting on /dev/ttyp6... @@ -1910,10 +1917,11 @@ - Depuración de Problemas + Solución de problemas Un dispositivo remoto no puede conectarse + Algunos dispositivos Bluetooh antiguos no soportan el cambio de cambio de roles. Por defecto, roles. Cuando &os; acepta una nueva conexión por defecto @@ -1984,7 +1992,7 @@ - Situaciones donde el Puenteado resulta adecuado + Situaciones donde el puenteado resulta adecuado Existen al menos dos situaciones típicas donde se puede utilizar la funcionalidad proporcionada por los @@ -1997,7 +2005,7 @@ La primera situación surge cuando nos encontramos con un segmento de red congestionado pero por las razones que sean no queremos subdividir la red e interconectar las nuevas subredes - mediante un encaminador. + mediante un route. Vamos a considerar un ejemplo de un periódico donde los departamentos editoriales y de producción utilizan la misma @@ -2021,7 +2029,7 @@ - Cortafuegos de Filtrado/Conformación de Tráfico + <title>Cortafuegos de filtrado/conformación de tráfico firewall network address @@ -2053,7 +2061,7 @@ - Configuración de un <quote>Bridge</quote> + Configuración de un <quote>bridge</quote> Selección de la interfaz de red @@ -2071,7 +2079,7 @@ - Cambios en la Configuración del Núcleo + Cambios en la configuración del núcleo kernel options options BRIDGE @@ -2087,7 +2095,7 @@ - Soporte de Cortafuegos + Soporte de cortafuegos firewall Si se desea utilizar el bridge como un cortafuegos, se debe añadir además la opción @@ -2109,7 +2117,7 @@ - Soporte de Conformado de Tráfico + Soporte de conformado de tráfico Si se quiere utilizar el bridge como un conformador de tráfico, es decir, como un elemento capaz de @@ -2123,7 +2131,7 @@ - Cómo Activar el <quote>Bridge</quote> + Cómo activar el <quote>bridge</quote> Añadir la línea: @@ -2154,7 +2162,7 @@ - Información Adicional + Información adicional Si queremos ser capaces de conectarnos al bridge mediante &man.telnet.1; se puede asignar una dirección IP a @@ -2171,7 +2179,7 @@ tree). Un bridge puede añadir latencia a los tiempos - de respuesta del comando &man.ping.8;, especialmente cuando + de respuesta de la orden &man.ping.8;, especialmente cuando el tráfico tiene que viajar de un segmento de red al otro. @@ -2238,7 +2246,7 @@ - Cómo Funciona <acronym>NFS</acronym> + Cómo funciona <acronym>NFS</acronym> El sistema NFS está dividido al menos en dos partes principales: un servidor y uno o más clientes. @@ -2312,7 +2320,7 @@ - Configuración de <acronym>NFS</acronym> + Configuración de <acronym>NFS</acronym> NFS configuration @@ -2463,8 +2471,8 @@ También se puede reiniciar FreeBSD para que se cargue la nueva configuración pero este mecanismo no resulta necesario - si se ejecutan los siguientes comandos como - root, los cuales ponen el servidor de + si se ejecutan las órdenes como + root, que ponen el servidor de NFS de nuevo en funcionamiento. En el servidor de NFS: @@ -2483,8 +2491,8 @@ server y el punto de montaje temporal utilizado por el cliente es client. Si se desea montar el sistema de ficheros de forma temporal o simplemente comprobar que la - configuración funciona sin problemas se puede ejecutar un - comando como el que se muestra a continuación con permisos + configuración funciona sin problemas se puede ejecutar una + orden como la que se muestra a continuación con permisos de root en la máquina cliente: @@ -2493,7 +2501,7 @@ &prompt.root; mount server:/home /mnt - Este comando ancla el directorio + Esta orden ancla el directorio /home del servidor en el directorio /mnt del cliente. Si todo funciona correctamente debería poder entrar en el directorio @@ -2512,7 +2520,7 @@ - Usos Prácticos + Usos prácticos El protocolo NFS tiene múltiples usos prácticos. Los más típicos se enumeran a @@ -2567,7 +2575,7 @@ - Anclajes Automáticos usando <application>amd</application> + Anclajes automáticos usando <application>amd</application> amd automatic mounter daemon @@ -2603,10 +2611,10 @@ anclado. - Anclaje de una Exportación utilizando + <title>Anclaje de una exportación utilizando <application>amd</application> - El comando showmount muestra los + showmount muestra los puntos de montaje que posee una máquina remota. Por ejemplo para conocer los montajes de un máquina llamada foobar, se puede utilizar: @@ -2618,7 +2626,7 @@ &prompt.user; cd /host/foobar/usr - Como se observa en el ejemplo, el comando + Como se observa en el ejemplo, showmount muestra el directorio /usr como una exportación. Cuando se cambia el directorio actual @@ -2661,7 +2669,7 @@ - Problemas de Integración con Otras Plataformas + Problemas de integración con otras plataformas Determinados adaptadores Ethernet para sistemas basados en el bus ISA poseen restricciones que pueden producir serios problemas @@ -2729,7 +2737,7 @@ fastws:/sfcompartido /projecto nfs rw,-r=1024 0 0 - Comando de ejecución manual para + Orden de ejecución manual para freebox: &prompt.root; mount -t nfs -o -r=1024 fastws:/sfcompartido /projecto @@ -2740,7 +2748,7 @@ freebox:/sfcompartido /projecto nfs rw,-w=1024 0 0 - Comando de ejecución manual para + Orden de ejecución manual para fastws: &prompt.root; mount -t nfs -o -w=1024 freebox:/sfcompartido /projecto @@ -2810,7 +2818,7 @@ - Ejecución sin Disco Duro + Ejecución sin disco duro diskless workstation diskless operation @@ -2926,7 +2934,7 @@ cambios producidos en las versiones 5.X. - Conocimientos Previos + Conocimientos previos Configurar estaciones de trabajo sin discos es una operación relativamente sencilla pero en la que pueden @@ -3047,10 +3055,10 @@ - Instrucciones de Configuración + Instrucciones de configuración - Configuración Utilizando <application>ISC + <title>Configuración utilizando <application>ISC DHCP</application> DHCP @@ -3206,7 +3214,7 @@ - Preparación de un Programa de Arranque con + <title>Preparación de un programa de arranque con <application>Etherboot</application> @@ -3264,7 +3272,7 @@ - Arrancar con <acronym>PXE</acronym> + Arranque con <acronym>PXE</acronym> Por defecto el cargador &man.pxeboot.8; carga, valga la redundancia, el kernel vía NFS. El @@ -3293,7 +3301,7 @@ - Configuración de Servidores de + <title>Configuración de servidores de <acronym>TFTP</acronym> y de <acronym>NFS</acronym> @@ -3387,8 +3395,8 @@ - Construcción de un Núcleo Sin - Disco + Construcción de un kernel sin + disco diskless operation @@ -3455,8 +3463,8 @@ - Preparación del Sistema de Ficheros - Raíz + Preparación del sistema de ficheros + raíz root file system @@ -3508,7 +3516,7 @@ - Utilización del Procedimiento Estándar de + <title>Utilización del procedimiento estándar de <command>make world</command> @@ -3532,8 +3540,8 @@ - Configuración de la Partición de - Intercambio + Configuración de la partición de + intercambio En caso de ser necesario se puede acceder a un fichero de intercambio (swap) a través del sistema @@ -3541,7 +3549,7 @@ típicamente utilizados para realizar esta tarea ha sido retirado de la distribución 5.X. - <acronym>NFS</acronym> Swap en sistemas &os; 4.X + <acronym>NFS</acronym> swap en sistemas &os; 4.X La ubicación del fichero de intercambio y su tamaño se puede especificar con las opciones @@ -3615,7 +3623,7 @@ - <acronym>NFS</acronym> Swap en &os 5.X + <acronym>NFS</acronym> swap en &os 5.X El núcleo no soporta la activación del intercambio a través de NFS en tiempo de @@ -3636,7 +3644,7 @@ - Cuestiones Variadas + Varios @@ -3655,12 +3663,12 @@ errores en el directorio /usr. - Utilización de un Servidor No-&os; + Uso de un servidor no-&os; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 26 20:38:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7BC016A423; Thu, 26 Jan 2006 20:38:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 8499116A420 for ; Thu, 26 Jan 2006 20:38:08 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07E7C43D5A for ; Thu, 26 Jan 2006 20:38:08 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0QKc7xk004359 for ; Thu, 26 Jan 2006 20:38:07 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QKc7JP004356 for perforce@freebsd.org; Thu, 26 Jan 2006 20:38:07 GMT (envelope-from cognet@freebsd.org) Date: Thu, 26 Jan 2006 20:38:07 GMT Message-Id: <200601262038.k0QKc7JP004356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 90422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 20:38:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=90422 Change 90422 by cognet@cognet on 2006/01/26 20:37:19 Remove use of VM_PAGE_INQUEUE2 in KASSERT() to get it to compile with INVARIANTS. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_contig.c#6 edit .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_contig.c#6 (text+ko) ==== @@ -143,7 +143,7 @@ if ((m->flags & PG_MARKER) != 0) continue; - KASSERT(VM_PAGE_INQUEUE2(m, queue), + KASSERT(m->queue == queue, ("vm_contig_launder: page %p's queue is not %d", m, queue)); error = vm_contig_launder_page(m); if (error == 0) ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#5 (text+ko) ==== @@ -1038,7 +1038,7 @@ while ((m != NULL) && (pcount-- > 0) && (page_shortage > 0)) { - KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE), + KASSERT(m->queue == PQ_ACTIVE, ("vm_pageout_scan: page %p isn't active", m)); next = TAILQ_NEXT(m, pageq); @@ -1309,7 +1309,7 @@ while ((m != NULL) && (pcount-- > 0)) { int actcount; - KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE), + KASSERT(m->queue == PQ_ACTIVE, ("vm_pageout_page_stats: page %p isn't active", m)); next = TAILQ_NEXT(m, pageq); From owner-p4-projects@FreeBSD.ORG Thu Jan 26 22:17:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 648E216A430; Thu, 26 Jan 2006 22:17:08 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C12E416A422 for ; Thu, 26 Jan 2006 22:17:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A72643D45 for ; Thu, 26 Jan 2006 22:16:31 +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.13.1/8.13.1) with ESMTP id k0QMGTZX016719 for ; Thu, 26 Jan 2006 22:16:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0QMFm9E016334 for perforce@freebsd.org; Thu, 26 Jan 2006 22:15:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 26 Jan 2006 22:15:48 GMT Message-Id: <200601262215.k0QMFm9E016334@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 Cc: Subject: PERFORCE change 90431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2006 22:17:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=90431 Change 90431 by rwatson@rwatson_zoo on 2006/01/26 22:14:43 Integrate TrustedBSD base branch from FreeBSD 7-CURRENT CVS: - Welcome to 2006. - BIND9 update to 9.3.2. - ipfilter 4.1.10. - GSSAPI. - Kernel firmware loader. - rc.d ipv4 address configuration. - tty_pts. - posix_memalign. - jemalloc. - CLOCK_UPTIME, fast/precise variants on CLOCK_foo. - Lots of Coverity bug fixes. - gvinum move, rename. - Complete migration to nmount(). - tz update. - drm update, agp update. - freebsd32_lutimes() and freebsd32_futimes(). - subr_lock.c breakout of common lock properties for rwlock. - POSIX 1003.1b message queues. - BPF JIT. - IP option code in ip_options.c - if_em transmit optimizations. - Usual plethora of driver updates, enhancements, bug fixes, etc. - COMPAT_43TTY. - VMARKER vnodes for mount vnode iteration. - kern_acct.c rewrite to avoid holding mutexes over sleeping operations. - kern_ktrace.c rewrite to write back records from returning system calls and traps instead of a separate worker thread. - zone_jumbo4 - msleep_spin() - taskqueue_start_threads() - vfs_aio.c MPSAFE - sosend_copyin() break out from sosend() - sosend_dgram() - unp_gc() takes place in task queue rather than close context, cleanup, rewrite. - 802.11 scan cleanup. - security.mac.biba.interfaces_equal. Affected files ... .. //depot/projects/trustedbsd/base/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/base/LOCKS#2 integrate .. //depot/projects/trustedbsd/base/MAINTAINERS#34 integrate .. //depot/projects/trustedbsd/base/Makefile#41 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#67 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#4 integrate .. //depot/projects/trustedbsd/base/UPDATING#60 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#14 integrate .. //depot/projects/trustedbsd/base/bin/kenv/kenv.1#5 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#30 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#27 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#15 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#13 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#13 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.h#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#19 integrate .. //depot/projects/trustedbsd/base/bin/sh/output.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#23 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bc/bc/main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/CHANGES#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/version#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#7 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/doc/cpio.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/doc/cpio.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/src/copyin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/src/copyout.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/src/copypass.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/src/extern.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/src/global.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cpio/src/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#18 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#15 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile.ipsend#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/kupgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_l.l#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_y.y#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/ipsd.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/ipsdr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/arp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ip.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipresend.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsopt.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptest.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/larp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/lsock.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/resend.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sdlpi.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/slinux.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/snit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/tcpip.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/l4check/http.ok#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addipopt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addkeep.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/binprint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/buildopts.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/checkrev.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/count4bits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/count6bits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/debug.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/extras.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/facpri.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/fill6bits.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/flags.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/genmask.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getline.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getnattype.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getproto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/hostmask.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/hostnum.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/inet_addr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/initparse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ionames.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_ef.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_hx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_pc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_sn.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_td.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipoptsec.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/kmem.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/kmem.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_hash.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_hashnode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_pool.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/load_poolnode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/loglevel.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/make_range.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/nat_setgroupmap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/natparse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optname.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optprintv6.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optvalue.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/parse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/portname.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/portnum.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ports.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/print_toif.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printactivenat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printaps.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printbuf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printfraginfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printhostmap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printhostmask.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printifname.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printip.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printmask.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printpacket.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printportcmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printproto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printstate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ratoi.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ratoui.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_hash.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_hashnode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_pool.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/remove_poolnode.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/tcp_flags.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/tcpflags.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/tcpoptnames.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/to_interface.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/v6ionames.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/v6optvalue.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/verbose.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipftest.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.5#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/mlfk_rule.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/opts.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/perl/ipf-mrtg.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/perl/logfilter.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix_ipf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.10#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.11#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.12#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.13#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.2#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.6#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.7#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.9#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.sr#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/ipfilter-pb.gif#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/relay.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/snoop.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/dotest#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/bpf1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f13#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f17#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f18#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f9#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i11#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i12#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i14#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i17#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i18#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i2#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i21#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i6#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i7#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i9#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in1#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in2#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n11#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/n7#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/p1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/p2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/p3#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f13#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f17#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f18#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f9#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/n14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni17#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/itest#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/natipftest#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/bpf1#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f13#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f18#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i11#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i12#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i14#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i16#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i17#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i18#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i2#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i21#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i6#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i7#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i9#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in2#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in6#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n13#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/n14#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni17.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/p2.ipf#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/vfycksum.pl#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/pf/authpf/authpf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/getmntopts.c#2 delete .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mntopts.h#3 delete .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/texindex.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/gssapi_locl.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#17 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#45 integrate .. //depot/projects/trustedbsd/base/etc/bluetooth/hosts#2 integrate .. //depot/projects/trustedbsd/base/etc/bluetooth/protocols#2 integrate .. //depot/projects/trustedbsd/base/etc/defaults/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#16 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#49 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#18 integrate .. //depot/projects/trustedbsd/base/etc/gettytab#5 integrate .. //depot/projects/trustedbsd/base/etc/gss/Makefile#1 branch .. //depot/projects/trustedbsd/base/etc/gss/mech#1 branch .. //depot/projects/trustedbsd/base/etc/gss/qop#1 branch .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#34 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#31 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#12 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#10 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11.dist#3 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#11 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/daily/470.status-named#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/portsnap.conf#2 integrate .. //depot/projects/trustedbsd/base/etc/rc#28 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#33 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/NETWORKING#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/addswap#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/bluetooth#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/cleanvar#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleartmp#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dumpon#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ftpd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/hcsecd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initrandom#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localpkg#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mixer#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/netif#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/newsyslog#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpd#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpdate#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pf#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/rcconf.sh#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/resolv#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/root#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sdpd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syslogd#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/tmp#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/usbd#4 delete .. //depot/projects/trustedbsd/base/etc/rc.firewall#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.initdiskless#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.shutdown#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#23 integrate .. //depot/projects/trustedbsd/base/etc/services#14 integrate .. //depot/projects/trustedbsd/base/etc/snmpd.config#2 integrate .. //depot/projects/trustedbsd/base/etc/usbd.conf#8 delete .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#45 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#7 integrate .. //depot/projects/trustedbsd/base/games/morse/Makefile#2 integrate .. //depot/projects/trustedbsd/base/games/morse/morse.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/main.c#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.1#11 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#27 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.man#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.c#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.man#7 integrate .. //depot/projects/trustedbsd/base/include/Makefile#50 integrate .. //depot/projects/trustedbsd/base/include/dlfcn.h#7 integrate .. //depot/projects/trustedbsd/base/include/gssapi.h#1 branch .. //depot/projects/trustedbsd/base/include/gssapi/Makefile#1 branch .. //depot/projects/trustedbsd/base/include/gssapi/gssapi.h#1 branch .. //depot/projects/trustedbsd/base/include/kenv.h#2 integrate .. //depot/projects/trustedbsd/base/include/mqueue.h#1 branch .. //depot/projects/trustedbsd/base/include/printf.h#1 branch .. //depot/projects/trustedbsd/base/include/rpcsvc/yp_prot.h#4 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#23 integrate .. //depot/projects/trustedbsd/base/include/string.h#13 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#24 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libgssapi/Makefile#9 integrate .. //depot/projects/trustedbsd/base/kerberos5/tools/asn1_compile/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#40 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/config.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.h#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/isc/isc/platform.h#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_fd.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tp.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive-formats.5#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/tar.5#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/Makefile#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#27 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/__xuname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_pthread_stubs.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlfcn.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ftw.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcap.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getosreldate.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getosreldate.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/nlist.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/uname.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/valloc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/moncontrol.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalnum.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isalpha.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isblank.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iscntrl.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isdigit.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isgraph.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/islower.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isprint.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ispunct.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isspace.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isupper.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isxdigit.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/tolower.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/toupper.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/if_indextoname.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet6_opt_init.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get_entry.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/posix1e.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/netconfig.5#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/publickey.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_svc_calls.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fread.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getc.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getwc.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/local.h#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#25 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_errno.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_float.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_hexdump.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_int.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_quote.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_str.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_time.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/xprintf_vis.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/a64l.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/calloc.c#4 delete .. //depot/projects/trustedbsd/base/lib/libc/stdlib/grantpt.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/l64a.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/posix_memalign.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/string/memmem.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#18 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/abort2.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_read.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_write.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/clock_gettime.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/intro.2#15 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/kse.2#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mmap.2#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/mq.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_close.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_getattr.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_notify.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_open.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_receive.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_send.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq_setattr.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/nfssvc.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/open.2#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/read.2#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rename.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rmdir.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sendfile.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigqueue.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/sigreturn.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigwait.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigwaitinfo.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/stat.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/statfs.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_create.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_delete.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/timer_settime.2#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/undelete.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/utimes.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/wait.2#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/write.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/uuid.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/Makefile#15 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#33 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.h#20 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_arm_disk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libedit/editline.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libedit/editrc.5#6 integrate .. //depot/projects/trustedbsd/base/lib/libedit/refresh.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/fetch.3#14 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libform/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libgeom/libgeom.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libgssapi/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/context.h#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/cred.h#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_accept_sec_context.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_accept_sec_context.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_acquire_cred.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_acquire_cred.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_cred.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_cred.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_oid_set_member.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_add_oid_set_member.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_canonicalize_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_canonicalize_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_compare_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_compare_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_context_time.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_context_time.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_create_empty_oid_set.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_create_empty_oid_set.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_delete_sec_context.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_delete_sec_context.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_status.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_display_status.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_duplicate_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_duplicate_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_sec_context.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_export_sec_context.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_get_mic.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_get_mic.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_sec_context.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_import_sec_context.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_indicate_mechs.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_indicate_mechs.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_init_sec_context.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_init_sec_context.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_context.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_context.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred_by_mech.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_cred_by_mech.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_mechs_for_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_mechs_for_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_names_for_mech.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_inquire_names_for_mech.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_krb5.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_mech_switch.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_names.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_process_context_token.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_process_context_token.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_buffer.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_buffer.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_cred.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_cred.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_name.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_name.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_oid_set.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_release_oid_set.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_seal.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_sign.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_test_oid_set_member.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_test_oid_set_member.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_unseal.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_unwrap.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_unwrap.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_utils.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_verify.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_verify_mic.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_verify_mic.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_wrap.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_wrap.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_wrap_size_limit.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gss_wrap_size_limit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/gssapi.3#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/mech.5#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/mech_switch.h#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/name.h#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/spnego.h#1 branch .. //depot/projects/trustedbsd/base/lib/libgssapi/utils.h#1 branch .. //depot/projects/trustedbsd/base/lib/libkvm/kvm.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libmagic/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md2.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md2c.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md4.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md4c.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libmd/md5c.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libmd/mdX.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libmd/mdXhl.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libmd/ripemd.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/rmd160c.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha0c.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha1c.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha256.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha256.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libmd/sha256c.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libmemstat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libmemstat/libmemstat.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libmemstat/memstat_uma.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libmenu/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libmp/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libncp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libnetgraph/msg.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpanel/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmclog.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_b.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/test/mutex_d.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fork.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#29 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libradius/Makefile#11 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libstand/libstand.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_attr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_create.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_detach.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_exit.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_fork.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 27 00:17:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B7F116A425; Fri, 27 Jan 2006 00:17:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4003516A422 for ; Fri, 27 Jan 2006 00:17:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD90343D45 for ; Fri, 27 Jan 2006 00:17:18 +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.13.1/8.13.1) with ESMTP id k0R0HIN9041000 for ; Fri, 27 Jan 2006 00:17:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R0H6JM040997 for perforce@freebsd.org; Fri, 27 Jan 2006 00:17:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 27 Jan 2006 00:17:06 GMT Message-Id: <200601270017.k0R0H6JM040997@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 Cc: Subject: PERFORCE change 90436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 00:17:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=90436 Change 90436 by rwatson@rwatson_zoo on 2006/01/27 00:16:11 Integrate TrustedBSD audit3 branch from TrustedBSD base branch; see @90431 for a list of merged changes. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/clock.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/promcons.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/alpha/trap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/audit3/sys/alpha/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/conf/NOTES#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/_types.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/atomic.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/cpu.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/cpuconf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/param.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/include/smp.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/isa/isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysvec.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/osf1/osf1_ioctl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/osf1/osf1_signal.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/apic_vector.S#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/cpu_switch.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/db_trace.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/gdb_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mptable.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_reg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_signal.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/_types.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/clock.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/cpu.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/frame.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/param.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/pcb.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/smp.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/clock.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/pci/pci_bus.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/bcopy_page.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/bcopyinout.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/cpufunc_asm_arm9.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/in_cksum_arm.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/inckern.S#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/arm/intr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/locore.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/support.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/trap.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/_types.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/armreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/cpu.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/frame.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/in_cksum.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/param.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/sa11x0_ost.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/files.i80321#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_space.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq80321.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/module.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/beastie.4th#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/biossmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/libi386.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/loader.rc#3 branch .. //depot/projects/trustedbsd/audit3/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/libofw.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/ofw_console.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/ofw_memory.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/ofw/libofw/openfirm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/biosdisk.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/libpc98/biosmem.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/pc98/loader/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_periph.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_ses.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_psdev.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vfsops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#8 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#9 edit .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.master#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/ndis_var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/pe_var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_hal.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_siginfo.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_signal.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_stat.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_termios.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_ttold.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_util.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.arm#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.i386#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.powerpc#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/Makefile.sparc64#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#11 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.alpha#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.arm#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.ia64#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.pc98#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.powerpc#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.sparc64#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/ldscript.arm#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#7 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.amd64#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#4 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.i386#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.pc98#5 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/systags.sh#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acapps.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acconfig.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acevents.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acexcep.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acgcc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acglobal.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acinterp.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acpiosxf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acpixf.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/actbl2.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslanalyze.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslcodegen.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslopcodes.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslopt.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asltransform.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbcmds.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbfileio.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbhistry.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbstats.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dbxface.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsfield.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsinit.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsobject.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dswload.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dswscope.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evgpe.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evregion.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evsci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evxface.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exconfig.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/excreate.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exdump.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exfield.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exfldio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exnames.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exoparg3.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exoparg6.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exresnte.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exstoren.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exstorob.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/hwacpi.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsaccess.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nseval.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsinit.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsobject.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nssearch.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsutils.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsxfeval.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/nsxfobj.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/osunixxf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psargs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psscope.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/pstree.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/pswalk.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsaddr.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rscreate.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsdump.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsirq.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rslist.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsmisc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/rsxface.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbrsdt.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbutils.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbxface.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utdebug.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/uteval.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utglobal.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utinit.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/oltr/if_oltr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/oltr/if_oltr_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/fil.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pflog.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_access.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_command.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/ddb/db_output.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_debug.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aac_tables.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aacreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdSynch.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_acad.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_battery.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_cmbat.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_hpet.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pcib.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pcib_acpi.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pcib_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_smbat.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_smbus.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_video.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpiio.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/advlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx_osm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx_osm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_disk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amrio.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amrvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/an/if_an.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/asr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/asr/dptsig.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-card.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-cbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-raid.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/atapi-tape.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bfe/if_bfe.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_card.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_card.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_tuner.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_tuner.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cp/cpddk.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ctau/if_ct.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/cy/cy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/dc/dcphy.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/dc/if_dcreg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/dc/pnphy.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/digi/digi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_sarea.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_drm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/mga_warp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r128_cce.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r128_drm.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r128_state.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r300_cmdbuf.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_drm.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_mem.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/radeon_state.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/sis_drm.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/sis_ds.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/sis_mm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/ax88x90reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ed/dl100xxreg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_rtl80x9.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_edreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/rtl80x9reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ed/tc5299jreg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/em/README#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/en/midway.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/exca/exca.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/boot_font.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/creator.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/fb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/gfb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/tga.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fb/vga.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fe/if_fe_pccard.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/00README#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hme/if_hmevar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/hptproc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hptmv/mvOs.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ic/i8259.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ie/if_ie_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iir/iir.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips_commands.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips_disk.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_inline.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispreg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgb/README#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ixgb/if_ixgb.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/joy/joy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lge/if_lgereg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lmc/if_lmc.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/lmc/if_lmc.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/lnc/if_lnc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/lnc/if_lnc_cbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/acphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/dcphy.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mii/exphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/lxtphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/mii_physubr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/nsgphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/pnaphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/pnphy.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/mii/qsphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/tdkphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/tlphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/ukphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/xmphy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_fc.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_lan.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_targ.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_debug.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/my/if_my.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nve/if_nvereg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_bus_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_bus_subr.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_bus_subr.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ofw/openfirm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/owi/if_ieee80211.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/dev/owi/if_owi.c#5 delete .. //depot/projects/trustedbsd/audit3/sys/dev/owi/if_owi_pccard.c#5 delete .. //depot/projects/trustedbsd/audit3/sys/dev/owi/if_wireg.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/owi/if_wivar.h#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_isa.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/hostb_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/pci/isa_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pci/vga_pci.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/pdq/if_fea.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pdq/if_fpa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppbus/pps.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/puc.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ral.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/nehemiah.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev_soft.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ray/if_ray.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/rc/rc.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/re/if_re.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/rp/rp.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/rp/rp_isa.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/rp/rp_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/rp/rpvar.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sab/sab.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sbni/if_sbni.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/si/si.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/si/si2_z280.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/si/si3_t225.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/si/si_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/si/sireg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sio/sio.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smb.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/snc/dp83932.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/snc/dp83932var.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/driver.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/ess.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/mss.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/als4000.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/csa.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/es137x.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via8233.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/via82c686.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/vibes.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_rate.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/mixer.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sndstat.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/usb/uaudio_pcm.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/speaker/speaker.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/speaker/spkr.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/sx/cd1865.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sx/sx.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sx/sx.h#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sx/sx_pci.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sx/sx_util.c#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sx/sx_util.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sx/sxvar.h#3 delete .. //depot/projects/trustedbsd/audit3/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scgfbrndr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scterm-sc.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_fwimg.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl_inline.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/twe/twe_freebsd.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/txp/if_txpreg.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus_ebus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus_pccard.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_core.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_cpu_alpha.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_cpu_amd64.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_cpu_i386.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_cpu_ia64.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_cpu_pc98.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_subr.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ehcivar.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_udavreg.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_uralreg.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/ohci_pci.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 27 00:17:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E513F16A43E; Fri, 27 Jan 2006 00:17:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7ABD516A423 for ; Fri, 27 Jan 2006 00:17:19 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28E8543D4C for ; Fri, 27 Jan 2006 00:17:19 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R0HJ6O041009 for ; Fri, 27 Jan 2006 00:17:19 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R0HI0Z041003 for perforce@freebsd.org; Fri, 27 Jan 2006 00:17:18 GMT (envelope-from scottl@freebsd.org) Date: Fri, 27 Jan 2006 00:17:18 GMT Message-Id: <200601270017.k0R0HI0Z041003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 90437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 00:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=90437 Change 90437 by scottl@scottl-junior on 2006/01/27 00:16:31 Begin restoring the newbus infrastructure for xenbus. Affected files ... .. //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#3 edit Differences ... ==== //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#3 (text+ko) ==== @@ -1051,8 +1051,33 @@ } #endif + +statuc void +xenhub_identify(driver_t *driver, device_t parent) +{ + device_t child; + + if (device_find_child(parent, "xenhub", 0) != NULL) + return; + + if ((child = BUS_ADD_CHILD(parent, 0, "xenhub", 0)) == NULL) { + device_printf(parent, "xenhub_identify failed\n"); + return; + } + + return; +} + +static int +xenhub_probe(device_t dev) +{ + + device_set_desc(dev, "Xen 3.0 Hub"); + return (0); +} + static int -xenbus_probe_sysinit(void *unused) +xenhub_attach(device_t dev) { int err = 0, dom0; @@ -1154,25 +1179,43 @@ return 0; } +static int +xenhub_suspend(device_t dev) +{ + + return (EINVAL); +} + +static int +xenhub_resume(device_t dev) +{ + + return (0); +} + +static int +xenhub_add_child(device_t parent, device_t child) +{ + + return (0); +} + SYSINIT(xenbus_probe_sysinit, SI_SUB_PSEUDO, SI_ORDER_FIRST, xenbus_probe_sysinit, NULL); -#if 0 -static device_method_t xenbus_methods[] = { +static device_method_t xenhub_methods[] = { /* Device interface */ -#if 0 - DEVMETHOD(device_identify, xenbus_identify), - DEVMETHOD(device_probe, xenbus_probe), - DEVMETHOD(device_attach, xenbus_attach), + DEVMETHOD(device_identify, xenhub_identify), + DEVMETHOD(device_probe, xenhub_probe), + DEVMETHOD(device_attach, xenhub_attach), DEVMETHOD(device_detach, bus_generic_detach), DEVMETHOD(device_shutdown, bus_generic_shutdown), -#endif - DEVMETHOD(device_suspend, xenbus_suspend), - DEVMETHOD(device_resume, xenbus_resume), + DEVMETHOD(device_suspend, xenhub_suspend), + DEVMETHOD(device_resume, xenhub_resume), /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_add_child, xenbus_add_child), + DEVMETHOD(bus_add_child, xenhub_add_child), DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), DEVMETHOD(bus_write_ivar, bus_generic_write_ivar), #if 0 @@ -1194,15 +1237,13 @@ static char driver_name[] = "xenbus"; static driver_t xenbus_driver = { - driver_name, - xenbus_methods, - sizeof(struct xenbus_device), + "xenhub", + xenhub_methods, + sizeof(struct xenhub_device), }; -devclass_t xenbus_devclass; +devclass_t xenhub_devclass; -DRIVER_MODULE(xenbus, nexus, xenbus_driver, xenbus_devclass, 0, 0); - -#endif +DRIVER_MODULE(xenhub, nexus, xenhub_driver, xenhub_devclass, 0, 0); /* * Local variables: From owner-p4-projects@FreeBSD.ORG Fri Jan 27 02:31:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2551916A423; Fri, 27 Jan 2006 02:31:03 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 E1A8E16A420 for ; Fri, 27 Jan 2006 02:31:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C36343D45 for ; Fri, 27 Jan 2006 02:31:02 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R2V2AE067024 for ; Fri, 27 Jan 2006 02:31:02 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R2V2MD067021 for perforce@freebsd.org; Fri, 27 Jan 2006 02:31:02 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 02:31:02 GMT Message-Id: <200601270231.k0R2V2MD067021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 02:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=90443 Change 90443 by alc@alc_home on 2006/01/27 02:30:26 Utilize the new VM_PAGE_*() macros to minimize the differences with HEAD. Affected files ... .. //depot/projects/superpages/src/sys/kern/vfs_bio.c#5 edit .. //depot/projects/superpages/src/sys/vm/vm_contig.c#7 edit .. //depot/projects/superpages/src/sys/vm/vm_fault.c#4 edit .. //depot/projects/superpages/src/sys/vm/vm_page.c#11 edit .. //depot/projects/superpages/src/sys/vm/vm_page.h#5 edit .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#6 edit .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#7 edit Differences ... ==== //depot/projects/superpages/src/sys/kern/vfs_bio.c#5 (text+ko) ==== @@ -2864,7 +2864,7 @@ * page daemon? */ if ((curproc != pageproc) && - m->queue == PQ_CACHE && + (VM_PAGE_INQUEUE1(m, PQ_CACHE)) && ((cnt.v_free_count + cnt.v_cache_count) < (cnt.v_free_min + cnt.v_cache_min))) { pagedaemon_wakeup(); ==== //depot/projects/superpages/src/sys/vm/vm_contig.c#7 (text+ko) ==== @@ -143,7 +143,7 @@ if ((m->flags & PG_MARKER) != 0) continue; - KASSERT(m->queue == queue, + KASSERT(VM_PAGE_INQUEUE2(m, queue), ("vm_contig_launder: page %p's queue is not %d", m, queue)); error = vm_contig_launder_page(m); if (error == 0) ==== //depot/projects/superpages/src/sys/vm/vm_fault.c#4 (text+ko) ==== @@ -1010,7 +1010,7 @@ (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { vm_page_lock_queues(); - if (m->queue == PQ_CACHE) + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) vm_page_deactivate(m); mpte = pmap_enter_quick(pmap, addr, m, entry->protection, mpte); ==== //depot/projects/superpages/src/sys/vm/vm_page.c#11 (text+ko) ==== @@ -390,7 +390,7 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); --mem->hold_count; KASSERT(mem->hold_count >= 0, ("vm_page_unhold: hold count < 0!!!")); - if (mem->hold_count == 0 && mem->queue == PQ_HOLD) + if (mem->hold_count == 0 && VM_PAGE_INQUEUE2(mem, PQ_HOLD)) vm_page_free_toq(mem); } @@ -465,7 +465,7 @@ void vm_page_dirty(vm_page_t m) { - KASSERT(m->queue != PQ_CACHE, + KASSERT(VM_PAGE_GETKNOWNQUEUE1(m) != PQ_CACHE, ("vm_page_dirty: page in cache!")); KASSERT((m->queue - m->buddyq) != PQ_BUDDY, ("vm_page_dirty: page is free!")); @@ -715,7 +715,7 @@ vm_page_remove(m); vm_page_insert(m, new_object, new_pindex); - if (m->queue == PQ_CACHE) + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) vm_page_deactivate(m); vm_page_dirty(m); } @@ -966,8 +966,8 @@ { mtx_assert(&vm_page_queue_mtx, MA_OWNED); - if (m->queue != PQ_ACTIVE) { - if (m->queue == PQ_CACHE) + if (VM_PAGE_GETKNOWNQUEUE2(m) != PQ_ACTIVE) { + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) cnt.v_reactivated++; vm_pageq_remove(m); if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) { @@ -1230,7 +1230,7 @@ /* * Ignore if already inactive. */ - if (m->queue == PQ_INACTIVE) + if (VM_PAGE_INQUEUE2(m, PQ_INACTIVE)) return; if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) { if (m->queue == PQ_CACHE) @@ -1241,7 +1241,7 @@ TAILQ_INSERT_HEAD(&vm_page_queues[PQ_INACTIVE].pl, m, pageq); else TAILQ_INSERT_TAIL(&vm_page_queues[PQ_INACTIVE].pl, m, pageq); - m->queue = PQ_INACTIVE; + VM_PAGE_SETQUEUE2(m, PQ_INACTIVE); vm_page_queues[PQ_INACTIVE].lcnt++; cnt.v_inactive_count++; } @@ -1317,7 +1317,7 @@ printf("vm_page_cache: attempting to cache busy page\n"); return; } - if (m->queue == PQ_CACHE) + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) return; /* @@ -1369,8 +1369,9 @@ * occassionally leave the page alone */ if ((dnw & 0x01F0) == 0 || - m->queue == PQ_INACTIVE || - m->queue == PQ_CACHE) { + VM_PAGE_INQUEUE2(m, PQ_INACTIVE) || + VM_PAGE_INQUEUE1(m, PQ_CACHE) + ) { if (m->act_count >= ACT_INIT) --m->act_count; return; ==== //depot/projects/superpages/src/sys/vm/vm_page.h#5 (text+ko) ==== @@ -153,6 +153,24 @@ #define PQ_HOLD (4 + BUDDY_QUEUES) #define PQ_COUNT (5 + BUDDY_QUEUES) +/* Returns the real queue a page is on. */ +#define VM_PAGE_GETQUEUE(m) ((m)->queue) + +/* Returns the well known queue a page is on. */ +#define VM_PAGE_GETKNOWNQUEUE1(m) ((m)->queue) +#define VM_PAGE_GETKNOWNQUEUE2(m) VM_PAGE_GETQUEUE(m) + +/* Given the real queue number and a page color return the well know queue. */ +#define VM_PAGE_RESOLVEQUEUE(m, q) ((q)) + +/* Returns true if the page is in the named well known queue. */ +#define VM_PAGE_INQUEUE1(m, q) (VM_PAGE_GETKNOWNQUEUE1(m) == (q)) +#define VM_PAGE_INQUEUE2(m, q) (VM_PAGE_GETKNOWNQUEUE2(m) == (q)) + +/* Sets the queue a page is on. */ +#define VM_PAGE_SETQUEUE1(m, q) (VM_PAGE_GETQUEUE(m) = (q)) +#define VM_PAGE_SETQUEUE2(m, q) (VM_PAGE_GETQUEUE(m) = (q)) + struct vpgqueues { struct pglist pl; int *cnt; ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#6 (text+ko) ==== @@ -740,7 +740,7 @@ cnt.v_pdpages++; - if (m->queue != PQ_INACTIVE) { + if (VM_PAGE_GETQUEUE(m) != PQ_INACTIVE) { goto rescan0; } @@ -956,7 +956,7 @@ * reused for another vnode. The object might * have been reused for another vnode. */ - if (m->queue != PQ_INACTIVE || + if (VM_PAGE_GETQUEUE(m) != PQ_INACTIVE || m->object != object || object->handle != vp) { if (object->flags & OBJ_MIGHTBEDIRTY) @@ -1038,7 +1038,7 @@ while ((m != NULL) && (pcount-- > 0) && (page_shortage > 0)) { - KASSERT(m->queue == PQ_ACTIVE, + KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE), ("vm_pageout_scan: page %p isn't active", m)); next = TAILQ_NEXT(m, pageq); @@ -1309,7 +1309,7 @@ while ((m != NULL) && (pcount-- > 0)) { int actcount; - KASSERT(m->queue == PQ_ACTIVE, + KASSERT(VM_PAGE_INQUEUE2(m, PQ_ACTIVE), ("vm_pageout_page_stats: page %p isn't active", m)); next = TAILQ_NEXT(m, pageq); ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#7 (text+ko) ==== @@ -73,7 +73,7 @@ void vm_pageq_requeue(vm_page_t m) { - int queue = m->queue; + int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *vpq; if (queue != PQ_NONE) { @@ -93,7 +93,7 @@ struct vpgqueues *vpq; vpq = &vm_page_queues[queue]; - m->queue = queue; + VM_PAGE_SETQUEUE2(m, queue); TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); ++*vpq->cnt; ++vpq->lcnt; @@ -161,12 +161,12 @@ void vm_pageq_remove_nowakeup(vm_page_t m) { - int queue = m->queue; + int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *pq; if (queue != PQ_NONE) { pq = &vm_page_queues[queue]; - m->queue = PQ_NONE; + VM_PAGE_SETQUEUE2(m, PQ_NONE); TAILQ_REMOVE(&pq->pl, m, pageq); (*pq->cnt)--; pq->lcnt--; @@ -184,11 +184,11 @@ void vm_pageq_remove(vm_page_t m) { - int queue = m->queue; + int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *pq; if (queue != PQ_NONE) { - m->queue = PQ_NONE; + VM_PAGE_SETQUEUE2(m, PQ_NONE); pq = &vm_page_queues[queue]; KASSERT((m->queue - m->buddyq) != PQ_BUDDY,("vm_pageq_remove: page is un buddy allocator")); TAILQ_REMOVE(&pq->pl, m, pageq); From owner-p4-projects@FreeBSD.ORG Fri Jan 27 02:42:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29EC916A424; Fri, 27 Jan 2006 02:42:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D352416A420 for ; Fri, 27 Jan 2006 02:42:16 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87D8043D45 for ; Fri, 27 Jan 2006 02:42:16 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R2gGFF067519 for ; Fri, 27 Jan 2006 02:42:16 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R2gG83067516 for perforce@freebsd.org; Fri, 27 Jan 2006 02:42:16 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 02:42:16 GMT Message-Id: <200601270242.k0R2gG83067516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 02:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=90444 Change 90444 by alc@alc_home on 2006/01/27 02:42:13 Utilize the new VM_PAGE_*() macros to minimize the differences with HEAD. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.c#12 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.c#12 (text+ko) ==== @@ -1233,7 +1233,7 @@ if (VM_PAGE_INQUEUE2(m, PQ_INACTIVE)) return; if (m->wire_count == 0 && (m->flags & PG_UNMANAGED) == 0) { - if (m->queue == PQ_CACHE) + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) cnt.v_reactivated++; vm_page_flag_clear(m, PG_WINATCFLS); vm_pageq_remove(m); From owner-p4-projects@FreeBSD.ORG Fri Jan 27 02:45:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 560B816A423; Fri, 27 Jan 2006 02:45:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 15A5716A422 for ; Fri, 27 Jan 2006 02:45:22 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4729E43D46 for ; Fri, 27 Jan 2006 02:45:21 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R2jLgh067771 for ; Fri, 27 Jan 2006 02:45:21 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R2jKaE067768 for perforce@freebsd.org; Fri, 27 Jan 2006 02:45:20 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 02:45:20 GMT Message-Id: <200601270245.k0R2jKaE067768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 02:45:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=90446 Change 90446 by alc@alc_home on 2006/01/27 02:44:45 IFC @90444 Affected files ... .. //depot/projects/superpages/src/include/nl_types.h#2 integrate .. //depot/projects/superpages/src/include/stdio.h#2 integrate .. //depot/projects/superpages/src/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/superpages/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/superpages/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/superpages/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/superpages/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/superpages/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/superpages/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/superpages/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/fhc/fhc_central.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/fhc/fhc_nexus.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/superpages/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/superpages/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/superpages/www/en/donations/wantlist.sgml#7 integrate .. //depot/projects/superpages/www/en/news/news.xml#6 integrate .. //depot/projects/superpages/www/en/news/status/report-oct-2005-dec-2005.xml#2 integrate Differences ... ==== //depot/projects/superpages/src/include/nl_types.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $ + * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _NL_TYPES_H_ @@ -97,8 +97,7 @@ __BEGIN_DECLS nl_catd catopen(const char *, int); -char *catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char *catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS ==== //depot/projects/superpages/src/include/stdio.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _STDIO_H_ @@ -328,12 +328,7 @@ int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); char *fgetln(FILE *, size_t *); -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3 -#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2))) -#else -#define __ATTR_FORMAT_ARG -#endif -__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; +__const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); ==== //depot/projects/superpages/src/sbin/dhclient/dhclient-script#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ -# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.13 2006/01/24 06:11:55 brooks Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.14 2006/01/26 21:05:39 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback # @@ -135,7 +135,7 @@ # thus broke the script. This code creates the resolv.conf if either # are provided. - local tmpres=${TMPDIR:-/tmp}/resolv.conf.std + local tmpres=/var/run/resolv.conf.${interface} rm -f $tmpres if [ -n "$new_domain_name" ]; then ==== //depot/projects/superpages/src/sys/compat/linux/linux_stats.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.73 2006/01/26 01:32:46 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.74 2006/01/26 21:48:50 cognet Exp $"); #include "opt_mac.h" @@ -137,7 +137,7 @@ && path[9] >= '0' && path[9] <= '9') { /* * Linux checks major and minors of the slave device to make - * sure it's a pty deivce, so let's make him believe it is. + * sure it's a pty device, so let's make him believe it is. */ buf.st_rdev = (136 << 8); } ==== //depot/projects/superpages/src/sys/dev/amr/amr.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.73 2006/01/14 17:59:28 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.74 2006/01/26 22:39:12 ambrisko Exp $"); /* * Driver for the AMI MegaRaid family of controllers. @@ -2220,7 +2220,7 @@ { int worked, i; u_int32_t outd; - u_int8_t nstatus ,status; + u_int8_t nstatus; u_int8_t completed[46]; debug_called(3); @@ -2244,16 +2244,11 @@ sc->amr_mailbox->mb_completed[i] = 0xff; } - /* this should never happen, someone screwed up the completion status */ - if ((status = sc->amr_mailbox->mb_status) == 0xff) { - device_printf(sc->amr_dev, "status 0xff from the firmware\n"); - return (worked); - } + /* Save information for later processing */ + mbsave->mb_nstatus = nstatus; + mbsave->mb_status = sc->amr_mailbox->mb_status; sc->amr_mailbox->mb_status = 0xff; - /* Save information for later processing */ - mbsave->mb_nstatus = nstatus; - mbsave->mb_status = status; for (i = 0; i < nstatus; i++) mbsave->mb_completed[i] = completed[i]; ==== //depot/projects/superpages/src/sys/dev/an/if_an.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.76 2006/01/15 12:09:03 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.77 2006/01/26 19:55:29 njl Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -88,6 +88,7 @@ #endif #include +#include #include #include #include @@ -1593,9 +1594,7 @@ printf("%02x ", *ptr2); temp = *ptr2++; - if (temp >= ' ' && temp <= '~') - buf[count] = temp; - else if (temp >= 'A' && temp <= 'Z') + if (isprint(temp)) buf[count] = temp; else buf[count] = '.'; ==== //depot/projects/superpages/src/sys/dev/isp/isp_freebsd.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.81 2006/01/23 06:23:37 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.82 2006/01/27 00:46:10 mjacob Exp $ */ /*- * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * @@ -74,6 +74,13 @@ #define ISP_SBUS_SUPPORTED 0 #endif +/* + * Hackery- remove TARGET MODE when compiling as a module on sparc64 + */ +#if defined(__sparc64__) && defined(KLD_MODULE) && defined(ISP_TARGET_MODE) +#undef ISP_TARGET_MODE +#endif + #define HANDLE_LOOPSTATE_IN_OUTER_LAYERS 1 /* #define ISP_SMPLOCK 1 */ ==== //depot/projects/superpages/src/sys/dev/sound/pci/solo.c#3 (text+ko) ==== @@ -33,13 +33,13 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.37 2006/01/06 05:04:18 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.38 2006/01/27 02:01:27 ariff Exp $"); #define SOLO_DEFAULT_BUFSZ 16384 #define ABS(x) (((x) < 0)? -(x) : (x)) /* if defined, playback always uses the 2nd channel and full duplex works */ -#undef ESS18XX_DUPLEX +#define ESS18XX_DUPLEX 1 /* more accurate clocks and split audio1/audio2 rates */ #define ESS18XX_NEWSPEED ==== //depot/projects/superpages/src/sys/kern/tty_pts.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.1 2006/01/26 01:30:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_pts.c,v 1.3 2006/01/27 00:21:48 cognet Exp $"); /* * Pseudo-teletype Driver @@ -119,6 +119,7 @@ #define TSA_PTC_WRITE(tp) ((void *)&(tp)->t_rawq.c_cl) #define TSA_PTS_READ(tp) ((void *)&(tp)->t_canq) +#define NUM_TO_MINOR(c) ((c & 0xff) | ((c & ~0xff) << 16)) /*- * Once a tty is allocated, it cannot (currently) be freed. As such, * we keep a global list of ptys that have been used so we can recycle @@ -188,7 +189,7 @@ int nb; mtx_lock(&pt_mtx); - if (nb_allocated >= max_pts) { + if (nb_allocated >= max_pts || nb_allocated == 0xffffff) { mtx_unlock(&pt_mtx); return (NULL); } @@ -444,8 +445,13 @@ * XXX: Might want to make the ownership/permissions here more * configurable. */ - pt->pt_devs = devs = make_dev_cred(&pts_cdevsw, pt->pt_num, - td->td_ucred, UID_ROOT, GID_WHEEL, 0666, "pts/%d", pt->pt_num); + if (pt->pt_devs) + devs = pt->pt_devs; + else + pt->pt_devs = devs = make_dev_cred(&pts_cdevsw, + NUM_TO_MINOR(pt->pt_num), + td->td_ucred, UID_ROOT, GID_WHEEL, 0666, "pts/%d", + pt->pt_num); devs->si_drv1 = pt; devs->si_tty = pt->pt_tty; pt->pt_tty->t_dev = devs; @@ -942,8 +948,9 @@ * opened, or some way to tell devfs that "this had better be for * an open() or we won't create a device". */ - pt->pt_devc = devc = make_dev_cred(&ptc_cdevsw, pt->pt_num, cred, - UID_ROOT, GID_WHEEL, 0666, "pty%d", pt->pt_num); + pt->pt_devc = devc = make_dev_cred(&ptc_cdevsw, + NUM_TO_MINOR(pt->pt_num), cred, UID_ROOT, GID_WHEEL, 0666, "pty%d", + pt->pt_num); dev_ref(devc); devc->si_drv1 = pt; ==== //depot/projects/superpages/src/sys/kern/tty_pty.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.142 2006/01/26 01:30:33 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/tty_pty.c,v 1.143 2006/01/26 20:54:49 cognet Exp $"); /* * Pseudo-teletype Driver @@ -327,7 +327,8 @@ pt->pt_send = 0; pt->pt_ucntl = 0; - pty_create_slave(td->td_ucred, pt, minor(dev)); + if (!pt->devs) + pty_create_slave(td->td_ucred, pt, minor(dev)); pt->pt_devc_open = 1; return (0); ==== //depot/projects/superpages/src/sys/sparc64/central/central.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.10 2005/12/03 18:14:47 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/central/central.c,v 1.11 2006/01/26 21:14:31 marius Exp $"); #include #include @@ -71,6 +71,9 @@ /* Device interface. */ DEVMETHOD(device_probe, central_probe), DEVMETHOD(device_attach, central_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface. */ DEVMETHOD(bus_print_child, central_print_child), ==== //depot/projects/superpages/src/sys/sparc64/ebus/ebus.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.24 2005/11/22 16:39:43 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/ebus/ebus.c,v 1.25 2006/01/26 21:14:31 marius Exp $"); /* * UltraSPARC 5 and beyond Ebus support. @@ -116,6 +116,9 @@ /* Device interface */ DEVMETHOD(device_probe, ebus_probe), DEVMETHOD(device_attach, ebus_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ DEVMETHOD(bus_print_child, ebus_print_child), @@ -426,7 +429,7 @@ device_printf(dev, "<%s>: could not map EBus interrupt %d\n", edi->edi_obdinfo.obd_name, intrs[i]); - free(reg, M_OFWPROP); + free(intrs, M_OFWPROP); goto fail; } resource_list_add(&edi->edi_rl, SYS_RES_IRQ, i, ==== //depot/projects/superpages/src/sys/sparc64/fhc/fhc_central.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.9 2005/11/22 16:39:44 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_central.c,v 1.10 2006/01/26 21:14:31 marius Exp $"); #include #include @@ -52,6 +52,9 @@ /* Device interface. */ DEVMETHOD(device_probe, fhc_central_probe), DEVMETHOD(device_attach, fhc_central_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface. */ DEVMETHOD(bus_print_child, fhc_print_child), ==== //depot/projects/superpages/src/sys/sparc64/fhc/fhc_nexus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_nexus.c,v 1.8 2005/11/22 16:39:44 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/fhc/fhc_nexus.c,v 1.9 2006/01/26 21:14:31 marius Exp $"); #include #include @@ -55,6 +55,9 @@ /* Device interface. */ DEVMETHOD(device_probe, fhc_nexus_probe), DEVMETHOD(device_attach, fhc_nexus_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface. */ DEVMETHOD(bus_print_child, fhc_print_child), ==== //depot/projects/superpages/src/sys/sparc64/pci/psycho.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.58 2005/12/03 19:52:20 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/pci/psycho.c,v 1.59 2006/01/26 21:14:31 marius Exp $"); /* * Support for `Hummingbird' (UltraSPARC IIe), `Psycho' and `Psycho+' @@ -124,6 +124,9 @@ /* Device interface */ DEVMETHOD(device_probe, psycho_probe), DEVMETHOD(device_attach, psycho_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ DEVMETHOD(bus_print_child, bus_generic_print_child), ==== //depot/projects/superpages/src/sys/sparc64/sbus/dma_sbus.c#3 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.2 2005/11/22 16:39:44 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/dma_sbus.c,v 1.3 2006/01/26 21:14:32 marius Exp $"); #include #include @@ -105,9 +105,7 @@ static bus_print_child_t dma_print_child; static bus_probe_nomatch_t dma_probe_nomatch; static bus_get_resource_list_t dma_get_resource_list; -#if 0 static bus_setup_intr_t dma_setup_intr; -#endif static ofw_bus_get_devinfo_t dma_get_devinfo; static struct dma_devinfo *dma_setup_dinfo(device_t, struct dma_softc *, @@ -119,15 +117,14 @@ /* Device interface */ DEVMETHOD(device_probe, dma_probe), DEVMETHOD(device_attach, dma_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ DEVMETHOD(bus_print_child, dma_print_child), DEVMETHOD(bus_probe_nomatch, dma_probe_nomatch), -#if 0 DEVMETHOD(bus_setup_intr, dma_setup_intr), -#else - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), -#endif DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), @@ -404,7 +401,6 @@ return (&ddi->ddi_rl); } -#if 0 static int dma_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) @@ -423,7 +419,6 @@ return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep)); } -#endif static const struct ofw_bus_devinfo * dma_get_devinfo(device_t bus, device_t child) ==== //depot/projects/superpages/src/sys/sparc64/sbus/sbus.c#3 (text+ko) ==== @@ -98,7 +98,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.36 2005/11/22 16:39:44 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/sparc64/sbus/sbus.c,v 1.37 2006/01/26 21:14:32 marius Exp $"); /* * SBus support. @@ -219,6 +219,9 @@ /* Device interface */ DEVMETHOD(device_probe, sbus_probe), DEVMETHOD(device_attach, sbus_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface */ DEVMETHOD(bus_print_child, sbus_print_child), ==== //depot/projects/superpages/src/sys/sys/cdefs.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/cdefs.h,v 1.90 2005/10/05 17:21:09 netchild Exp $ + * $FreeBSD: src/sys/sys/cdefs.h,v 1.91 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _SYS_CDEFS_H_ @@ -324,11 +324,13 @@ #if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER) #define __printflike(fmtarg, firstvararg) #define __scanflike(fmtarg, firstvararg) +#define __format_arg(fmtarg) #else #define __printflike(fmtarg, firstvararg) \ __attribute__((__format__ (__printf__, fmtarg, firstvararg))) #define __scanflike(fmtarg, firstvararg) \ __attribute__((__format__ (__scanf__, fmtarg, firstvararg))) +#define __format_arg(fmtarg) __attribute__((__format_arg__ (fmtarg))) #endif /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */ @@ -379,7 +381,7 @@ * Embed the rcs id of a source file in the resulting library. Note that in * more recent ELF binutils, we use .ident allowing the ID to be stripped. * Usage: - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.90 2005/10/05 17:21:09 netchild Exp $"); + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.91 2006/01/26 20:53:40 stefanf Exp $"); */ #ifndef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) ==== //depot/projects/superpages/www/en/donations/wantlist.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ - + %navincludes; @@ -124,6 +124,32 @@ + glebius + Russia, Moscow + Broadcom BCM5700 PCI-X NIC, preferrably with + external SSRAM + Test and profile my changes to network stack. + Improve bge(4) driver. + + + + glebius + Russia, Moscow + Intel 82546 PCI-X NIC + Test and profile my changes to network stack. + Improve em(4) driver. + + + + glebius + Russia, Moscow + Manageable switch with at least two Gigabit ports, + and few Fast Ethernet ports, capable to do 802.1q, + LACP, GVRP, etc. + Test and profile my changes to network stack. + + + grehan California, USA Apple G4 XServe ==== //depot/projects/superpages/www/en/news/news.xml#6 (text+ko) ==== @@ -21,7 +21,7 @@ - $FreeBSD: www/en/news/news.xml,v 1.363 2006/01/20 17:43:49 pav Exp $ + $FreeBSD: www/en/news/news.xml,v 1.364 2006/01/26 21:06:06 mlaier Exp $ @@ -32,6 +32,16 @@ 1 + 26 + + October-December 2005 Status Report + +

The October-December, 2005 status report is now + available with 26 entries.

+ + + 19

New committer: Introduction -

This report is about the rather quite last quarter of 2005, with +

This report is about the rather quiet last quarter of 2005, with the release of FreeBSD 6.0 and the holiday season things evolved in the background. Nontheless, most exciting projects hit the tree (or are going to very soon).

@@ -374,7 +374,7 @@ disk accesses and/or driver bugs to new and improved features (software volume control implemented for soundcards which do not have hardware volume control). Additionally a new driver - (snd_atiixp) has seen the light and a lot of problem reports where + (snd_atiixp) has seen the light and a lot of problem reports were fixed.

Most of those changes and the changes mentioned in the previous @@ -967,7 +967,7 @@ Ambrisko - douga@freebsd.org + ambrisko@freebsd.org @@ -1201,7 +1201,7 @@ - TCP/IP Optimization Fundraise 2005 + TCP/IP Optimization Fundraiser 2005 @@ -1213,7 +1213,7 @@ -

The fundraise has been very successful and I want to thank +

The fundraiser has been very successful and I want to thank everyone who has pledged their support and tipped the jar. The full amount plus a little bit more has been raised in a very short timeframe. More information on the exact amounts and their sponsors From owner-p4-projects@FreeBSD.ORG Fri Jan 27 03:54:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7314D16A424; Fri, 27 Jan 2006 03:54:46 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 47E6116A420 for ; Fri, 27 Jan 2006 03:54:46 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC60A43D48 for ; Fri, 27 Jan 2006 03:54:45 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R3sj7c070395 for ; Fri, 27 Jan 2006 03:54:45 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R3sjFJ070392 for perforce@freebsd.org; Fri, 27 Jan 2006 03:54:45 GMT (envelope-from scottl@freebsd.org) Date: Fri, 27 Jan 2006 03:54:45 GMT Message-Id: <200601270354.k0R3sjFJ070392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 90448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 03:54:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=90448 Change 90448 by scottl@scottl-junior on 2006/01/27 03:53:46 Add the foundation for the xenbus device. Affected files ... .. //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#4 edit Differences ... ==== //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#4 (text+ko) ==== @@ -1218,15 +1218,11 @@ DEVMETHOD(bus_add_child, xenhub_add_child), DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), DEVMETHOD(bus_write_ivar, bus_generic_write_ivar), -#if 0 DEVMETHOD(bus_set_resource, bus_generic_set_resource), DEVMETHOD(bus_get_resource, bus_generic_get_resource), -#endif DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), -#if 0 DEVMETHOD(bus_delete_resource, bus_generic_delete_resource), -#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), @@ -1235,16 +1231,65 @@ { 0, 0 } }; -static char driver_name[] = "xenbus"; static driver_t xenbus_driver = { "xenhub", xenhub_methods, - sizeof(struct xenhub_device), + sizeof(struct xenbus_device), }; + devclass_t xenhub_devclass; DRIVER_MODULE(xenhub, nexus, xenhub_driver, xenhub_devclass, 0, 0); +struct xenbus_softc { + device_t dev; + struct xen_bus_type *xenbus; +}; + +static int +xenbus_prob(device_t dev) +{ + + return (0); +} + +static int +xenbus_attach(device_t dev) +{ + struct xenbus_softc *sc; + + sc = device_get_softc(dev); + + sc->dev = dev; + sc->xenbus = device_get_ivars(dev); + + /* Enumerate devices in xenstore */ + xenbus_probe_device(sc->xenbus); + + return (0); +} + +static device_method_t xenbus_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, xenbus_probe), + DEVMETHOD(device_attach, xenbus_attach), + DEVMETHOD(device_detach, bus_generic_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, xenbus_suspend), + DEVMETHOD(device_resume, xenbus_resume), + { 0, 0 } +}; + +static driver_t xenbus_driver = { + "xenbus", + xenbus_methods, + sizeof(struct xenbus_softc), +}; + +devclass xenbus_devclass; + +DRIVER_MODULE(xenbus, xenhub, xenbus_driver, xenbus_devclass, 0, 0); + /* * Local variables: * c-file-style: "bsd" From owner-p4-projects@FreeBSD.ORG Fri Jan 27 04:38:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBEB716A423; Fri, 27 Jan 2006 04:38:39 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 C0B1616A420 for ; Fri, 27 Jan 2006 04:38:39 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6361943D48 for ; Fri, 27 Jan 2006 04:38:39 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R4cdba072034 for ; Fri, 27 Jan 2006 04:38:39 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R4cdSu072031 for perforce@freebsd.org; Fri, 27 Jan 2006 04:38:39 GMT (envelope-from scottl@freebsd.org) Date: Fri, 27 Jan 2006 04:38:39 GMT Message-Id: <200601270438.k0R4cdSu072031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 90450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 04:38:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=90450 Change 90450 by scottl@scottl-junior on 2006/01/27 04:38:05 Now make it all compile. Affected files ... .. //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#5 edit Differences ... ==== //depot/projects/xen3-newbus/src/sys/dev/xen/xenbus/xenbus_probe.c#5 (text+ko) ==== @@ -1052,7 +1052,7 @@ #endif -statuc void +static void xenhub_identify(driver_t *driver, device_t parent) { device_t child; @@ -1200,7 +1200,9 @@ return (0); } +#if 0 SYSINIT(xenbus_probe_sysinit, SI_SUB_PSEUDO, SI_ORDER_FIRST, xenbus_probe_sysinit, NULL); +#endif static device_method_t xenhub_methods[] = { /* Device interface */ @@ -1218,11 +1220,15 @@ DEVMETHOD(bus_add_child, xenhub_add_child), DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), DEVMETHOD(bus_write_ivar, bus_generic_write_ivar), +#if 0 DEVMETHOD(bus_set_resource, bus_generic_set_resource), DEVMETHOD(bus_get_resource, bus_generic_get_resource), +#endif DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), +#if 0 DEVMETHOD(bus_delete_resource, bus_generic_delete_resource), +#endif DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), @@ -1231,7 +1237,7 @@ { 0, 0 } }; -static driver_t xenbus_driver = { +static driver_t xenhub_driver = { "xenhub", xenhub_methods, sizeof(struct xenbus_device), @@ -1247,7 +1253,7 @@ }; static int -xenbus_prob(device_t dev) +xenbus_probe(device_t dev) { return (0); @@ -1264,7 +1270,7 @@ sc->xenbus = device_get_ivars(dev); /* Enumerate devices in xenstore */ - xenbus_probe_device(sc->xenbus); + xenbus_probe_devices(sc->xenbus); return (0); } @@ -1286,7 +1292,7 @@ sizeof(struct xenbus_softc), }; -devclass xenbus_devclass; +devclass_t xenbus_devclass; DRIVER_MODULE(xenbus, xenhub, xenbus_driver, xenbus_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Fri Jan 27 07:55:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE59016A423; Fri, 27 Jan 2006 07:55:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 7258616A420 for ; Fri, 27 Jan 2006 07:55:14 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FFA543D45 for ; Fri, 27 Jan 2006 07:55:14 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R7tEOD088332 for ; Fri, 27 Jan 2006 07:55:14 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R7tDFS088329 for perforce@freebsd.org; Fri, 27 Jan 2006 07:55:13 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 07:55:13 GMT Message-Id: <200601270755.k0R7tDFS088329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 07:55:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=90459 Change 90459 by alc@alc_home on 2006/01/27 07:54:23 IFC Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#4 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/superpages/src/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/superpages/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/superpages/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/superpages/src/sys/vm/vm_object.c#6 integrate .. //depot/projects/superpages/src/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#3 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4810,12 +4810,11 @@ root's email account, are being read. No more configuration will be required here. - After installation, an administrator must update the database - stored locally in - /var/db/portaudit by - invoking the following command: + After installation, an administrator can update the database + and view known vulnerabilities in installed packages by invoking + the following command: - &prompt.root; portaudit -F + &prompt.root; portaudit -Fda The database will automatically be updated during the @@ -4825,12 +4824,13 @@ To audit the third party utilities installed as part of - the Ports Collection, an administrator need only run the - following command: + the Ports Collection at anytime, an administrator need only run + the following command: &prompt.root; portaudit -a - An example of output is provided: + Portaudit will produce something + like this for vulnerable packages: Affected package: cups-base-1.1.22.0_1 Type of problem: cups-base -- HPGL buffer overflow vulnerability. ==== //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -133,10 +133,19 @@ /******************************************************************************/ -#define MALLOC_DEBUG +/* + * In order to disable various extra features that may have negative + * performance impacts, (assertions, expanded statistics, redzones), define + * NO_MALLOC_EXTRAS. + */ +/* #define NO_MALLOC_EXTRAS */ + +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_DEBUG +#endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.106 2006/01/26 08:11:23 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.109 2006/01/27 04:42:10 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -176,13 +185,16 @@ * Calculate statistics that can be used to get an idea of how well caching is * working. */ -#define MALLOC_STATS -#define MALLOC_STATS_ARENAS +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_STATS +#endif /* * Include redzones before/after every region, and check for buffer overflows. */ -#define MALLOC_REDZONES +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_REDZONES +#endif #ifdef MALLOC_REDZONES # define MALLOC_RED_2POW 4 # define MALLOC_RED ((size_t)(1 << MALLOC_RED_2POW)) @@ -298,10 +310,10 @@ uint64_t nrequests; /* - * Number of best-fit allocations that were successfully serviced by + * Number of exact-fit allocations that were successfully serviced by * this bin. */ - uint64_t nfit; + uint64_t nserviced; /* High-water marks for this bin. */ unsigned long highcached; @@ -311,7 +323,7 @@ * during normal operation, so is maintained here in order to allow * calculating the high water mark. */ - unsigned nregions; + unsigned long curcached; }; typedef struct arena_stats_s arena_stats_t; @@ -349,11 +361,8 @@ /* Frag statistics. */ struct { - /* - * Number of times a region is cached in the "frag" field of - * the arena. - */ - uint64_t ncached; + /* Number of times the "frag" field of the arena is refilled. */ + uint64_t nrefills; /* * Number of times a region is requested from the "frag" field @@ -377,18 +386,12 @@ uint64_t nrequests; /* - * Number of best-fit allocations that were successfully + * Number of allocation requests that were successfully * serviced by large_regions. */ - uint64_t nfit; + uint64_t nserviced; /* - * Number of allocation requests that were successfully serviced - * large_regions, but that a bin could have serviced. - */ - uint64_t noverfit; - - /* * High-water mark for large_regions (number of nodes in tree). */ unsigned long highcached; @@ -1176,7 +1179,7 @@ stats_arenas->split.nserviced += arena->stats.split.nserviced; /* Frag. */ - stats_arenas->frag.ncached += arena->stats.frag.ncached; + stats_arenas->frag.nrefills += arena->stats.frag.nrefills; stats_arenas->frag.nrequests += arena->stats.frag.nrequests; stats_arenas->frag.nserviced += arena->stats.frag.nserviced; @@ -1184,18 +1187,20 @@ for (i = 0; i < NBINS; i++) { stats_arenas->bins[i].nrequests += arena->stats.bins[i].nrequests; - stats_arenas->bins[i].nfit += arena->stats.bins[i].nfit; + stats_arenas->bins[i].nserviced += + arena->stats.bins[i].nserviced; if (arena->stats.bins[i].highcached > stats_arenas->bins[i].highcached) { stats_arenas->bins[i].highcached = arena->stats.bins[i].highcached; } + stats_arenas->bins[i].curcached + += arena->stats.bins[i].curcached; } /* large and large_regions. */ stats_arenas->large.nrequests += arena->stats.large.nrequests; - stats_arenas->large.nfit += arena->stats.large.nfit; - stats_arenas->large.noverfit += arena->stats.large.noverfit; + stats_arenas->large.nserviced += arena->stats.large.nserviced; if (arena->stats.large.highcached > stats_arenas->large.highcached) stats_arenas->large.highcached = arena->stats.large.highcached; stats_arenas->large.curcached += arena->stats.large.curcached; @@ -1227,28 +1232,29 @@ stats_arenas->split.nserviced); malloc_printf("cached frag usage:\n"); - malloc_printf(" %13s%13s%13s\n", "ncached", "nrequests", "nserviced"); - malloc_printf(" %13llu%13llu%13llu\n", stats_arenas->frag.ncached, + malloc_printf(" %13s%13s%13s\n", "nrefills", "nrequests", "nserviced"); + malloc_printf(" %13llu%13llu%13llu\n", stats_arenas->frag.nrefills, stats_arenas->frag.nrequests, stats_arenas->frag.nserviced); malloc_printf("bins:\n"); - malloc_printf(" %4s%7s%13s%13s%11s\n", "bin", - "size", "nrequests", "nfit", "highcached"); + malloc_printf(" %4s%7s%13s%13s%11s%11s\n", "bin", + "size", "nrequests", "nserviced", "highcached", "curcached"); for (i = 0; i < NBINS; i++) { malloc_printf( - " %4u%7u%13llu%13llu%11lu\n", + " %4u%7u%13llu%13llu%11lu%11lu\n", i, ((i + bin_shift) << opt_quantum_2pow), - stats_arenas->bins[i].nrequests, stats_arenas->bins[i].nfit, - stats_arenas->bins[i].highcached); + stats_arenas->bins[i].nrequests, + stats_arenas->bins[i].nserviced, + stats_arenas->bins[i].highcached, + stats_arenas->bins[i].curcached); } malloc_printf("large:\n"); - malloc_printf(" %13s%13s%13s%13s%13s\n", "nrequests", "nfit", - "noverfit", "highcached", "curcached"); - malloc_printf(" %13llu%13llu%13llu%13lu%13lu\n", - stats_arenas->large.nrequests, stats_arenas->large.nfit, - stats_arenas->large.noverfit, stats_arenas->large.highcached, - stats_arenas->large.curcached); + malloc_printf(" %13s%13s%13s%13s\n", "nrequests", "nserviced", + "highcached", "curcached"); + malloc_printf(" %13llu%13llu%13lu%13lu\n", + stats_arenas->large.nrequests, stats_arenas->large.nserviced, + stats_arenas->large.highcached, stats_arenas->large.curcached); malloc_printf("huge\n"); malloc_printf(" %13s\n", "nrequests"); @@ -1715,7 +1721,7 @@ qr_remove(reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions--; + arena->stats.bins[bin].curcached--; #endif if (qr_next(&tbin->regions, next.u.s.link) == &tbin->regions) arena_mask_unset(arena, bin); @@ -2066,12 +2072,12 @@ qr_new(reg, next.u.s.link); qr_before_insert(&tbin->regions, reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions++; + arena->stats.bins[bin].curcached++; - if (arena->stats.bins[bin].nregions + if (arena->stats.bins[bin].curcached > arena->stats.bins[bin].highcached) { arena->stats.bins[bin].highcached - = arena->stats.bins[bin].nregions; + = arena->stats.bins[bin].curcached; } #endif } @@ -2096,12 +2102,12 @@ qr_new(reg, next.u.s.link); qr_after_insert(&tbin->regions, reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions++; + arena->stats.bins[bin].curcached++; - if (arena->stats.bins[bin].nregions + if (arena->stats.bins[bin].curcached > arena->stats.bins[bin].highcached) { arena->stats.bins[bin].highcached - = arena->stats.bins[bin].nregions; + = arena->stats.bins[bin].curcached; } #endif } @@ -2123,7 +2129,7 @@ == ((bin + bin_shift) << opt_quantum_2pow)); qr_remove(ret, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions--; + arena->stats.bins[bin].curcached--; #endif if (qr_next(&tbin->regions, next.u.s.link) == &tbin->regions) arena_mask_unset(arena, bin); @@ -2479,7 +2485,7 @@ frag = node->reg; #ifdef MALLOC_STATS - arena->stats.frag.ncached++; + arena->stats.frag.nrefills++; #endif assert(region_next_free_get(&frag->sep)); region_next_free_unset(&frag->sep); @@ -2499,7 +2505,7 @@ /* Use the smallest available region. */ arena->frag = arena_bin_pop(arena, bin); #ifdef MALLOC_STATS - arena->stats.frag.ncached++; + arena->stats.frag.nrefills++; #endif total_size = region_next_size_get(&arena->frag->sep); @@ -2657,7 +2663,6 @@ #ifdef MALLOC_STATS arena->stats.split.nrequests++; #endif - if (region_next_size_get(&arena->split->sep) >= size) { if (fit) { size_t total_size; @@ -2778,7 +2783,6 @@ } #endif } - #ifdef MALLOC_STATS arena->stats.split.nserviced++; #endif @@ -2884,7 +2888,6 @@ } else arena_mru_cache(arena, next, next_size); } - #ifdef MALLOC_STATS arena->stats.nsplit++; #endif @@ -2911,7 +2914,7 @@ ret = arena_bin_pop(arena, bin); assert(region_next_size_get(&ret->sep) >= size); #ifdef MALLOC_STATS - arena->stats.bins[bin].nfit++; + arena->stats.bins[bin].nserviced++; #endif goto RETURN; } @@ -2967,10 +2970,7 @@ arena_reg_fit(arena, size, ret, false); #ifdef MALLOC_STATS - if (size > bin_maxsize) - arena->stats.large.nfit++; - else - arena->stats.large.noverfit++; + arena->stats.large.nserviced++; #endif RETURN: @@ -3962,13 +3962,12 @@ } } -RETURN: #ifdef MALLOC_STATS malloc_mutex_lock(&arena->mtx); arena->stats.npalloc++; malloc_mutex_unlock(&arena->mtx); #endif - +RETURN: if (opt_junk) { if (ret != NULL) memset(ret, 0xa5, size); @@ -4118,12 +4117,12 @@ idalloc(ptr); -RETURN: #ifdef MALLOC_STATS malloc_mutex_lock(&arena->mtx); arena->stats.nralloc++; malloc_mutex_unlock(&arena->mtx); #endif +RETURN: return (ret); } @@ -4202,7 +4201,7 @@ { arena_stats_t stats_arenas; arena_t *arena; - unsigned i; + unsigned i, narenas_used; /* Print chunk stats. */ { @@ -4221,11 +4220,11 @@ chunks_stats.curchunks); } -#ifdef MALLOC_STATS_ARENAS /* Print stats for each arena. */ - for (i = 0; i < narenas; i++) { + for (i = 0, narenas_used = 0; i < narenas; i++) { arena = arenas[i]; if (arena != NULL) { + narenas_used++; malloc_printf( "\narenas[%u] statistics:\n", i); malloc_mutex_lock(&arena->mtx); @@ -4236,22 +4235,29 @@ " unused arena\n", i); } } -#endif - /* Merge arena stats from arenas. */ - memset(&stats_arenas, 0, sizeof(arena_stats_t)); - for (i = 0; i < narenas; i++) { - arena = arenas[i]; - if (arena != NULL) { - malloc_mutex_lock(&arena->mtx); - stats_merge(arena, &stats_arenas); - malloc_mutex_unlock(&arena->mtx); + /* + * Only print merged stats if multiple arenas were + * used. + */ + if (narenas_used > 1) { + /* Merge arena stats from arenas. */ + memset(&stats_arenas, 0, sizeof(arena_stats_t)); + for (i = 0; i < narenas; i++) { + arena = arenas[i]; + if (arena != NULL) { + malloc_mutex_lock(&arena->mtx); + stats_merge(arena, + &stats_arenas); + malloc_mutex_unlock( + &arena->mtx); + } } + + /* Print arena stats. */ + malloc_printf("\nMerged arena statistics:\n"); + stats_print(&stats_arenas); } - - /* Print arena stats. */ - malloc_printf("\nMerged arena statistics:\n"); - stats_print(&stats_arenas); } #endif /* #ifdef MALLOC_STATS */ malloc_printf("--- End malloc statistics ---\n"); ==== //depot/projects/superpages/src/share/man/man5/rc.conf.5#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/share/man/man5/rc.conf.5,v 1.281 2006/01/21 18:08:16 yar Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.282 2006/01/27 02:46:08 jkoshy Exp $ .\" .Dd January 21, 2006 .Dt RC.CONF 5 @@ -68,6 +68,11 @@ .Va rc_conf_files variable below. .Pp +Options are set with +.Dq Li name=value +assignments that use +.Xr sh 1 +syntax. The following list provides a name and short description for each variable that can be set in the .Nm @@ -3435,6 +3440,7 @@ .Xr info 1 , .Xr kbdcontrol 1 , .Xr makewhatis 1 , +.Xr sh 1 , .Xr vi 1 , .Xr vidcontrol 1 , .Xr ip 4 , ==== //depot/projects/superpages/src/sys/kern/vfs_aio.c#5 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.216 2006/01/26 08:37:02 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.217 2006/01/27 04:14:16 davidxu Exp $"); #include #include @@ -1547,7 +1547,6 @@ PROC_UNLOCK(p); suword(&uaiocb->_aiocb_private.error, error); suword(&uaiocb->_aiocb_private.status, status); - error = 0; } else { error = EINVAL; PROC_UNLOCK(p); ==== //depot/projects/superpages/src/sys/vm/vm_map.c#4 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.371 2005/12/04 22:55:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.372 2006/01/27 07:28:50 alc Exp $"); #include #include @@ -1426,7 +1426,7 @@ are_queues_locked = TRUE; vm_page_lock_queues(); } - if (p->queue == PQ_CACHE) + if (VM_PAGE_INQUEUE1(p, PQ_CACHE)) vm_page_deactivate(p); mpte = pmap_enter_quick(map->pmap, addr + ptoa(tmpidx), p, prot, mpte); ==== //depot/projects/superpages/src/sys/vm/vm_object.c#6 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.355 2006/01/25 08:42:58 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.356 2006/01/27 07:28:50 alc Exp $"); #include #include @@ -705,7 +705,7 @@ curgeneration = object->generation; p = vm_page_lookup(object, tscan); if (p == NULL || p->valid == 0 || - p->queue == PQ_CACHE) { + VM_PAGE_INQUEUE1(p, PQ_CACHE)) { if (--scanlimit == 0) break; ++tscan; @@ -794,7 +794,7 @@ if (((p->flags & PG_CLEANCHK) == 0) || (pi < tstart) || (pi >= tend) || (p->valid == 0) || - p->queue == PQ_CACHE) { + VM_PAGE_INQUEUE1(p, PQ_CACHE)) { vm_page_flag_clear(p, PG_CLEANCHK); continue; } @@ -872,7 +872,7 @@ (tp->flags & PG_CLEANCHK) == 0) || (tp->busy != 0)) break; - if (tp->queue == PQ_CACHE) { + if (VM_PAGE_INQUEUE1(tp, PQ_CACHE)) { vm_page_flag_clear(tp, PG_CLEANCHK); break; } @@ -900,7 +900,7 @@ (tp->flags & PG_CLEANCHK) == 0) || (tp->busy != 0)) break; - if (tp->queue == PQ_CACHE) { + if (VM_PAGE_INQUEUE1(tp, PQ_CACHE)) { vm_page_flag_clear(tp, PG_CLEANCHK); break; } ==== //depot/projects/superpages/src/sys/vm/vm_pageout.c#7 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.271 2005/12/31 14:39:20 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageout.c,v 1.272 2006/01/27 07:28:51 alc Exp $"); #include "opt_vm.h" #include @@ -337,7 +337,7 @@ ib = 0; break; } - if (p->queue == PQ_CACHE || + if (VM_PAGE_INQUEUE1(p, PQ_CACHE) || (p->flags & (PG_BUSY|PG_UNMANAGED)) || p->busy) { ib = 0; break; @@ -367,7 +367,7 @@ if ((p = vm_page_lookup(object, pindex + is)) == NULL) break; - if (p->queue == PQ_CACHE || + if (VM_PAGE_INQUEUE1(p, PQ_CACHE) || (p->flags & (PG_BUSY|PG_UNMANAGED)) || p->busy) { break; } ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.22 2006/01/24 19:24:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_pageq.c,v 1.23 2006/01/27 07:28:51 alc Exp $"); #include #include @@ -194,7 +194,7 @@ TAILQ_REMOVE(&pq->pl, m, pageq); (*pq->cnt)--; pq->lcnt--; - if (queue == PQ_CACHE) { + if (VM_PAGE_RESOLVEQUEUE(m, queue) == PQ_CACHE) { if (vm_paging_needed()) pagedaemon_wakeup(); } ==== //depot/projects/superpages/www/en/releases/6.1R/todo.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ - + %navincludes; @@ -67,6 +67,13 @@ + quota deadlocks + &status.unknown; + + Quota support is not locked properly and causes deadlocks. + + + UFS deadlocks on amd64 &status.unknown; tegge @@ -91,62 +98,9 @@ sparc64 instability. &status.unknown; - - Outstanding recurrent issues include:

-panic: uma_small_alloc: free page still has mappings!
-cpuid = 0
-KDB: enter: panic
-[thread pid 9124 tid 100318 ]
-Stopped at      kdb_enter+0x3c: ta              %xcc, 1
-db> wh
-Tracing pid 9124 tid 100318 td 0xfffff800f6fb2720
-panic() at panic+0x164
-uma_small_alloc() at uma_small_alloc+0x9c
-slab_zalloc() at slab_zalloc+0x98
-uma_zone_slab() at uma_zone_slab+0x12c
-uma_zalloc_bucket() at uma_zalloc_bucket+0x16c
-uma_zalloc_arg() at uma_zalloc_arg+0x374
-malloc() at malloc+0x114
-allocbuf() at allocbuf+0x208
-getblk() at getblk+0x598
-breadn() at breadn+0x58
-bread() at bread+0x20
-ffs_blkatoff() at ffs_blkatoff+0x64
-ufs_direnter() at ufs_direnter+0x444
-ufs_makeinode() at ufs_makeinode+0x460
-ufs_create() at ufs_create+0x30
-VOP_CREATE_APV() at VOP_CREATE_APV+0xb4
-vn_open_cred() at vn_open_cred+0x188
-vn_open() at vn_open+0x18
-kern_open() at kern_open+0x8c
-pen() at open+0x14
-syscall() at syscall+0x2dc
--- syscall (5, FreeBSD ELF64, open) %o7=0x4034d5b8 --
-
-panic: trap: data access error
-cpuid = 1
-KDB: enter: panic
-[thread pid 2724 tid 100224 ]
-Stopped at      kdb_enter+0x3c: ta              %xcc, 1
-db> wh
-Tracing pid 2724 tid 100224 td 0xfffff8004e55a720
-panic() at panic+0x16c
-trap() at trap+0x3f0
--- data access error %o7=0xc017392c --
-copyout() at copyout+0xb0
-memrw() at memrw+0x2a8
-devfs_read_f() at devfs_read_f+0x9c
-dofileread() at dofileread+0xa4
-read() at read+0x38
-syscall() at syscall+0x2d4
--- syscall (3, FreeBSD ELF64, read) %o7=0x40339328 --
-
-(this one needs a port of
-
-1.117     +57 -33    src/sys/i386/i386/mem.c
-
-which marius is working on)
- + marius + sparc64 installability when accessing /dev/mem. Contact + marius or kris for debugging information. @@ -166,9 +120,8 @@ serious sparc64 IPv6 panic &status.unknown; - - Triggered by just ping6'ing the box. gnn keeps promising to - look at this but hasn't found it yet. It may even be a MI + gnn + Triggered by just ping6'ing the box. It may even be a MI issue, the reporter of this bug only uses IPv6 with sparc64. From owner-p4-projects@FreeBSD.ORG Fri Jan 27 08:49:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 838A016A42A; Fri, 27 Jan 2006 08:49:30 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3AA9B16A420 for ; Fri, 27 Jan 2006 08:49:30 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 639EF43D45 for ; Fri, 27 Jan 2006 08:49:28 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0R8nSTZ098233 for ; Fri, 27 Jan 2006 08:49:28 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0R8nSie098230 for perforce@freebsd.org; Fri, 27 Jan 2006 08:49:28 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 08:49:28 GMT Message-Id: <200601270849.k0R8nSie098230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90467 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 08:49:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=90467 Change 90467 by alc@alc_home on 2006/01/27 08:48:47 IFC for macro changes Affected files ... .. //depot/projects/superpages/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_edvar.h#3 integrate .. //depot/projects/superpages/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/superpages/src/sys/vm/vm_fault.c#5 integrate Differences ... ==== //depot/projects/superpages/src/sys/dev/ed/if_ed.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.266 2005/11/11 16:04:51 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.268 2006/01/27 08:25:46 imp Exp $"); /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -310,13 +310,17 @@ dot3ChipSetNational8390); sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; /* - * Set default state for ALTPHYS flag (used to disable the + * Set default state for LINK2 flag (used to disable the * tranceiver for AUI operation), based on config option. + * We only set this flag before we attach the device, so there's + * no race. It is convenient to allow users to turn this off + * by default in the kernel config, but given our more advanced + * boot time configuration options, this might no longer be needed. */ - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; if (device_get_flags(dev) & ED_FLAGS_DISABLE_TRANCEIVER) - ifp->if_flags |= IFF_ALTPHYS; + ifp->if_flags |= IFF_LINK2; /* * Attach the interface @@ -338,12 +342,12 @@ sc->hpp_mem_start ? "memory mapped" : "regular"); else #endif - printf("%s ", sc->isa16bit ? "(16 bit)" : "(8 bit)"); + printf("%s", sc->isa16bit ? "(16 bit)" : "(8 bit)"); #if defined(ED_HPP) || defined(ED_3C503) printf("%s", (((sc->vendor == ED_VENDOR_3COM) || (sc->vendor == ED_VENDOR_HP)) && - (ifp->if_flags & IFF_ALTPHYS)) ? + (ifp->if_flags & IFF_LINK2)) ? " tranceiver disabled" : ""); #endif printf("\n"); @@ -569,20 +573,8 @@ */ ed_nic_outb(sc, ED_P0_TCR, 0); -#ifdef ED_3C503 - /* - * If this is a 3Com board, the tranceiver must be software enabled - * (there is no settable hardware default). - */ - if (sc->vendor == ED_VENDOR_3COM) { - if (ifp->if_flags & IFF_ALTPHYS) - ed_asic_outb(sc, ED_3COM_CR, 0); - else - ed_asic_outb(sc, ED_3COM_CR, ED_3COM_CR_XSEL); - } -#endif if (sc->sc_mediachg) - sc->sc_mediachg(sc); + sc->sc_mediachg(sc); /* * Set 'running' flag, and clear output active flag. @@ -1223,12 +1215,15 @@ case SIOCSIFFLAGS: /* * If the interface is marked up and stopped, then start it. + * If we're up and already running, then it may be a mediachg. * If it is marked down and running, then stop it. */ ED_LOCK(sc); if (ifp->if_flags & IFF_UP) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) ed_init_locked(sc); + else if (sc->sc_mediachg) + sc->sc_mediachg(sc); } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { ed_stop(sc); @@ -1241,23 +1236,6 @@ */ ed_setrcr(sc); - /* - * An unfortunate hack to provide the (required) software - * control of the tranceiver for 3Com/HP boards. - * The ALTPHYS flag disables the tranceiver if set. - */ -#ifdef ED_3C503 - if (sc->vendor == ED_VENDOR_3COM) { - if (ifp->if_flags & IFF_ALTPHYS) - ed_asic_outb(sc, ED_3COM_CR, 0); - else - ed_asic_outb(sc, ED_3COM_CR, ED_3COM_CR_XSEL); - } -#endif -#ifdef ED_HPP - if (sc->vendor == ED_VENDOR_HP) - ed_hpp_set_physical_link(sc); -#endif ED_UNLOCK(sc); break; ==== //depot/projects/superpages/src/sys/dev/ed/if_ed_3c503.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_3c503.c,v 1.3 2005/08/28 23:56:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_3c503.c,v 1.4 2006/01/27 08:25:47 imp Exp $"); #include "opt_ed.h" @@ -60,6 +60,8 @@ #include #include +static void ed_3c503_mediachg(struct ed_softc *sc); + /* * Probe and vendor-specific initialization routine for 3Com 3c503 boards */ @@ -335,7 +337,25 @@ ed_asic_outb(sc, ED_3COM_VPTR1, 0xff); ed_asic_outb(sc, ED_3COM_VPTR0, 0x00); - return (ed_clear_memory(dev)); + error = ed_clear_memory(dev); + if (error == 0) + sc->sc_mediachg = ed_3c503_mediachg; + return (error); +} + +static void +ed_3c503_mediachg(struct ed_softc *sc) +{ + struct ifnet *ifp = sc->ifp; + + /* + * If this is a 3Com board, the tranceiver must be software enabled + * (there is no settable hardware default). + */ + if (ifp->if_flags & IFF_LINK2) + ed_asic_outb(sc, ED_3COM_CR, 0); + else + ed_asic_outb(sc, ED_3COM_CR, ED_3COM_CR_XSEL); } #endif /* ED_3C503 */ ==== //depot/projects/superpages/src/sys/dev/ed/if_ed_hpp.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_hpp.c,v 1.3 2005/08/28 23:56:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed_hpp.c,v 1.6 2006/01/27 08:25:47 imp Exp $"); #include "opt_ed.h" @@ -62,6 +62,7 @@ static void ed_hpp_writemem(struct ed_softc *, uint8_t *, uint16_t, uint16_t); +static void ed_hpp_set_physical_link(struct ed_softc *sc); /* * Interrupt conversion table for the HP PC LAN+ @@ -141,7 +142,7 @@ (ed_asic_inb(sc, ED_HPP_ID + 1) != 0x48) || ((ed_asic_inb(sc, ED_HPP_ID + 2) & 0xF0) != 0) || (ed_asic_inb(sc, ED_HPP_ID + 3) != 0x53)) - return ENXIO; + return (ENXIO); /* * Read the MAC address and verify checksum on the address. @@ -155,7 +156,7 @@ checksum += ed_asic_inb(sc, ED_HPP_MAC_ADDR + ETHER_ADDR_LEN); if (checksum != 0xFF) - return ENXIO; + return (ENXIO); /* * Verify that the software model number is 0. @@ -164,7 +165,7 @@ ed_asic_outw(sc, ED_HPP_PAGING, ED_HPP_PAGE_ID); if (((sc->hpp_id = ed_asic_inw(sc, ED_HPP_PAGE_4)) & ED_HPP_ID_SOFT_MODEL_MASK) != 0x0000) - return ENXIO; + return (ENXIO); /* * Read in and save the current options configured on card. @@ -194,7 +195,7 @@ DELAY(5000); if (!(ed_nic_inb(sc, ED_P0_ISR) & ED_ISR_RST)) - return ENXIO; /* reset did not complete */ + return (ENXIO); /* reset did not complete */ /* * Read out configuration information. @@ -209,7 +210,7 @@ */ if (irq >= (sizeof(ed_hpp_intr_val) / sizeof(ed_hpp_intr_val[0]))) - return ENXIO; + return (ENXIO); /* * If the kernel IRQ was specified with a '?' use the cards idea @@ -267,7 +268,7 @@ return (error); if (mem_addr != conf_maddr) - return ENXIO; + return (ENXIO); error = ed_alloc_memory(dev, 0, memsize); if (error) @@ -352,9 +353,10 @@ if (bcmp(test_pattern, test_buffer, sizeof(test_pattern))) - return ENXIO; + return (ENXIO); } + sc->sc_mediachg = ed_hpp_set_physical_link; return (0); } @@ -362,7 +364,7 @@ * HP PC Lan+ : Set the physical link to use AUI or TP/TL. */ -void +static void ed_hpp_set_physical_link(struct ed_softc *sc) { struct ifnet *ifp = sc->ifp; @@ -371,7 +373,7 @@ ed_asic_outw(sc, ED_HPP_PAGING, ED_HPP_PAGE_LAN); lan_page = ed_asic_inw(sc, ED_HPP_PAGE_0); - if (ifp->if_flags & IFF_ALTPHYS) { + if (ifp->if_flags & IFF_LINK2) { /* * Use the AUI port. */ ==== //depot/projects/superpages/src/sys/dev/ed/if_edvar.h#3 (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/ed/if_edvar.h,v 1.38 2005/10/05 05:21:07 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_edvar.h,v 1.40 2006/01/27 08:25:47 imp Exp $ */ #ifndef SYS_DEV_ED_IF_EDVAR_H @@ -220,7 +220,6 @@ /* The following is unsatisfying XXX */ #ifdef ED_HPP -void ed_hpp_set_physical_link(struct ed_softc *); void ed_hpp_readmem(struct ed_softc *, bus_size_t, uint8_t *, uint16_t); u_short ed_hpp_write_mbufs(struct ed_softc *, struct mbuf *, int); #endif @@ -243,7 +242,7 @@ #define ED_VENDOR_SIC 0x04 /* Allied-Telesis SIC */ /* - * Compile-time config flags + * Configure time flags */ /* * this sets the default for enabling/disabling the transceiver ==== //depot/projects/superpages/src/sys/kern/vfs_aio.c#6 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.217 2006/01/27 04:14:16 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_aio.c,v 1.218 2006/01/27 08:02:25 davidxu Exp $"); #include #include @@ -763,6 +763,8 @@ auio.uio_rw = UIO_READ; error = fo_read(fp, &auio, fp->f_cred, FOF_OFFSET, td); } else { + if (fp->f_type == DTYPE_VNODE) + bwillwrite(); auio.uio_rw = UIO_WRITE; error = fo_write(fp, &auio, fp->f_cred, FOF_OFFSET, td); } ==== //depot/projects/superpages/src/sys/vm/vm_fault.c#5 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.211 2005/12/31 14:39:20 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.212 2006/01/27 08:35:32 alc Exp $"); #include #include @@ -410,7 +410,8 @@ vm_pageq_remove_nowakeup(fs.m); - if (queue == PQ_CACHE && vm_page_count_severe()) { + if (VM_PAGE_RESOLVEQUEUE(fs.m, queue) == PQ_CACHE && + vm_page_count_severe()) { vm_page_activate(fs.m); vm_page_unlock_queues(); unlock_and_deallocate(&fs); From owner-p4-projects@FreeBSD.ORG Fri Jan 27 13:16:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86FD216A423; Fri, 27 Jan 2006 13:16:19 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3733D16A420 for ; Fri, 27 Jan 2006 13:16:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E03F243D48 for ; Fri, 27 Jan 2006 13:16:18 +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.13.1/8.13.1) with ESMTP id k0RDGI24016253 for ; Fri, 27 Jan 2006 13:16:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RDGIxw016250 for perforce@freebsd.org; Fri, 27 Jan 2006 13:16:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 27 Jan 2006 13:16:18 GMT Message-Id: <200601271316.k0RDGIxw016250@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 Cc: Subject: PERFORCE change 90478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 13:16:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=90478 Change 90478 by rwatson@rwatson_peppercorn on 2006/01/27 13:15:18 Clean up BSM keven table: - Add additional comments. - Put AUE_O_* entries in their own section, mark as Darwin-specific. We will try to reduce use of AUE_O_* entries in FreeBSD. - When a conflict exists between Darwin and Solaris, use the Solaris name and tag the Darwin version as AUE_DARWIN_* instead of the Solaris version as AUE_SOLARIS_*. OpenSolaris BSM is, by definition, right. :-) This will cause the FreeBSD implementation to start using the Solaris events instead; Darwin will need to have caution in adopting these changes and possibly update consumers to use the AUE_DARWIN versions for compatibility reasons. - Where known, annotate additional events that are used in only one OS -- i.e., Linux, Solaris, or Darwin. - Add some new events from OpenSolaris -- specifically, calls to adjust the time in more mature ways than settimeofday. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#27 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#27 (text+ko) ==== @@ -35,16 +35,20 @@ #define _BSM_AUDIT_KEVENTS_H_ /* - * Values marked as AUE_NULL are not required to be audited as per CAPP. + * Values marked as AUE_NULL are not required to be audited as per CAPP. + * + * Some conflicts exist in the assignment of name to event number mappings + * between BSM implementations. In general, we prefer the OpenSolaris + * definition as we consider Solaris BSM to be authoritative. _DARWIN_ has + * been inserted for the Darwin variants. If necessary, other tags will be + * added in the future. */ #define AUE_NULL 0 - #define AUE_EXIT 1 #define AUE_FORK 2 #define AUE_OPEN 3 #define AUE_CREAT 4 -#define AUE_O_CREAT AUE_CREAT #define AUE_LINK 5 #define AUE_UNLINK 6 #define AUE_DELETE AUE_UNLINK @@ -54,16 +58,13 @@ #define AUE_CHMOD 10 #define AUE_CHOWN 11 #define AUE_UMOUNT 12 -#define AUE_O_UMOUNT AUE_UMOUNT #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 #define AUE_STAT 16 -#define AUE_O_STAT AUE_STAT #define AUE_LSTAT 17 -#define AUE_O_LSTAT AUE_LSTAT #define AUE_ACCT 18 -#define AUE_SOLARIS_REBOOT 20 /* XXX: Darwin conflict. */ +#define AUE_REBOOT 20 /* XXX: Darwin conflict. */ #define AUE_SYMLINK 21 #define AUE_READLINK 22 #define AUE_EXECVE 23 @@ -72,49 +73,40 @@ #define AUE_SETGROUPS 26 #define AUE_SETPGRP 27 #define AUE_SWAPON 28 -#define AUE_SOLARIS_SETHOSTNAME 29 /* XXX: Darwin conflict. */ +#define AUE_SETHOSTNAME 29 /* XXX: Darwin conflict. */ #define AUE_FCNTL 30 -#define AUE_SOLARIS_SETPRIORITY 31 /* XXX: Darwin conflict. */ +#define AUE_SETPRIORITY 31 /* XXX: Darwin conflict. */ #define AUE_CONNECT 32 #define AUE_ACCEPT 33 -#define AUE_O_ACCEPT AUE_ACCEPT #define AUE_BIND 34 #define AUE_SETSOCKOPT 35 #define AUE_VTRACE 36 /* Solaris-specific. */ -#define AUE_SOLARIS_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ +#define AUE_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ #define AUE_FCHOWN 38 #define AUE_FCHMOD 39 -/* XXX: #define AUE_SYSINFO 39 */ #define AUE_SETREUID 40 -#define AUE_O_SETREUID AUE_SETREUID #define AUE_SETREGID 41 -#define AUE_O_SETREGID AUE_SETREGID #define AUE_RENAME 42 -#define AUE_SOLARIS_TRUNCATE 43 /* XXX: Darwin conflict. */ -#define AUE_SOLARIS_FTRUNCATE 44 /* XXX: Darwin conflict. */ -#define AUE_SOLARIS_FLOCK 45 /* XXX: Darwin conflict. */ +#define AUE_TRUNCATE 43 /* XXX: Darwin conflict. */ +#define AUE_FTRUNCATE 44 /* XXX: Darwin conflict. */ +#define AUE_FLOCK 45 /* XXX: Darwin conflict. */ #define AUE_SHUTDOWN 46 #define AUE_MKDIR 47 #define AUE_RMDIR 48 #define AUE_UTIMES 49 #define AUE_ADJTIME 50 #define AUE_SETRLIMIT 51 -#define AUE_O_SETRLIMIT AUE_SETRLIMIT #define AUE_KILLPG 52 -#define AUE_O_KILLPG AUE_KILLPG -#define AUE_SOLARIS_NFS_SVC 53 /* XXX: Darwin conflict. */ +#define AUE_NFS_SVC 53 /* XXX: Darwin conflict. */ #define AUE_STATFS 54 #define AUE_FSTATFS 55 -#define AUE_SOLARIS_UNMOUNT 56 /* XXX: Darwin conflict. */ +#define AUE_UNMOUNT 56 /* XXX: Darwin conflict. */ #define AUE_ASYNC_DAEMON 57 #define AUE_NFS_GETFH 58 /* XXX: Darwin conflict. */ -#define AUE_SOLARIS_SETDOMAINNAME 59 /* XXX: Darwin conflict. */ -#define AUE_O_SETDOMAINNAME AUE_SYSCTL -#define AUE_SOLARIS_QUOTACTL 60 /* XXX: Darwin conflict. */ +#define AUE_SETDOMAINNAME 59 +#define AUE_QUOTACTL 60 /* XXX: Darwin conflict. */ #define AUE_EXPORTFS 61 -#define AUE_O_EXPORTFS AUE_EXPORTFS #define AUE_MOUNT 62 -#define AUE_O_MOUNT AUE_MOUNT #define AUE_SEMSYS 63 #define AUE_MSGSYS 64 #define AUE_SHMSYS 65 @@ -163,7 +155,7 @@ #define AUE_SEMCTL_SETALL 108 #define AUE_SEMGET 109 #define AUE_SEMOP 110 -#define AUE_CORE 111 +#define AUE_CORE 111 /* Solaris-only, currently. */ #define AUE_CLOSE 112 #define AUE_SYSTEMBOOT 113 #define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-only. */ @@ -174,33 +166,30 @@ #define AUE_SETAUID 131 #define AUE_GETAUDIT 132 #define AUE_SETAUDIT 133 +#define AUE_GETUSERAUDIT 134 /* Solaris-only. */ +#define AUE_SETUSERAUDIT 135 /* Solaris-only. */ +#define AUE_AUDITSVC 136 /* Solaris-only. */ +#define AUE_AUDITUSER 137 /* Solaris-only. */ #define AUE_AUDITON 138 #define AUE_AUDITON_GPOLICY 141 #define AUE_AUDITON_SPOLICY 142 #define AUE_AUDITON_GQCTRL 145 #define AUE_AUDITON_SQCTRL 146 #define AUE_GETPORTAUDIT 149 -#define AUE_ENTERPROM 153 -#define AUE_EXITPROM 154 +#define AUE_ENTERPROM 153 /* Solaris-only. */ +#define AUE_EXITPROM 154 /* Solaris-only. */ #define AUE_IOCTL 158 -#define AUE_SOCKCONFIG 183 #define AUE_SOCKET 183 #define AUE_SENDTO 184 #define AUE_PIPE 185 - /* XXXRW: XXX Solaris socketpair()? */ - /* XXXRW: XXX Solaris send()? */ +#define AUE_SOCKETPAIR 186 /* XXXRW: Darwin conflict. */ +#define AUE_SEND 187 #define AUE_SENDMSG 188 -#define AUE_O_SEND AUE_SENDMSG -#define AUE_O_SENDMSG AUE_SENDMSG - /* XXXRW: XXX Solaris recv()? */ +#define AUE_RECV 189 #define AUE_RECVMSG 190 -#define AUE_O_RECV AUE_RECVMSG -#define AUE_O_RECVMSG AUE_RECVMSG #define AUE_RECVFROM 191 -#define AUE_O_RECVFROM AUE_RECVFROM #define AUE_READ 192 #define AUE_LSEEK 194 -#define AUE_O_LSEEK AUE_LSEEK #define AUE_WRITE 195 #define AUE_WRITEV 196 #define AUE_READV 198 @@ -215,7 +204,6 @@ /* XXXRW: Solaris readvl()? */ #define AUE_DUP2 209 #define AUE_MMAP 210 -#define AUE_O_MMAP AUE_MMAP #define AUE_AUDIT 211 #define AUE_PRIOCNTLSYS 212 #define AUE_MUNMAP 213 @@ -238,39 +226,48 @@ #define AUE_AUDITON_SETCOND 230 #define AUE_AUDITON_GETCLASS 231 #define AUE_AUDITON_SETCLASS 232 -#define AUE_UTSSYS 233 +#define AUE_UTSSYS 233 /* Solaris-specific. */ #define AUE_STATVFS 234 #define AUE_XSTAT 235 #define AUE_LXSTAT 236 #define AUE_LCHOWN 237 -#define AUE_MEMCNTL 238 -#define AUE_SYSINFO 239 -#define AUE_XMKNOD 240 +#define AUE_MEMCNTL 238 /* Solaris-specific. */ +#define AUE_SYSINFO 239 /* Solaris-specific. */ +#define AUE_XMKNOD 240 /* Solaris-specific. */ #define AUE_FORK1 241 /* XXXRW: Solaris modctl()? */ #define AUE_MODLOAD 243 #define AUE_MODUNLOAD 244 -#define AUE_MODCONFIG 245 -#define AUE_MODADDMAJ 246 +#define AUE_MODCONFIG 245 /* Solaris-specific. */ +#define AUE_MODADDMAJ 246 /* Solaris-specific. */ #define AUE_SOCKACCEPT 247 #define AUE_SOCKCONNECT 248 #define AUE_SOCKSEND 249 #define AUE_SOCKRECEIVE 250 #define AUE_ACLSET 251 #define AUE_FACLSET 252 -#define AUE_DOORFS_DOOR_CALL 254 -#define AUE_DOORFS_DOOR_RETURN 255 -#define AUE_DOORFS_DOOR_CREATE 256 -#define AUE_DOORFS_DOOR_REVOKE 257 -#define AUE_DOORFS_DOOR_INFO 258 -#define AUE_DOORFS_DOOR_CRED 259 -#define AUE_DOORFS_DOOR_BIND 260 -#define AUE_DOORFS_DOOR_UNBIND 261 -#define AUE_P_ONLINE 262 -#define AUE_PROCESSOR_BIND 263 -#define AUE_INST_SYNC 264 +#define AUE_DOORFS_DOOR_CALL 254 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_RETURN 255 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CREATE 256 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_REVOKE 257 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_INFO 258 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_CRED 259 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_BIND 260 /* Solaris-specific. */ +#define AUE_DOORFS_DOOR_UNBIND 261 /* Solaris-specific. */ +#define AUE_P_ONLINE 262 /* Solaris-specific. */ +#define AUE_PROCESSOR_BIND 263 /* Solaris-specific. */ +#define AUE_INST_SYNC 264 /* Solaris-specific. */ +#define AUE_SOCK_CONFIG 265 /* Solaris-specific. */ #define AUE_SETAUDIT_ADDR 266 #define AUE_GETAUDIT_ADDR 267 +#define AUE_CLOCK_SETTIME 287 +#define AUE_NTP_ADJTIME 288 + +/* + * Events not present in OpenSolaris BSM, generally derived from Apple Darwin + * BSM or added in OpenBSM. This start a little too close to the top end of + * the OpenSolaris event list for my comfort. + */ #define AUE_GETFSSTAT 301 #define AUE_PTRACE 302 #define AUE_CHFLAGS 303 @@ -278,43 +275,38 @@ #define AUE_PROFILE 305 #define AUE_KTRACE 306 #define AUE_SETLOGIN 307 -#define AUE_REBOOT 308 /* XXX: See AUE_SOLARIS_REBOOT. */ +#define AUE_DARWIN_REBOOT 308 /* XXX: See AUE_REBOOT. */ #define AUE_REVOKE 309 #define AUE_UMASK 310 #define AUE_MPROTECT 311 -#define AUE_SETPRIORITY 312 /* XXX: See AUE_SOLARIS_SETPRIORITY. */ -#define AUE_SETTIMEOFDAY 313 /* XXX: See AUE_SOLARIS_SETTIMEOFDAY. */ -#define AUE_FLOCK 314 /* XXX: See AUE_SOLARIS_FLOCK. */ +#define AUE_DARWIN_SETPRIORITY 312 /* XXX: See AUE_SETPRIORITY. */ +#define AUE_DARWIN_SETTIMEOFDAY 313 /* XXX: See AUE_SETTIMEOFDAY. */ +#define AUE_DARWIN_FLOCK 314 /* XXX: See AUE_FLOCK. */ #define AUE_MKFIFO 315 #define AUE_POLL 316 -#define AUE_SOCKETPAIR 317 /* XXXRW: What about 186? */ +#define AUE_DARWIN_SOCKETPAIR 317 /* XXXRW: See AUE_SOCKETPAIR. */ #define AUE_FUTIMES 318 #define AUE_SETSID 319 #define AUE_SETPRIVEXEC 320 -#define AUE_NFSSVC 321 /* XXX: See AUE_SOLARIS_NFS_SVC. */ -#define AUE_GETFH 322 /* XXX: See AUE_SOLARIS_NFS_GETFH. */ -#define AUE_QUOTACTL 323 /* XXX: See AUE_SOLARIS_QUOTACTL. */ -#define AUE_ADDPROFILE 324 -#define AUE_KDBUGTRACE 325 +#define AUE_DARWIN_NFSSVC 321 /* XXX: See AUE_NFS_SVC. */ +#define AUE_DARWIN_GETFH 322 /* XXX: See AUE_NFS_GETFH. */ +#define AUE_DARWIN_QUOTACTL 323 /* XXX: See AUE_QUOTACTL. */ +#define AUE_ADDPROFILE 324 /* Darwin */ +#define AUE_KDBUGTRACE 325 /* Darwin */ #define AUE_FSTAT 326 -#define AUE_O_FSTAT AUE_FSTAT #define AUE_FPATHCONF 327 #define AUE_GETDIRENTRIES 328 -#define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES -#define AUE_TRUNCATE 329 /* XXX: See AUE_SOLARIS_TRUNCATE. */ -#define AUE_O_TRUNCATE AUE_TRUNCATE -#define AUE_FTRUNCATE 330 /* XXX: See AUE_SOLARIS_FTRUNCATE. */ -#define AUE_O_FTRUNCATE AUE_FTRUNCATE +#define AUE_DARWIN_TRUNCATE 329 /* XXX: See AUE_TRUNCATE. */ +#define AUE_DARWIN_FTRUNCATE 330 /* XXX: See AUE_FTRUNCATE. */ #define AUE_SYSCTL 331 -#define AUE_O_SETHOSTNAME AUE_SYSCTL /* XXX: See AUE_SOLARIS_SET.. */ #define AUE_MLOCK 332 #define AUE_MUNLOCK 333 #define AUE_UNDELETE 334 -#define AUE_GETATTRLIST 335 -#define AUE_SETATTRLIST 336 -#define AUE_GETDIRENTRIESATTR 337 -#define AUE_EXCHANGEDATA 338 -#define AUE_SEARCHFS 339 +#define AUE_GETATTRLIST 335 /* Darwin */ +#define AUE_SETATTRLIST 336 /* Darwin */ +#define AUE_GETDIRENTRIESATTR 337 /* Darwin */ +#define AUE_EXCHANGEDATA 338 /* Darwin */ +#define AUE_SEARCHFS 339 /* Darwin */ #define AUE_MINHERIT 340 #define AUE_SEMCONFIG 341 #define AUE_SEMOPEN 342 @@ -322,24 +314,24 @@ #define AUE_SEMUNLINK 344 #define AUE_SHMOPEN 345 #define AUE_SHMUNLINK 346 -#define AUE_LOADSHFILE 347 -#define AUE_RESETSHFILE 348 -#define AUE_NEWSYSTEMSHREG 349 +#define AUE_LOADSHFILE 347 /* Darwin */ +#define AUE_RESETSHFILE 348 /* Darwin */ +#define AUE_NEWSYSTEMSHREG 349 /* Darwin */ #define AUE_PTHREADKILL 350 #define AUE_PTHREADSIGMASK 351 #define AUE_AUDITCTL 352 #define AUE_RFORK 353 #define AUE_LCHMOD 354 #define AUE_SWAPOFF 355 -#define AUE_INITPROCESS 356 -#define AUE_MAPFD 357 -#define AUE_TASKFORPID 358 -#define AUE_PIDFORTASK 359 +#define AUE_INITPROCESS 356 /* Darwin */ +#define AUE_MAPFD 357 /* Darwin */ +#define AUE_TASKFORPID 358 /* Darwin */ +#define AUE_PIDFORTASK 359 /* Darwin */ #define AUE_SYSCTL_NONADMIN 360 -#define AUE_COPYFILE 361 +#define AUE_COPYFILE 361 /* Darwin */ #define AUE_LUTIMES 362 #define AUE_LCHFLAGS 363 /* FreeBSD */ -#define AUE_SENDFILE 364 +#define AUE_SENDFILE 364 /* BSD/Linux */ #define AUE_USELIB 365 /* Linux */ #define AUE_GETRESUID 366 #define AUE_SETRESUID 367 @@ -358,7 +350,73 @@ #define AUE_NMOUNT 380 /* FreeBSD */ /* - * XXXRW: Values not yet assigned. + * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the + * normal Solaris BSM identifiers. _O_ refers to it being an old, or compat + * interface. In most cases, Darwin has never implemented these system calls + * but picked up the fields in their system call table from their FreeBSD + * import. Happily, these have different names than the AUE_O* definitions + * in Solaris BSM. + */ +#define AUE_O_CREAT AUE_OPEN_RWTC /* Darwin */ +#define AUE_O_EXECVE AUE_NULL /* Darwin */ +#define AUE_O_SBREAK AUE_NULL /* Darwin */ +#define AUE_O_LSEEK AUE_NULL /* Darwin */ +#define AUE_O_MOUNT AUE_NULL /* Darwin */ +#define AUE_O_UMOUNT AUE_NULL /* Darwin */ +#define AUE_O_STAT AUE_STAT /* Darwin */ +#define AUE_O_LSTAT AUE_LSTAT /* Darwin */ +#define AUE_O_FSTAT AUE_FSTAT /* Darwin */ +#define AUE_O_GETPAGESIZE AUE_NULL /* Darwin */ +#define AUE_O_VREAD AUE_NULL /* Darwin */ +#define AUE_O_VWRITE AUE_NULL /* Darwin */ +#define AUE_O_MMAP AUE_MMAP /* Darwin */ +#define AUE_O_VADVISE AUE_NULL /* Darwin */ +#define AUE_O_VHANGUP AUE_NULL /* Darwin */ +#define AUE_O_VLIMIT AUE_NULL /* Darwin */ +#define AUE_O_WAIT AUE_NULL /* Darwin */ +#define AUE_O_GETHOSTNAME AUE_NULL /* Darwin */ +#define AUE_O_SETHOSTNAME AUE_SYSCTL /* Darwin */ +#define AUE_O_GETDOPT AUE_NULL /* Darwin */ +#define AUE_O_SETDOPT AUE_NULL /* Darwin */ +#define AUE_O_ACCEPT AUE_NULL /* Darwin */ +#define AUE_O_SEND AUE_SENDMSG /* Darwin */ +#define AUE_O_RECV AUE_RECVMSG /* Darwin */ +#define AUE_O_VTIMES AUE_NULL /* Darwin */ +#define AUE_O_SIGVEC AUE_NULL /* Darwin */ +#define AUE_O_SIGBLOCK AUE_NULL /* Darwin */ +#define AUE_O_SIGSETMASK AUE_NULL /* Darwin */ +#define AUE_O_SIGSTACK AUE_NULL /* Darwin */ +#define AUE_O_RECVMSG AUE_RECVMSG /* Darwin */ +#define AUE_O_SENDMSG AUE_SENDMSG /* Darwin */ +#define AUE_O_VTRACE AUE_NULL /* Darwin */ +#define AUE_O_RESUBA AUE_NULL /* Darwin */ +#define AUE_O_RECVFROM AUE_RECVFROM /* Darwin */ +#define AUE_O_SETREUID AUE_SETREUID /* Darwin */ +#define AUE_O_SETREGID AUE_SETREGID /* Darwin */ +#define AUE_O_TRUNCATE AUE_TRUNCATE /* Darwin */ +#define AUE_O_FTRUNCATE AUE_FTRUNCATE /* Darwin */ +#define AUE_O_GETPEERNAME AUE_NULL /* Darwin */ +#define AUE_O_GETHOSTID AUE_NULL /* Darwin */ +#define AUE_O_SETHOSTID AUE_NULL /* Darwin */ +#define AUE_O_GETRLIMIT AUE_NULL /* Darwin */ +#define AUE_O_SETRLIMIT AUE_SETRLIMIT /* Darwin */ +#define AUE_O_KILLPG AUE_KILL /* Darwin */ +#define AUE_O_SETQUOTA AUE_NULL /* Darwin */ +#define AUE_O_QUOTA AUE_NULL /* Darwin */ +#define AUE_O_GETSOCKNAME AUE_NULL /* Darwin */ +#define AUE_O_GETDIREENTRIES AUE_GETDIREENTRIES /* Darwin */ +#define AUE_O_ASYNCDAEMON AUE_NULL /* Darwin */ +#define AUE_O_GETDOMAINNAME AUE_NULL /* Darwin */ +#define AUE_O_SETDOMAINNAME AUE_SYSCTL /* Darwin */ +#define AUE_O_PCFS_MOUNT AUE_NULL /* Darwin */ +#define AUE_O_EXPORTFS AUE_NULL /* Darwin */ +#define AUE_O_USTATE AUE_NULL /* Darwin */ +#define AUE_O_WAIT3 AUE_NULL /* Darwin */ +#define AUE_O_RPAUSE AUE_NULL /* Darwin */ +#define AUE_O_GETDENTS AUE_NULL /* Darwin */ + +/* + * Possible desired future values based on review of BSD/Darwin system calls. */ #define AUE_DUP AUE_NULL #define AUE_FSCTL AUE_NULL @@ -372,22 +430,19 @@ #define AUE_GETITIMER AUE_NULL #define AUE_GETLOGIN AUE_NULL #define AUE_GETPEERNAME AUE_NULL -#define AUE_O_GETPEERNAME AUE_GETPEERNAME #define AUE_GETPGID AUE_NULL #define AUE_GETPGRP AUE_NULL #define AUE_GETPID AUE_NULL #define AUE_GETPPID AUE_NULL #define AUE_GETPRIORITY AUE_NULL #define AUE_GETRLIMIT AUE_NULL -#define AUE_O_GETRLIMIT AUE_GETRLIMIT #define AUE_GETRUSAGE AUE_NULL #define AUE_GETSID AUE_NULL #define AUE_GETSOCKNAME AUE_NULL -#define AUE_O_GETSOCKNAME AUE_GETSOCKNAME #define AUE_GETTIMEOFDAY AUE_NULL #define AUE_GETUID AUE_NULL #define AUE_GETSOCKOPT AUE_NULL -#define AUE_GTSOCKOPT AUE_GETSOCKOPT +#define AUE_GTSOCKOPT AUE_GETSOCKOPT /* XXX: Typo in Darwin. */ #define AUE_ISSETUGID AUE_NULL #define AUE_LISTEN AUE_NULL #define AUE_LSTATV AUE_NULL @@ -399,36 +454,6 @@ #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL #define AUE_MUNLOCKALL AUE_NULL -#define AUE_O_ASYNCDAEMON AUE_NULL -#define AUE_O_EXECV AUE_NULL -#define AUE_O_GETDENTS AUE_NULL -#define AUE_O_GETDOMAINNAME AUE_NULL -#define AUE_O_GETDOPT AUE_NULL -#define AUE_O_GETHOSTID AUE_NULL -#define AUE_O_GETHOSTNAME AUE_NULL -#define AUE_O_GETPAGESIZE AUE_NULL -#define AUE_O_PCFS_MOUNT AUE_NULL -#define AUE_O_QUOTA AUE_NULL -#define AUE_O_RESUBA AUE_NULL -#define AUE_O_RPAUSE AUE_NULL -#define AUE_O_SBREAK AUE_NULL -#define AUE_O_SETDOPT AUE_NULL -#define AUE_O_SETHOSTID AUE_NULL -#define AUE_O_SETQUOTA AUE_NULL -#define AUE_O_SIGBLOCK AUE_NULL -#define AUE_O_SIGSETMASK AUE_NULL -#define AUE_O_SIGSTACK AUE_NULL -#define AUE_O_SIGVEC AUE_NULL -#define AUE_O_USTATE AUE_NULL -#define AUE_O_VADVISE AUE_NULL -#define AUE_O_VHANGUP AUE_NULL -#define AUE_O_VLIMIT AUE_NULL -#define AUE_O_VREAD AUE_NULL -#define AUE_O_VTIMES AUE_NULL -#define AUE_O_VTRACE AUE_NULL -#define AUE_O_VWRITE AUE_NULL -#define AUE_O_WAIT AUE_NULL -#define AUE_O_WAIT3 AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL #define AUE_SBRK AUE_NULL From owner-p4-projects@FreeBSD.ORG Fri Jan 27 13:38:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7167B16A424; Fri, 27 Jan 2006 13:38:47 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2DB3816A420 for ; Fri, 27 Jan 2006 13:38:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D777043D48 for ; Fri, 27 Jan 2006 13:38:46 +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.13.1/8.13.1) with ESMTP id k0RDckCP020978 for ; Fri, 27 Jan 2006 13:38:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RDckuM020975 for perforce@freebsd.org; Fri, 27 Jan 2006 13:38:46 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 27 Jan 2006 13:38:46 GMT Message-Id: <200601271338.k0RDckuM020975@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 Cc: Subject: PERFORCE change 90480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 13:38:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=90480 Change 90480 by rwatson@rwatson_peppercorn on 2006/01/27 13:38:12 Change the version name -- why not? Affected files ... .. //depot/projects/trustedbsd/openbsm/VERSION#3 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.0-PRERELEASE +OPENBSM-1.0-ALPHA From owner-p4-projects@FreeBSD.ORG Fri Jan 27 15:29:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9221A16A423; Fri, 27 Jan 2006 15:29:07 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 53EB316A420 for ; Fri, 27 Jan 2006 15:29:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1984044450 for ; Fri, 27 Jan 2006 15:29:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RFT6TJ026112 for ; Fri, 27 Jan 2006 15:29:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RFT6Go026109 for perforce@freebsd.org; Fri, 27 Jan 2006 15:29:06 GMT (envelope-from millert@freebsd.org) Date: Fri, 27 Jan 2006 15:29:06 GMT Message-Id: <200601271529.k0RFT6Go026109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 15:29:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=90488 Change 90488 by millert@millert_g4tower on 2006/01/27 15:28:16 Style fixes Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_right.c#5 (text+ko) ==== @@ -1324,6 +1324,8 @@ ipc_entry_bits_t bits; #ifdef MAC task_t self = current_task(); + ipc_port_t port; + int rc; #endif bits= entry->ie_bits; @@ -1336,16 +1338,14 @@ return FALSE; #ifdef MAC - ipc_port_t port; - port = (ipc_port_t) entry->ie_object; - ip_lock (port); - tasklabel_lock (self); - int rc = mac_check_port_make_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - ip_unlock (port); + ip_lock(port); + tasklabel_lock(self); + rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + ip_unlock(port); if (rc) - return FALSE; + return FALSE; #endif break; @@ -1355,13 +1355,13 @@ #ifdef MAC port = (ipc_port_t) entry->ie_object; - ip_lock (port); - tasklabel_lock (self); - rc = mac_check_port_move_receive (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - ip_unlock (port); + ip_lock(port); + tasklabel_lock(self); + rc = mac_check_port_move_receive(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + ip_unlock(port); if (rc) - return FALSE; + return FALSE; #endif break; @@ -1383,14 +1383,13 @@ ip_lock(port); active = ip_active(port); #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_copy_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return FALSE; - } + tasklabel_lock(self); + rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return FALSE; + } #endif ip_unlock(port); @@ -1476,14 +1475,13 @@ assert(port->ip_receiver == space); #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_make_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif port->ip_mscount++; @@ -1511,14 +1509,13 @@ assert(port->ip_receiver == space); #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_make_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_make_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif port->ip_sorights++; @@ -1546,14 +1543,14 @@ assert(port->ip_receiver == space); #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_move_receive (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_move_receive(&self->maclabel, + &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif if (bits & MACH_PORT_TYPE_SEND) { @@ -1612,14 +1609,13 @@ } #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_copy_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif if ((bits & MACH_PORT_TYPE_SEND) == 0) { @@ -1667,14 +1663,13 @@ } #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_copy_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif if ((bits & MACH_PORT_TYPE_SEND) == 0) { @@ -1746,14 +1741,13 @@ } #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_copy_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif if ((bits & MACH_PORT_TYPE_SEND_ONCE) == 0) { @@ -1952,14 +1946,13 @@ /* port is locked and active */ #ifdef MAC - tasklabel_lock (self); - rc = mac_check_port_copy_send (&self->maclabel, &port->ip_label); - tasklabel_unlock (self); - if (rc) - { - ip_unlock (port); - return KERN_NO_ACCESS; - } + tasklabel_lock(self); + rc = mac_check_port_copy_send(&self->maclabel, &port->ip_label); + tasklabel_unlock(self); + if (rc) { + ip_unlock(port); + return KERN_NO_ACCESS; + } #endif assert(port->ip_srights > 0); @@ -2039,7 +2032,7 @@ ipc_entry_bits_t bits; ipc_port_t port; #ifdef MAC - kern_return_t rc; + int rc; #endif bits = entry->ie_bits; From owner-p4-projects@FreeBSD.ORG Fri Jan 27 15:30:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 940ED16A423; Fri, 27 Jan 2006 15:30:09 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 2734D16A420 for ; Fri, 27 Jan 2006 15:30:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E69244450A for ; Fri, 27 Jan 2006 15:30:08 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RFU80R026184 for ; Fri, 27 Jan 2006 15:30:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RFU87N026181 for perforce@freebsd.org; Fri, 27 Jan 2006 15:30:08 GMT (envelope-from millert@freebsd.org) Date: Fri, 27 Jan 2006 15:30:08 GMT Message-Id: <200601271530.k0RFU87N026181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 15:30:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=90489 Change 90489 by millert@millert_g4tower on 2006/01/27 15:30:02 Implement hold_send and hold_recv policy bits to match the check_port_hold_send and check_port_hold_recv framework entry points. Also implement those entry points in sebsd.c. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#4 edit .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#26 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_perm_to_string.h#4 (text+ko) ==== @@ -132,6 +132,8 @@ { SECCLASS_MACH_PORT, MACH_PORT__MAKE_SEND, "make_send" }, { SECCLASS_MACH_PORT, MACH_PORT__COPY_SEND, "copy_send" }, { SECCLASS_MACH_PORT, MACH_PORT__MOVE_RECV, "move_recv" }, + { SECCLASS_MACH_PORT, MACH_PORT__HOLD_SEND, "hold_send" }, + { SECCLASS_MACH_PORT, MACH_PORT__HOLD_RECV, "hold_recv" }, { SECCLASS_MACH_TASK, MACH_TASK__TERMINATE, "terminate" }, { SECCLASS_MACH_TASK, MACH_TASK__SET_SPECIAL_PORT, "set_special_port" }, { SECCLASS_MACH_NAMES, MACH_NAMES__REGISTER, "register" }, ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/avc/av_permissions.h#4 (text+ko) ==== @@ -609,6 +609,8 @@ #define MACH_PORT__MAKE_SEND 0x0000000000000010UL #define MACH_PORT__COPY_SEND 0x0000000000000020UL #define MACH_PORT__MOVE_RECV 0x0000000000000040UL +#define MACH_PORT__HOLD_SEND 0x0000000000000080UL +#define MACH_PORT__HOLD_RECV 0x0000000000000100UL #define MACH_TASK__TERMINATE 0x0000000000000001UL #define MACH_TASK__SET_SPECIAL_PORT 0x0000000000000002UL ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/flask/access_vectors#4 (text+ko) ==== @@ -363,6 +363,8 @@ make_send copy_send move_recv + hold_send + hold_recv } class mach_task ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#26 (text+ko) ==== @@ -1170,6 +1170,8 @@ CHECK_SIMPLE_PERM(port_make_send,SECCLASS_MACH_PORT,MACH_PORT__MAKE_SEND); CHECK_SIMPLE_PERM(port_copy_send,SECCLASS_MACH_PORT,MACH_PORT__COPY_SEND); CHECK_SIMPLE_PERM(port_move_recv,SECCLASS_MACH_PORT,MACH_PORT__MOVE_RECV); +CHECK_SIMPLE_PERM(port_hold_send,SECCLASS_MACH_PORT,MACH_PORT__HOLD_SEND); +CHECK_SIMPLE_PERM(port_hold_recv,SECCLASS_MACH_PORT,MACH_PORT__HOLD_RECV); extern struct policydb policydb; @@ -2663,6 +2665,8 @@ .mpo_check_port_make_send = sebsd_check_port_make_send, .mpo_check_port_copy_send = sebsd_check_port_copy_send, .mpo_check_port_move_receive = sebsd_check_port_move_recv, + .mpo_check_port_hold_send = sebsd_check_port_copy_send, + .mpo_check_port_hold_receive = sebsd_check_port_move_recv, .mpo_check_proc_setlcid = sebsd_check_proc_setlcid, .mpo_check_proc_signal = sebsd_check_proc_signal, .mpo_check_vnode_access = sebsd_check_vnode_access, From owner-p4-projects@FreeBSD.ORG Fri Jan 27 16:20:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DB9E16A420; Fri, 27 Jan 2006 16:20:10 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 ADBC316A420 for ; Fri, 27 Jan 2006 16:20:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 680C3444DA for ; Fri, 27 Jan 2006 16:20:09 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RGK9mN028239 for ; Fri, 27 Jan 2006 16:20:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RGK9OA028236 for perforce@freebsd.org; Fri, 27 Jan 2006 16:20:09 GMT (envelope-from millert@freebsd.org) Date: Fri, 27 Jan 2006 16:20:09 GMT Message-Id: <200601271620.k0RGK9OA028236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 16:20:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=90490 Change 90490 by millert@millert_g4tower on 2006/01/27 16:19:39 Add hold_send and hold_recv Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/access_vectors#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/policy/flask/access_vectors#5 (text+ko) ==== @@ -362,6 +362,8 @@ make_send copy_send move_recv + hold_send + hold_recv } class mach_task From owner-p4-projects@FreeBSD.ORG Fri Jan 27 16:29:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 175FD16A425; Fri, 27 Jan 2006 16:29:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 ADE1216A429 for ; Fri, 27 Jan 2006 16:29:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3CE143D6B for ; Fri, 27 Jan 2006 16:29:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RGTK0i028729 for ; Fri, 27 Jan 2006 16:29:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RGTKVc028726 for perforce@freebsd.org; Fri, 27 Jan 2006 16:29:20 GMT (envelope-from millert@freebsd.org) Date: Fri, 27 Jan 2006 16:29:20 GMT Message-Id: <200601271629.k0RGTKVc028726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 90491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 16:29:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=90491 Change 90491 by millert@millert_g4tower on 2006/01/27 16:28:19 Fix cut & pasto Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#27 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#27 (text+ko) ==== @@ -2665,8 +2665,8 @@ .mpo_check_port_make_send = sebsd_check_port_make_send, .mpo_check_port_copy_send = sebsd_check_port_copy_send, .mpo_check_port_move_receive = sebsd_check_port_move_recv, - .mpo_check_port_hold_send = sebsd_check_port_copy_send, - .mpo_check_port_hold_receive = sebsd_check_port_move_recv, + .mpo_check_port_hold_send = sebsd_check_port_hold_send, + .mpo_check_port_hold_receive = sebsd_check_port_hold_recv, .mpo_check_proc_setlcid = sebsd_check_proc_setlcid, .mpo_check_proc_signal = sebsd_check_proc_signal, .mpo_check_vnode_access = sebsd_check_vnode_access, From owner-p4-projects@FreeBSD.ORG Fri Jan 27 20:25:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F9B316A42A; Fri, 27 Jan 2006 20:25:11 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 A9BF216A429 for ; Fri, 27 Jan 2006 20:25:10 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2700643DA4 for ; Fri, 27 Jan 2006 20:24:28 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RKOLNG048714 for ; Fri, 27 Jan 2006 20:24:21 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RKOLRL048711 for perforce@freebsd.org; Fri, 27 Jan 2006 20:24:21 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 20:24:21 GMT Message-Id: <200601272024.k0RKOLRL048711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 20:25:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=90500 Change 90500 by alc@alc_home on 2006/01/27 20:24:13 Reduce differences with CVS HEAD. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.h#6 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.h#6 (text+ko) ==== @@ -143,9 +143,8 @@ #endif #endif -#if !defined(KLD_MODULE) - -#define PQ_NONE 0 +/* PQ_CACHE and PQ_FREE represents a PQ_NUMCOLORS consecutive queue. */ +#define PQ_NONE 0 #define PQ_BUDDY 1 #define PQ_INACTIVE (1 + BUDDY_QUEUES) #define PQ_ACTIVE (2 + BUDDY_QUEUES) @@ -180,8 +179,6 @@ extern struct vpgqueues vm_page_queues[PQ_COUNT]; extern struct mtx vm_page_queue_free_mtx; -#endif - /* * These are the flags defined for vm_page. * From owner-p4-projects@FreeBSD.ORG Fri Jan 27 21:17:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AFFF16A420; Fri, 27 Jan 2006 21:17:32 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 00E7916A420 for ; Fri, 27 Jan 2006 21:17:32 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7659843D62 for ; Fri, 27 Jan 2006 21:17:28 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RLHS9m059083 for ; Fri, 27 Jan 2006 21:17:28 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RLHSLK059080 for perforce@freebsd.org; Fri, 27 Jan 2006 21:17:28 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 21:17:28 GMT Message-Id: <200601272117.k0RLHSLK059080@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 21:17:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=90504 Change 90504 by alc@alc_home on 2006/01/27 21:17:27 IFC @90501 to loop back style fix Affected files ... .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 integrate .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#4 integrate .. //depot/projects/superpages/doc/share/pgpkeys/delphij.key#2 integrate .. //depot/projects/superpages/src/etc/pf.conf#2 integrate .. //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/superpages/src/lib/libdisk/Makefile#3 integrate .. //depot/projects/superpages/src/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/superpages/src/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/superpages/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/superpages/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/superpages/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/superpages/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/superpages/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/superpages/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/superpages/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/superpages/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_3c503.c#3 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_hpp.c#3 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_isa.c#5 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/superpages/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/superpages/src/sys/dev/md/md.c#4 integrate .. //depot/projects/superpages/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/superpages/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/superpages/src/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/superpages/src/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/superpages/www/en/commercial/hardware.xml#4 integrate .. //depot/projects/superpages/www/en/developers.sgml#4 integrate .. //depot/projects/superpages/www/en/docproj/Makefile#2 integrate .. //depot/projects/superpages/www/en/docproj/current.sgml#5 integrate .. //depot/projects/superpages/www/en/docproj/todo.sgml#1 branch .. //depot/projects/superpages/www/en/donations/donors.sgml#5 integrate .. //depot/projects/superpages/www/en/donations/wantlist.sgml#8 integrate .. //depot/projects/superpages/www/en/news/status/report-oct-2005-dec-2005.xml#3 integrate Differences ... ==== //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#8 (text+ko) ==== @@ -1,4 +1,4 @@ - + + The &os; Documentation Engineering Team @@ -120,10 +120,6 @@ - &a.guido; - - - &a.des; ==== //depot/projects/superpages/doc/share/pgpkeys/delphij.key#2 (text+ko) ==== @@ -1,14 +1,21 @@ - + - Key fingerprint = 43B8 B703 B8DD 0231 B333 DC28 39FB 93A0 CAEE B8C0 -uid Xin LI -sub 2048g/A44AC9F9 2004-01-28 [expires: 2005-01-01] -sub 2048g/073737FC 2004-09-16 [expires: 2006-01-01] -sub 1024D/1159888A 2004-09-16 [expires: 2006-01-01] +pub 1024D/CAEEB8C0 2004-01-28 + Key fingerprint = 43B8 B703 B8DD 0231 B333 DC28 39FB 93A0 CAEE B8C0 +uid Xin LI +uid Xin LI +uid Xin LI +uid Xin LI + +pub 1024D/42EA8A4B 2006-01-27 [expires: 2008-01-01] + Key fingerprint = F19C 2616 FA97 9C13 2581 C6F3 85C5 1CCE 42EA 8A4B +uid Xin LI +uid Xin LI +uid Xin LI +sub 4096g/11A94A02 2006-01-27 [expires: 2008-01-01] ]]> ==== //depot/projects/superpages/src/etc/pf.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $ +# $FreeBSD: src/etc/pf.conf,v 1.3 2006/01/27 17:16:20 mlaier Exp $ # $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $ # # See pf.conf(5) and /usr/share/examples/pf for syntax and examples. @@ -72,6 +72,10 @@ #pass in on $ext_if proto { tcp, udp } from any to port 80 keep state # pass incoming ports for ftp-proxy +#pass in on $ext_if inet proto tcp from any to $ext_if port > 49151 keep state + +# Alternate rule to pass incoming ports for ftp-proxy +# NOTE: Please see pf.conf(5) BUGS section before using user/group rules. #pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state # assign packets to a queue. ==== //depot/projects/superpages/src/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -145,7 +145,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.109 2006/01/27 04:42:10 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.110 2006/01/27 07:46:22 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -1636,16 +1636,14 @@ static unsigned arena_bins_search(arena_t *arena, size_t size) { - unsigned ret, minbin, i; + unsigned minbin, i; int bit; assert(QUANTUM_CEILING(size) == size); assert((size >> opt_quantum_2pow) >= bin_shift); - if (size > bin_maxsize) { - ret = UINT_MAX; - goto RETURN; - } + if (size > bin_maxsize) + return (UINT_MAX); minbin = (size >> opt_quantum_2pow) - bin_shift; assert(minbin < NBINS); @@ -1654,14 +1652,11 @@ & (UINT_MAX << (minbin % (sizeof(int) << 3)))); if (bit != 0) { /* Usable allocation found. */ - ret = (i * (sizeof(int) << 3)) + bit - 1; - goto RETURN; + return ((i * (sizeof(int) << 3)) + bit - 1); } } - ret = UINT_MAX; -RETURN: - return (ret); + return (UINT_MAX); } static __inline void @@ -2657,137 +2652,103 @@ static region_t * arena_split_reg_alloc(arena_t *arena, size_t size, bool fit) { - region_t *ret; + + if (arena->split == NULL) + return (NULL); - if (arena->split != NULL) { #ifdef MALLOC_STATS - arena->stats.split.nrequests++; + arena->stats.split.nrequests++; #endif - if (region_next_size_get(&arena->split->sep) >= size) { - if (fit) { - size_t total_size; + if (region_next_size_get(&arena->split->sep) >= size) { + region_t *ret; - /* - * Use split, but try to use the beginning for - * smaller regions, and the end for larger - * regions. This reduces fragmentation in some - * pathological use cases. It tends to group - * short-lived (smaller) regions, which - * increases the effectiveness of coalescing. - */ + if (fit) { + size_t total_size; - total_size = - region_next_size_get(&arena->split->sep); - assert(size % quantum == 0); + /* + * Use split, but try to use the beginning for smaller + * regions, and the end for larger regions. This + * reduces fragmentation in some pathological use + * cases. It tends to group short-lived (smaller) + * regions, which increases the effectiveness of + * coalescing. + */ - if (total_size - size >= QUANTUM_CEILING( - sizeof(region_small_sizer_t))) { - if (size <= bin_maxsize) { - region_t *next; + total_size = region_next_size_get(&arena->split->sep); + assert(size % quantum == 0); - /* - * Carve space from the - * beginning of split. - */ - - /* ret. */ - ret = arena->split; - region_next_size_set(&ret->sep, - size); - assert(region_next_free_get( - &ret->sep) == false); - - /* next. */ - next = (region_t *)&((char *) - ret)[size]; - region_next_size_set(&next->sep, - total_size - size); - assert(size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - region_prev_free_unset( - &next->sep); - region_next_free_unset( - &next->sep); - - /* Update split. */ - arena->split = next; - } else { - region_t *prev; - size_t prev_size; - - /* - * Carve space from the end of - * split. - */ - - /* prev. */ - prev_size = total_size - size; - prev = arena->split; - region_next_size_set(&prev->sep, - prev_size); - assert(prev_size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - assert(region_next_free_get( - &prev->sep) == false); - - /* ret. */ - ret = (region_t *)&((char *) - prev)[prev_size]; - region_next_size_set(&ret->sep, - size); - region_prev_free_unset( - &ret->sep); - region_next_free_unset( - &ret->sep); - -#ifdef MALLOC_DEBUG - { + if (total_size - size >= + QUANTUM_CEILING(sizeof(region_small_sizer_t))) { + if (size <= bin_maxsize) { region_t *next; - /* next. */ - next = (region_t *)&((char *) ret) - [region_next_size_get(&ret->sep)]; - assert(region_prev_free_get(&next->sep) - == false); - } -#endif - } -#ifdef MALLOC_STATS - arena->stats.nsplit++; -#endif - } else { /* - * split is close enough to the right - * size that there isn't enough room to - * create a neighboring region. + * Carve space from the beginning of + * split. */ /* ret. */ ret = arena->split; - arena->split = NULL; + region_next_size_set(&ret->sep, size); assert(region_next_free_get(&ret->sep) == false); + /* next. */ + next = (region_t *)&((char *)ret)[size]; + region_next_size_set(&next->sep, + total_size - size); + assert(size >= QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + region_prev_free_unset(&next->sep); + region_next_free_unset(&next->sep); + + /* Update split. */ + arena->split = next; + } else { + region_t *prev; + size_t prev_size; + + /* Carve space from the end of split. */ + + /* prev. */ + prev_size = total_size - size; + prev = arena->split; + region_next_size_set(&prev->sep, + prev_size); + assert(prev_size >= + QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + assert(region_next_free_get( + &prev->sep) == false); + + /* ret. */ + ret = (region_t *)&((char *) + prev)[prev_size]; + region_next_size_set(&ret->sep, size); + region_prev_free_unset(&ret->sep); + region_next_free_unset(&ret->sep); + #ifdef MALLOC_DEBUG { - region_t *next; + region_t *next; - /* next. */ - next = (region_t *)&((char *) - ret)[region_next_size_get( - &ret->sep)]; - assert(region_prev_free_get( - &next->sep) == false); + /* next. */ + next = (region_t *)&((char *)ret) + [region_next_size_get(&ret->sep)]; + assert(region_prev_free_get(&next->sep) + == false); } #endif } #ifdef MALLOC_STATS - arena->stats.split.nserviced++; + arena->stats.nsplit++; #endif } else { - /* Don't fit to the allocation size. */ + /* + * Split is close enough to the right size that + * there isn't enough room to create a + * neighboring region. + */ /* ret. */ ret = arena->split; @@ -2800,35 +2761,59 @@ region_t *next; /* next. */ - next = (region_t *) &((char *) ret) - [region_next_size_get(&ret->sep)]; + next = (region_t *)&((char *) + ret)[region_next_size_get( + &ret->sep)]; assert(region_prev_free_get(&next->sep) == false); } #endif } - region_next_contig_set(&ret->sep); - goto RETURN; - } else if (size <= bin_maxsize) { - region_t *reg; +#ifdef MALLOC_STATS + arena->stats.split.nserviced++; +#endif + } else { + /* Don't fit to the allocation size. */ + + /* ret. */ + ret = arena->split; + arena->split = NULL; + assert(region_next_free_get(&ret->sep) == false); + +#ifdef MALLOC_DEBUG + { + region_t *next; + + /* next. */ + next = (region_t *) &((char *) ret) + [region_next_size_get(&ret->sep)]; + assert(region_prev_free_get(&next->sep) + == false); + } +#endif + } + region_next_contig_set(&ret->sep); + return (ret); + } + /* If we get here, split has failed to service the request. */ + + if (size <= bin_maxsize) { + region_t *reg; - /* - * The split region is too small to service a small - * request. Clear split. - */ + /* + * The split region is too small to service a small request. + * Clear split. + */ - reg = arena->split; - region_next_contig_set(®->sep); + reg = arena->split; + region_next_contig_set(®->sep); - arena->split = NULL; + arena->split = NULL; - arena_delay_cache(arena, reg); - } + arena_delay_cache(arena, reg); } - ret = NULL; -RETURN: - return (ret); + return (NULL); } /* @@ -2916,17 +2901,15 @@ #ifdef MALLOC_STATS arena->stats.bins[bin].nserviced++; #endif - goto RETURN; + return (ret); } /* Look at frag to see whether it's large enough. */ ret = arena_frag_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); - ret = NULL; -RETURN: - return (ret); + return (NULL); } /* Look in large_regions for a large enough region. */ @@ -2946,10 +2929,8 @@ region_next_size_set(&key.sep, size); node = RB_NFIND(region_tree_s, &arena->large_regions, &key.next.u.l.node); - if (node == NULL) { - ret = NULL; - goto RETURN; - } + if (node == NULL) + return (NULL); /* Cached large region found. */ ret = node->reg; @@ -2973,7 +2954,6 @@ arena->stats.large.nserviced++; #endif -RETURN: return (ret); } @@ -2985,10 +2965,8 @@ chunk_node_t *chunk; chunk = chunk_alloc(chunk_size); - if (chunk == NULL) { - ret = NULL; - goto RETURN; - } + if (chunk == NULL) + return (NULL); #ifdef MALLOC_DEBUG { @@ -3042,7 +3020,6 @@ if (fit) arena_reg_fit(arena, size, ret, (arena->split == NULL)); -RETURN: return (ret); } @@ -3063,16 +3040,16 @@ if (size <= bin_maxsize) { ret = arena_bin_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); } ret = arena_large_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); ret = arena_split_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); /* * Only try allocating from frag here if size is large, since @@ -3082,16 +3059,14 @@ if (size > bin_maxsize) { ret = arena_frag_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); } ret = arena_chunk_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); - ret = NULL; -RETURN: - return (ret); + return (NULL); } static void * @@ -3109,8 +3084,7 @@ quantum_size = region_ceiling(size); if (quantum_size < size) { /* size is large enough to cause size_t wrap-around. */ - ret = NULL; - goto RETURN; + return (NULL); } assert(quantum_size >= QUANTUM_CEILING(sizeof(region_small_sizer_t))); @@ -3118,8 +3092,7 @@ reg = arena_reg_alloc(arena, quantum_size, true); if (reg == NULL) { malloc_mutex_unlock(&arena->mtx); - ret = NULL; - goto RETURN; + return (NULL); } #ifdef MALLOC_STATS @@ -3151,7 +3124,6 @@ memset(next->sep.prev_red, 0xa5, MALLOC_RED); } #endif -RETURN: return (ret); } @@ -3184,8 +3156,7 @@ quantum_size = region_ceiling(size); if (quantum_size < size) { /* size is large enough to cause size_t wrap-around. */ - ret = NULL; - goto RETURN; + return (NULL); } /* @@ -3206,8 +3177,7 @@ if (alloc_size < quantum_size) { /* size_t wrap-around occurred. */ - ret = NULL; - goto RETURN; + return (NULL); } malloc_mutex_lock(&arena->mtx); @@ -3215,8 +3185,7 @@ reg = arena_reg_alloc(arena, alloc_size, false); if (reg == NULL) { malloc_mutex_unlock(&arena->mtx); - ret = NULL; - goto RETURN; + return (NULL); } if (reg == old_split) { /* @@ -3360,7 +3329,6 @@ #endif } -RETURN: assert(((uintptr_t)ret & (alignment - 1)) == 0); return (ret); } @@ -3376,11 +3344,10 @@ ret = arena_malloc(arena, num * size); if (ret == NULL) - goto RETURN; + return (NULL); memset(ret, 0, num * size); -RETURN: return (ret); } @@ -3559,7 +3526,6 @@ static bool arena_new(arena_t *arena) { - bool ret; unsigned i; malloc_mutex_init(&arena->mtx); @@ -3580,10 +3546,8 @@ assert(opt_ndelay > 0); arena->delayed = (region_t **)base_alloc(opt_ndelay * sizeof(region_t *)); - if (arena->delayed == NULL) { - ret = true; - goto RETURN; - } + if (arena->delayed == NULL) + return (true); memset(arena->delayed, 0, opt_ndelay * sizeof(region_t *)); arena->next_delayed = 0; @@ -3597,9 +3561,7 @@ arena->magic = ARENA_MAGIC; #endif - ret = false; -RETURN: - return (ret); + return (false); } /* Create a new arena and insert it into the arenas array at index ind. */ @@ -3744,22 +3706,18 @@ chunk_size = CHUNK_CEILING(size); if (chunk_size == 0) { /* size is large enough to cause size_t wrap-around. */ - ret = NULL; - goto RETURN; + return (NULL); } /* Allocate a chunk node with which to track the chunk. */ node = base_chunk_node_alloc(); - if (node == NULL) { - ret = NULL; - goto RETURN; - } + if (node == NULL) + return (NULL); ret = chunk_alloc(chunk_size); if (ret == NULL) { base_chunk_node_dealloc(node); - ret = NULL; - goto RETURN; + return (NULL); } /* Insert node into chunks. */ @@ -3776,7 +3734,6 @@ #endif malloc_mutex_unlock(&chunks_mtx); -RETURN: return (ret); } @@ -3908,16 +3865,13 @@ * Allocate a chunk node with which to track the chunk. */ node = base_chunk_node_alloc(); - if (node == NULL) { - ret = NULL; - goto RETURN; - } + if (node == NULL) + return (NULL); ret = chunk_alloc(alloc_size); if (ret == NULL) { base_chunk_node_dealloc(node); - ret = NULL; - goto RETURN; + return (NULL); } offset = (uintptr_t)ret & (alignment - 1); @@ -3967,11 +3921,8 @@ arena->stats.npalloc++; malloc_mutex_unlock(&arena->mtx); #endif -RETURN: - if (opt_junk) { - if (ret != NULL) - memset(ret, 0xa5, size); - } + if (opt_junk) + memset(ret, 0xa5, size); assert(((uintptr_t)ret & (alignment - 1)) == 0); return (ret); } @@ -4087,7 +4038,7 @@ if (region_ceiling(size) <= (chunk_size >> 1)) { ret = arena_malloc(arena, size); if (ret == NULL) - goto RETURN; + return (NULL); if (opt_junk) memset(ret, 0xa5, size); @@ -4098,7 +4049,7 @@ } else { ret = huge_malloc(arena, size); if (ret == NULL) - goto RETURN; + return (NULL); if (opt_junk) memset(ret, 0xa5, size); @@ -4122,7 +4073,6 @@ arena->stats.nralloc++; malloc_mutex_unlock(&arena->mtx); #endif -RETURN: return (ret); } ==== //depot/projects/superpages/src/lib/libdisk/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libdisk/Makefile,v 1.45 2006/01/12 07:26:57 ru Exp $ +# $FreeBSD: src/lib/libdisk/Makefile,v 1.46 2006/01/27 16:32:13 harti Exp $ .if ${MACHINE_ARCH} == "ia64" _open_disk= open_ia64_disk.c @@ -22,6 +22,7 @@ CLEANFILES+= tmp.c tst01 tst01.o NO_PROFILE= +NO_PIC= MAN= libdisk.3 ==== //depot/projects/superpages/src/lib/libdisk/libdisk.3#3 (text+ko) ==== @@ -25,9 +25,9 @@ .\" (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/libdisk/libdisk.3,v 1.35 2005/11/24 10:30:44 ru Exp $ +.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.38 2006/01/27 16:38:05 harti Exp $ .\" " -.Dd March 15, 1996 +.Dd January 27, 2006 .Dt LIBDISK 3 .Os .Sh NAME @@ -117,6 +117,13 @@ .Ft const char * .Fn slice_type_name "int type" "int subtype" .Sh DESCRIPTION +.Nm libdisk +.Sy is just for the use of +.Xr sysinstall 8 . +.Sy You should consider using +.Xr libgeom 3 +.Sy instead. +.Pp The .Nm libdisk library provides an interface to the low-level disk slice and partition labels. ==== //depot/projects/superpages/src/share/man/man4/ng_pppoe.4#2 (text+ko) ==== @@ -32,10 +32,10 @@ .\" .\" Author: Archie Cobbs .\" -.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.31 2005/07/05 17:51:02 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.33 2006/01/27 11:56:59 glebius Exp $ .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $ .\" -.Dd July 5, 2005 +.Dd January 27, 2006 .Dt NG_PPPOE 4 .Os .Sh NAME @@ -182,31 +182,51 @@ .Ed .Bl -tag -width 3n .It Dv NGM_PPPOE_GETMODE -The -.Nm >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 27 21:23:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C72E916A423; Fri, 27 Jan 2006 21:23:36 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 A21EE16A420 for ; Fri, 27 Jan 2006 21:23:36 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5068943D46 for ; Fri, 27 Jan 2006 21:23:36 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RLNaWK059347 for ; Fri, 27 Jan 2006 21:23:36 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RLNapt059344 for perforce@freebsd.org; Fri, 27 Jan 2006 21:23:36 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 21:23:36 GMT Message-Id: <200601272123.k0RLNapt059344@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 21:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=90505 Change 90505 by alc@alc_home on 2006/01/27 21:23:34 Revert a change that has nothing to do with superpages. Affected files ... .. //depot/projects/superpages/src/sys/netinet/tcp_subr.c#5 edit Differences ... ==== //depot/projects/superpages/src/sys/netinet/tcp_subr.c#5 (text+ko) ==== @@ -1962,7 +1962,7 @@ (save_ticks - tp->t_bw_rtttime); tp->t_bw_rtttime = save_ticks; tp->t_bw_rtseq = ack_seq; - if (tp->t_bw_rtttime == 0 || (long)bw < 0) + if (tp->t_bw_rtttime == 0 || (int)bw < 0) return; bw = ((int64_t)tp->snd_bandwidth * 15 + bw) >> 4; From owner-p4-projects@FreeBSD.ORG Fri Jan 27 22:53:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0E6916A423; Fri, 27 Jan 2006 22:53:43 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 755BD16A420 for ; Fri, 27 Jan 2006 22:53:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C24F43D6E for ; Fri, 27 Jan 2006 22:53:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RMrWkd063529 for ; Fri, 27 Jan 2006 22:53:32 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RMrVcK063515 for perforce@freebsd.org; Fri, 27 Jan 2006 22:53:31 GMT (envelope-from jhb@freebsd.org) Date: Fri, 27 Jan 2006 22:53:31 GMT Message-Id: <200601272253.k0RMrVcK063515@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 Cc: Subject: PERFORCE change 90517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 22:53:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=90517 Change 90517 by jhb@jhb_slimer on 2006/01/27 22:52:38 IFC @90516. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#41 integrate .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#18 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#6 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#7 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#34 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#63 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#3 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#31 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#26 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#26 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#26 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#26 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#26 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#43 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.h#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#29 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#18 integrate .. //depot/projects/smpng/sys/conf/files#164 integrate .. //depot/projects/smpng/sys/conf/files.amd64#38 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#38 integrate .. //depot/projects/smpng/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/smpng/sys/dev/an/if_an.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#78 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#42 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#55 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#40 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#44 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#26 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/smpng/sys/dev/auxio/auxio.c#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#69 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#38 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#26 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#29 integrate .. //depot/projects/smpng/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/smpng/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/smpng/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/smpng/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/smpng/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/smpng/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/smpng/sys/dev/ed/if_ed.c#37 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_3c503.c#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#15 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_hpp.c#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#16 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_sic.c#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_wd80x3.c#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_edvar.h#14 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#63 integrate .. //depot/projects/smpng/sys/dev/iir/iir.h#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#37 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#36 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#27 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#32 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#11 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#15 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#10 integrate .. //depot/projects/smpng/sys/dev/isp/isp_tpublic.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#18 integrate .. //depot/projects/smpng/sys/dev/isp/ispreg.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#27 integrate .. //depot/projects/smpng/sys/dev/md/md.c#72 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_fc.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_init.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_lan.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_raid.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_targ.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#8 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#68 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#15 integrate .. //depot/projects/smpng/sys/dev/rp/rp_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/driver.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#27 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#20 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#26 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#34 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.h#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#14 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#52 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#84 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#31 integrate .. //depot/projects/smpng/sys/fs/msdosfs/direntry.h#7 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#26 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#12 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#33 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#25 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#18 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#23 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#33 integrate .. //depot/projects/smpng/sys/geom/label/g_label_ntfs.c#5 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#23 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#20 integrate .. //depot/projects/smpng/sys/geom/uzip/g_uzip.c#8 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#71 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#28 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#91 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#27 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.S#7 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#10 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#17 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#52 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_alq.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#48 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#58 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#21 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#149 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#65 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#67 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#1 branch .. //depot/projects/smpng/sys/kern/tty_pty.c#44 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#17 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#68 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#89 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#118 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#96 integrate .. //depot/projects/smpng/sys/libkern/fnmatch.c#5 integrate .. //depot/projects/smpng/sys/modules/amr/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/nwfs/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/smbfs/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/svr4/Makefile#6 integrate .. //depot/projects/smpng/sys/net/if.c#77 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#21 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#22 integrate .. //depot/projects/smpng/sys/net/if_ef.c#23 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#69 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#27 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#12 integrate .. //depot/projects/smpng/sys/net/if_gre.c#28 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#24 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#39 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#27 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#24 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#17 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#18 integrate .. //depot/projects/smpng/sys/netatm/atm_signal.c#7 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#29 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#12 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#15 integrate .. //depot/projects/smpng/sys/netinet/in.c#32 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#58 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#23 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#67 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#17 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.h#5 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#38 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#74 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#45 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#81 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#79 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#45 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#64 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#9 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#42 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#11 integrate .. //depot/projects/smpng/sys/netipsec/keysock.h#3 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#24 integrate .. //depot/projects/smpng/sys/netkey/keysock.h#5 integrate .. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#41 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#43 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#66 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#12 integrate .. //depot/projects/smpng/sys/sparc64/central/central.c#7 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#22 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc_central.c#7 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc_nexus.c#7 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#8 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#37 integrate .. //depot/projects/smpng/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#23 integrate .. //depot/projects/smpng/sys/sys/ata.h#24 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#32 integrate .. //depot/projects/smpng/sys/sys/ktr.h#25 integrate .. //depot/projects/smpng/sys/sys/lock.h#37 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#58 integrate .. //depot/projects/smpng/sys/sys/param.h#96 integrate .. //depot/projects/smpng/sys/sys/proc.h#159 integrate .. //depot/projects/smpng/sys/sys/syscall.h#64 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#64 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#66 integrate .. //depot/projects/smpng/sys/sys/tree.h#7 integrate .. //depot/projects/smpng/sys/sys/ttycom.h#7 integrate .. //depot/projects/smpng/sys/sys/turnstile.h#8 integrate .. //depot/projects/smpng/sys/sys/user.h#26 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#60 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#54 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#77 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#75 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#31 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#70 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#32 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#56 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#41 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.299 2006/01/06 18:02:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.300 2006/01/27 22:22:10 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -237,8 +237,16 @@ * do the VM lookup, so just consider it a fatal trap so the * kernel can print out a useful trap message and even get * to the debugger. + * + * If we get a page fault while holding a non-sleepable + * lock, then it is most likely a fatal kernel page fault. + * If WITNESS is enabled, then it's going to whine about + * bogus LORs with various VM locks, so just skip to the + * fatal trap handling directly. */ - if (td->td_critnest != 0) + if (td->td_critnest != 0 || + WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, + "Kernel page fault") != 0) trap_fatal(&frame, frame.tf_addr); } ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#4 (text+ko) ==== @@ -23,13 +23,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.4 2005/12/20 01:28:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.5 2006/01/20 00:46:44 cognet Exp $"); #include #include #include #include #include #include +#include + #include #include "opt_global.h" @@ -204,7 +206,7 @@ { Elf32_Ehdr *eh; Elf32_Phdr phdr[512] /* XXX */, *php; - Elf32_Shdr *shdr; + Elf32_Shdr shdr[512] /* XXX */; int i,j; void *entry_point; int symtabindex = -1; @@ -228,9 +230,6 @@ } /* Save the symbol tables, as there're about to be scratched. */ - lastaddr = roundup(lastaddr, sizeof(long)); - shdr = (Elf_Shdr *)lastaddr; - lastaddr += sizeof(*shdr) * eh->e_shnum; memcpy(shdr, (void *)(kstart + eh->e_shoff), sizeof(*shdr) * eh->e_shnum); if (eh->e_shnum * eh->e_shentsize != 0 && @@ -337,7 +336,51 @@ extern char func_end[]; extern void *_end; -void __start(void) + +#define PMAP_DOMAIN_KERNEL 15 /* + * Just define it instead of including the + * whole VM headers set. + */ +int __hack; +static __inline void +setup_pagetables(unsigned int pt_addr, vm_paddr_t physstart, vm_paddr_t physend) +{ + unsigned int *pd = (unsigned int *)pt_addr; + vm_paddr_t addr; + int domain = (DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT; + int tmp; + + bzero(pd, L1_TABLE_SIZE); + for (addr = physstart; addr < physend; addr += L1_S_SIZE) + pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)| + L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr; + /* XXX: See below */ + if (0xfff00000 < physstart || 0xfff00000 > physend) + pd[0xfff00000 >> L1_S_SHIFT] = L1_TYPE_S|L1_S_AP(AP_KRW)| + L1_S_DOM(PMAP_DOMAIN_KERNEL)|physstart; + __asm __volatile("mcr p15, 0, %1, c2, c0, 0\n" /* set TTB */ + "mcr p15, 0, %1, c8, c7, 0\n" /* Flush TTB */ + "mcr p15, 0, %2, c3, c0, 0\n" /* Set DAR */ + "mrc p15, 0, %0, c1, c0, 0\n" + "orr %0, %0, #1\n" /* MMU_ENABLE */ + "mcr p15, 0, %0, c1, c0, 0\n" + "mrc p15, 0, %0, c2, c0, 0\n" /* CPWAIT */ + "mov r0, r0\n" + "sub pc, pc, #4\n" : + "=r" (tmp) : "r" (pd), "r" (domain)); + + /* + * XXX: This is the most stupid workaround I've ever wrote. + * For some reason, the KB9202 won't boot the kernel unless + * we access an address which is not in the + * 0x20000000 - 0x20ffffff range. I hope I'll understand + * what's going on later. + */ + __hack = *(volatile int *)0xfffff21c; +} + +void +__start(void) { void *curaddr; void *dst; @@ -348,6 +391,10 @@ curaddr = (void*)((unsigned int)curaddr & 0xfff00000); #ifdef KZIP if (*kernel == 0x1f && kernel[1] == 0x8b) { + int pt_addr = (((int)&_end + KERNSIZE + 0x100) & + ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; + setup_pagetables(pt_addr, (vm_paddr_t)curaddr, + (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ dst = inflate_kernel(kernel, &_end); kernel = (char *)&_end; ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#18 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.20 2005/12/05 12:58:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.21 2006/01/27 21:07:04 cognet Exp $"); #include #include @@ -477,9 +477,11 @@ "smallalloc", 0); in_sleep--; goto retry; + } else if (in_alloc) { + mtx_unlock(&smallalloc_mtx); + return (NULL); } - if (wait & M_WAITOK) - in_alloc = 1; + in_alloc = 1; mtx_unlock(&smallalloc_mtx); /* Try to alloc 1MB of contiguous memory. */ ret = arm_uma_do_alloc(&sp, bytes, zone == l2zone ? ==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.5 2005/09/25 21:06:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.6 2006/01/23 14:03:14 cognet Exp $"); #include #include @@ -368,15 +368,17 @@ rm = &sc->sc_io_rman; bt = sc->sc_pciio; bh = sc->sc_io; - start = start - 0x90000000 + sc->sc_io; - end = end - 0x90000000 + sc->sc_io; + if (start < sc->sc_io) { + start = start - 0x90000000 + sc->sc_io; + end = end - 0x90000000 + sc->sc_io; + } break; default: return (NULL); } rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) + if (rv == NULL) return (NULL); if (type != SYS_RES_IRQ) { bh += (rman_get_start(rv)); ==== //depot/projects/smpng/sys/boot/ia64/efi/start.S#2 (text+ko) ==== @@ -23,56 +23,32 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.8 2004/11/23 05:38:30 marcel Exp $ + * $FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.10 2006/01/18 18:49:25 marcel Exp $ */ .text #include - + #define EFI_SUCCESS 0 #define EFI_LOAD_ERROR 1 #define EFI_BUFFER_TOO_SMALL 5 - + #define DT_NULL 0 /* Terminating entry. */ -#define DT_NEEDED 1 /* String table offset of a needed shared - library. */ #define DT_PLTRELSZ 2 /* Total size in bytes of PLT relocations. */ -#define DT_PLTGOT 3 /* Processor-dependent address. */ -#define DT_HASH 4 /* Address of symbol hash table. */ -#define DT_STRTAB 5 /* Address of string table. */ #define DT_SYMTAB 6 /* Address of symbol table. */ #define DT_RELA 7 /* Address of ElfNN_Rela relocations. */ #define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */ #define DT_RELAENT 9 /* Size of each ElfNN_Rela relocation entry. */ -#define DT_STRSZ 10 /* Size of string table. */ #define DT_SYMENT 11 /* Size of each symbol table entry. */ -#define DT_INIT 12 /* Address of initialization function. */ -#define DT_FINI 13 /* Address of finalization function. */ -#define DT_SONAME 14 /* String table offset of shared object - name. */ -#define DT_RPATH 15 /* String table offset of library path. */ -#define DT_SYMBOLIC 16 /* Indicates "symbolic" linking. */ -#define DT_REL 17 /* Address of ElfNN_Rel relocations. */ -#define DT_RELSZ 18 /* Total size of ElfNN_Rel relocations. */ -#define DT_RELENT 19 /* Size of each ElfNN_Rel relocation. */ -#define DT_PLTREL 20 /* Type of relocation used for PLT. */ -#define DT_DEBUG 21 /* Reserved (not used). */ -#define DT_TEXTREL 22 /* Indicates there may be relocations in - non-writable segments. */ #define DT_JMPREL 23 /* Address of PLT relocations. */ -#define DT_COUNT 24 /* Number of defined d_tag values. */ - -#define R_IA64_NONE 0 /* None */ -#define R_IA64_DIR64MSB 0x26 /* word64 MSB S + A */ -#define R_IA64_DIR64LSB 0x27 /* word64 LSB S + A */ -#define R_IA64_FPTR64MSB 0x46 /* word64 MSB @fptr(S + A) */ -#define R_IA64_FPTR64LSB 0x47 /* word64 LSB @fptr(S + A) */ -#define R_IA64_REL64MSB 0x6e /* word64 MSB BD + A */ -#define R_IA64_REL32LSB 0x6d /* word32 LSB BD + A */ -#define R_IA64_REL64LSB 0x6f /* word64 LSB BD + A */ -#define R_IA64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ +#define R_IA_64_NONE 0 /* None */ +#define R_IA_64_DIR64LSB 0x27 /* word64 LSB S + A */ +#define R_IA_64_FPTR64LSB 0x47 /* word64 LSB @fptr(S + A) */ +#define R_IA_64_REL32LSB 0x6d /* word32 LSB BD + A */ +#define R_IA_64_REL64LSB 0x6f /* word64 LSB BD + A */ +#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ ENTRY(_start, 2) alloc loc0=ar.pfs,2,3,3,0 @@ -134,7 +110,7 @@ // r22 = size of PLT relocations // r23 = relocation type // r24 = address of symbol -// r28 = R_IA64_IPLTLSB +// r28 = R_IA_64_IPLTLSB // f8 = address of symbol table // f9 = size of symtab element @@ -155,7 +131,7 @@ mov r19=0 mov r22=0 mov r20=24 - mov r28=R_IA64_IPLTLSB + mov r28=R_IA_64_IPLTLSB ;; 1: ld8 r16=[r15],8 // read r15->d_tag @@ -214,13 +190,13 @@ sub r19=r19,r20 // update relasz extr.u r23=r16,0,32 // ELF64_R_TYPE(r16) ;; - cmp.eq p6,p0=R_IA64_NONE,r23 + cmp.eq p6,p0=R_IA_64_NONE,r23 (p6) br.cond.dpnt.few 2b ;; - cmp.eq p6,p0=R_IA64_REL32LSB,r23 + cmp.eq p6,p0=R_IA_64_REL32LSB,r23 (p6) br.cond.dptk.few 3f ;; - cmp.eq p6,p0=R_IA64_REL64LSB,r23 + cmp.eq p6,p0=R_IA_64_REL64LSB,r23 (p6) br.cond.dptk.few 4f ;; extr.u r29=r16,32,32 // ELF64_R_SYM(r16) @@ -237,10 +213,10 @@ ;; add r24=r29,in0 // relocate symbol value ;; - cmp.eq p6,p0=R_IA64_DIR64LSB,r23 + cmp.eq p6,p0=R_IA_64_DIR64LSB,r23 (p6) br.cond.dptk.few 5f ;; - cmp.eq p6,p0=R_IA64_FPTR64LSB,r23 + cmp.eq p6,p0=R_IA_64_FPTR64LSB,r23 (p6) br.cond.dptk.few 6f ;; cmp.ne p6,p0=r28,r23 // IPLTLSB ==== //depot/projects/smpng/sys/cam/cam_ccb.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.28 2005/01/05 22:34:34 imp Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.29 2006/01/20 19:21:38 mjacob Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -226,13 +226,14 @@ XPORT_SSA, /* Serial Storage Architecture */ XPORT_USB, /* Universal Serial Bus */ XPORT_PPB, /* Parallel Port Bus */ - XPORT_ATA /* AT Attachment */ + XPORT_ATA, /* AT Attachment */ + XPORT_SAS, /* Serial Attached SCSI */ } cam_xport; -#define PROTO_VERSION_UNKNOWN (UINT_MAX - 1) -#define PROTO_VERSION_UNSPECIFIED UINT_MAX -#define XPORT_VERSION_UNKNOWN (UINT_MAX - 1) -#define XPORT_VERSION_UNSPECIFIED UINT_MAX +#define PROTO_VERSION_UNKNOWN (UINT_MAX - 1) +#define PROTO_VERSION_UNSPECIFIED UINT_MAX +#define XPORT_VERSION_UNKNOWN (UINT_MAX - 1) +#define XPORT_VERSION_UNSPECIFIED UINT_MAX #endif /* CAM_NEW_TRAN_CODE */ typedef union { @@ -527,6 +528,9 @@ u_int32_t port; /* 24 bit port id, if known */ u_int32_t bitrate; /* Mbps */ }; +struct ccb_pathinq_settings_sas { + u_int32_t bitrate; /* Mbps */ +}; #define PATHINQ_SETTINGS_SIZE 128 #endif /* CAM_NEW_TRAN_CODE */ @@ -558,6 +562,7 @@ union { struct ccb_pathinq_settings_spi spi; struct ccb_pathinq_settings_fc fc; + struct ccb_pathinq_settings_sas sas; char ccb_pathinq_settings_opaque[PATHINQ_SETTINGS_SIZE]; } xport_specific; #endif /* CAM_NEW_TRAN_CODE */ @@ -761,6 +766,13 @@ u_int32_t bitrate; /* Mbps */ }; +struct ccb_trans_settings_sas { + u_int valid; /* Which fields to honor */ +#define CTS_SAS_VALID_SPEED 0x1000 + u_int32_t bitrate; /* Mbps */ +}; + + /* Get/Set transfer rate/width/disconnection/tag queueing settings */ struct ccb_trans_settings { struct ccb_hdr ccb_h; @@ -777,6 +789,7 @@ u_int valid; /* Which fields to honor */ struct ccb_trans_settings_spi spi; struct ccb_trans_settings_fc fc; + struct ccb_trans_settings_sas sas; } xport_specific; }; ==== //depot/projects/smpng/sys/cam/cam_xpt.c#34 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.157 2006/01/11 02:06:08 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.158 2006/01/20 19:21:38 mjacob Exp $"); #include #include @@ -1632,6 +1632,13 @@ } } + if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SAS) { + struct ccb_trans_settings_sas *sas = &cts.xport_specific.sas; + if (sas->valid & CTS_SAS_VALID_SPEED) { + speed = sas->bitrate; + } + } + mb = speed / 1000; if (mb > 0) printf("%s%d: %d.%03dMB/s transfers", ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#63 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.184 2006/01/13 11:33:40 mnag Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.185 2006/01/26 00:35:53 flz Exp $"); #include @@ -379,6 +379,54 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB2.0*", "(FS) FLASH DISK*", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * Samsung USB key 128Mb + * PR: usb/90081 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "USB-DISK", "FreeDik-FlashUsb", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Kingston DataTraveler 2.0 USB Flash memory. + * PR: usb/89196 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Kingston", "DataTraveler 2.0", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * Creative MUVO Slim mp3 player (USB) + * PR: usb/86131 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "CREATIVE", "MuVo Slim", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE|DA_Q_NO_PREVENT + }, + { + /* + * United MP5512 Portable MP3 Player (2-in-1 USB DISK/MP3) + * PR: usb/80487 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Generic*", "MUSIC DISK", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * SanDisk Micro Cruzer 128MB + * PR: usb/75970 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SanDisk" , "Micro Cruzer", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* + * PNY USB Flash keys + * PR: usb/75578, usb/72344, usb/65436 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "*" , "USB DISK*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.3 2005/01/05 22:34:35 imp Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_ses.h,v 1.4 2006/01/18 08:37:27 mjacob Exp $ */ /*- * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -29,7 +29,7 @@ * */ -#define SESIOC (('s' - 040) << 8) +#define SESIOC ('s' - 040) #define SESIOC_GETNOBJ _IO(SESIOC, 1) #define SESIOC_GETOBJMAP _IO(SESIOC, 2) #define SESIOC_GETENCSTAT _IO(SESIOC, 3) ==== //depot/projects/smpng/sys/coda/coda_vnops.c#25 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.66 2005/04/13 10:59:07 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.67 2006/01/21 19:51:47 rwatson Exp $"); #include #include @@ -345,13 +345,8 @@ } int -coda_rdwr(vp, uiop, rw, ioflag, cred, td) - struct vnode *vp; - struct uio *uiop; - enum uio_rw rw; - int ioflag; - struct ucred *cred; - struct thread *td; +coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag, + struct ucred *cred, struct thread *td) { /* upcall decl */ /* NOTE: container file operation!!! */ @@ -1710,8 +1705,7 @@ } void -print_vattr( attr ) - struct vattr *attr; +print_vattr(struct vattr *attr) { char *typestr; @@ -1769,8 +1763,7 @@ /* How to print a ucred */ void -print_cred(cred) - struct ucred *cred; +print_cred(struct ucred *cred) { int i; @@ -1792,8 +1785,7 @@ * table when coda_inactive calls coda_unsave. */ struct cnode * -make_coda_node(fid, vfsp, type) - CodaFid *fid; struct mount *vfsp; short type; +make_coda_node(CodaFid *fid, struct mount *vfsp, short type) { struct cnode *cp; int err; @@ -1821,7 +1813,7 @@ } int -coda_pathconf( struct vop_pathconf_args *ap) +coda_pathconf(struct vop_pathconf_args *ap) { int error; register_t *retval; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.48 2005/12/08 22:14:25 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.49 2006/01/20 16:22:06 ambrisko Exp $"); #include "opt_compat.h" @@ -1221,6 +1221,27 @@ } int +freebsd32_lutimes(struct thread *td, struct freebsd32_lutimes_args *uap) +{ + struct timeval32 s32[2]; + struct timeval s[2], *sp; + int error; + + if (uap->tptr != NULL) { + error = copyin(uap->tptr, s32, sizeof(s32)); + if (error) + return (error); + CP(s32[0], s[0], tv_sec); + CP(s32[0], s[0], tv_usec); + CP(s32[1], s[1], tv_sec); + CP(s32[1], s[1], tv_usec); + sp = s; + } else + sp = NULL; + return (kern_lutimes(td, uap->path, UIO_USERSPACE, sp, UIO_SYSSPACE)); +} + +int freebsd32_futimes(struct thread *td, struct freebsd32_futimes_args *uap) { struct timeval32 s32[2]; ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#26 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.48 2005/12/23 20:06:50 ru Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.51 2006/01/20 21:10:37 ambrisko Exp $ + * created from FreeBSD */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -220,6 +220,10 @@ char rqtp_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * rqtp; char rqtp_r_[PADR_(const struct timespec32 *)]; char rmtp_l_[PADL_(struct timespec32 *)]; struct timespec32 * rmtp; char rmtp_r_[PADR_(struct timespec32 *)]; }; +struct freebsd32_lutimes_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)]; +}; struct freebsd32_preadv_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; @@ -306,6 +310,7 @@ int freebsd32_clock_settime(struct thread *, struct freebsd32_clock_settime_args *); int freebsd32_clock_getres(struct thread *, struct freebsd32_clock_getres_args *); int freebsd32_nanosleep(struct thread *, struct freebsd32_nanosleep_args *); +int freebsd32_lutimes(struct thread *, struct freebsd32_lutimes_args *); int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *); int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *); int freebsd32_modstat(struct thread *, struct freebsd32_modstat_args *); ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#26 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.48 2005/12/23 20:06:50 ru Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.49 2006/01/20 16:22:37 ambrisko Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp */ @@ -213,7 +213,7 @@ #define FREEBSD32_SYS_getdents 272 #define FREEBSD32_SYS_lchmod 274 #define FREEBSD32_SYS_netbsd_lchown 275 -#define FREEBSD32_SYS_lutimes 276 +#define FREEBSD32_SYS_freebsd32_lutimes 276 #define FREEBSD32_SYS_netbsd_msync 277 #define FREEBSD32_SYS_nstat 278 #define FREEBSD32_SYS_nfstat 279 ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#26 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.39 2005/12/23 20:06:50 ru Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.40 2006/01/20 16:22:37 ambrisko Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp */ @@ -283,7 +283,7 @@ "#273", /* 273 = nosys */ "lchmod", /* 274 = lchmod */ "netbsd_lchown", /* 275 = netbsd_lchown */ - "lutimes", /* 276 = lutimes */ + "freebsd32_lutimes", /* 276 = freebsd32_lutimes */ "netbsd_msync", /* 277 = netbsd_msync */ "nstat", /* 278 = nstat */ "nfstat", /* 279 = nfstat */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#26 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.49 2005/12/23 20:06:50 ru Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.50 2006/01/20 16:22:37 ambrisko Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp */ @@ -308,7 +308,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = nosys */ { SYF_MPSAFE | AS(lchmod_args), (sy_call_t *)lchmod, AUE_NULL }, /* 274 = lchmod */ { SYF_MPSAFE | AS(lchown_args), (sy_call_t *)lchown, AUE_NULL }, /* 275 = netbsd_lchown */ - { SYF_MPSAFE | AS(lutimes_args), (sy_call_t *)lutimes, AUE_NULL }, /* 276 = lutimes */ + { SYF_MPSAFE | AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_NULL }, /* 276 = freebsd32_lutimes */ { SYF_MPSAFE | AS(msync_args), (sy_call_t *)msync, AUE_NULL }, /* 277 = netbsd_msync */ { SYF_MPSAFE | AS(nstat_args), (sy_call_t *)nstat, AUE_NULL }, /* 278 = nstat */ { SYF_MPSAFE | AS(nfstat_args), (sy_call_t *)nfstat, AUE_NULL }, /* 279 = nfstat */ ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#26 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.61 2005/12/23 20:06:14 ru Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.62 2006/01/20 16:22:06 ambrisko Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -476,8 +476,8 @@ 275 AUE_NULL MNOPROTO { int lchown(char *path, uid_t uid, \ gid_t gid); } netbsd_lchown \ lchown_args int -276 AUE_NULL MNOPROTO { int lutimes(char *path, \ - struct timeval *tptr); } +276 AUE_NULL MSTD { int freebsd32_lutimes(char *path, \ + struct timeval32 *tptr); } 277 AUE_NULL MNOPROTO { int msync(void *addr, size_t len, \ int flags); } netbsd_msync msync_args int 278 AUE_NULL MNOPROTO { int nstat(char *path, struct nstat *ub); } ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#43 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.131 2005/12/13 15:32:52 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.132 2006/01/26 01:32:46 cognet Exp $"); #include #include @@ -1010,7 +1010,15 @@ args->cmd = TIOCCBRK; error = (ioctl(td, (struct ioctl_args *)args)); break; - + case LINUX_TIOCGPTN: { + int nb; + + error = fo_ioctl(fp, TIOCGPTN, (caddr_t)&nb, td->td_ucred, td); + if (!error) + error = copyout(&nb, (void *)args->arg, + sizeof(int)); + break; + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 27 23:02:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B1AC16A423; Fri, 27 Jan 2006 23:02:48 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 049FA16A420 for ; Fri, 27 Jan 2006 23:02:48 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD2FC43D46 for ; Fri, 27 Jan 2006 23:02:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RN2lCv064016 for ; Fri, 27 Jan 2006 23:02:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RN2lBc064013 for perforce@freebsd.org; Fri, 27 Jan 2006 23:02:47 GMT (envelope-from jhb@freebsd.org) Date: Fri, 27 Jan 2006 23:02:47 GMT Message-Id: <200601272302.k0RN2lBc064013@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 Cc: Subject: PERFORCE change 90521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 23:02:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=90521 Change 90521 by jhb@jhb_slimer on 2006/01/27 23:02:37 Integ changes from jhb_lock branch. Affected files ... .. //depot/projects/smpng/sys/modules/crash/crash.c#28 integrate Differences ... ==== //depot/projects/smpng/sys/modules/crash/crash.c#28 (text+ko) ==== @@ -49,11 +49,12 @@ #include #include #include +#include #include -#include -#include #include #include +#include +#include struct crash_event { const char *ev_name; @@ -69,6 +70,7 @@ #define MAX_EVENT SET_COUNT(crash_event_set) +static struct rwlock baz; static struct sx foo, bar, bar2; static struct cv event_cv; static struct mtx event_mtx, test_mtx, test1_mtx, test2_mtx; @@ -83,6 +85,49 @@ /* Events. */ +#ifdef WITNESS +static void +fault_with_lock(void) +{ + char c, *cp; + + cp = NULL; + mtx_lock(&test_mtx); + c = *cp; + mtx_unlock(&test_mtx); + printf("Read value of %x\n", (int)c); +} +CRASH_EVENT("fault with a mutex held", fault_with_lock); +#endif + +static void +rwlock_wlock(void) +{ + + rw_init(&baz, "baz"); + kdb_enter("baz exists"); + rw_wlock(&baz); + kdb_enter("baz has a writer"); + rw_wunlock(&baz); + kdb_enter("baz is unlocked"); + rw_destroy(&baz); +} +CRASH_EVENT("rw_wlock", rwlock_wlock); + +static void +rwlock_rlock(void) +{ + + rw_init(&baz, "baz"); + kdb_enter("baz exists"); + rw_rlock(&baz); + kdb_enter("baz has a reader"); + rw_runlock(&baz); + kdb_enter("baz is unlocked"); + rw_destroy(&baz); +} +CRASH_EVENT("rw_rlock", rwlock_rlock); + static void msleep_spin_callout(void *dummy) { From owner-p4-projects@FreeBSD.ORG Fri Jan 27 23:03:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F30A216A423; Fri, 27 Jan 2006 23:03:49 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 CD5B816A420 for ; Fri, 27 Jan 2006 23:03:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BFAD43D48 for ; Fri, 27 Jan 2006 23:03:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RN3npF064061 for ; Fri, 27 Jan 2006 23:03:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RN3nO2064058 for perforce@freebsd.org; Fri, 27 Jan 2006 23:03:49 GMT (envelope-from jhb@freebsd.org) Date: Fri, 27 Jan 2006 23:03:49 GMT Message-Id: <200601272303.k0RN3nO2064058@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 Cc: Subject: PERFORCE change 90522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 23:03:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=90522 Change 90522 by jhb@jhb_slimer on 2006/01/27 23:03:21 Add crash2 module from jhb_lock branch. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/Makefile#1 branch .. //depot/projects/smpng/sys/modules/crash2/crash2.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 27 23:42:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 284DB16A423; Fri, 27 Jan 2006 23:42:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 F3D1916A420 for ; Fri, 27 Jan 2006 23:42:40 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC7B543D46 for ; Fri, 27 Jan 2006 23:42:40 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0RNgeLK066069 for ; Fri, 27 Jan 2006 23:42:40 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0RNgekP066066 for perforce@freebsd.org; Fri, 27 Jan 2006 23:42:40 GMT (envelope-from alc@freebsd.org) Date: Fri, 27 Jan 2006 23:42:40 GMT Message-Id: <200601272342.k0RNgekP066066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2006 23:42:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90532 Change 90532 by alc@alc_home on 2006/01/27 23:42:15 Introduce PG_CACHE. Soon, the free and cache queues will be merged so that the buddy allocator has a greater chance of providing large, contiguous blocks of memory. At that time, this flag will be used to distinguish "free" pages that still cache data (and belong to a vm object). Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_page.h#7 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_page.h#7 (text+ko) ==== @@ -194,6 +194,7 @@ #define PG_WINATCFLS 0x0004 /* flush dirty page on inactive q */ #define PG_FICTITIOUS 0x0008 /* physical page doesn't exist (O) */ #define PG_WRITEABLE 0x0010 /* page is mapped writeable */ +#define PG_CACHE 0x0020 /* page is easily freed */ #define PG_ZERO 0x0040 /* page is zeroed */ #define PG_REFERENCED 0x0080 /* page has been referenced */ #define PG_CLEANCHK 0x0100 /* page will be checked for cleaning */ From owner-p4-projects@FreeBSD.ORG Sat Jan 28 00:06:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E41E16A424; Sat, 28 Jan 2006 00:06:22 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 4B67916A420 for ; Sat, 28 Jan 2006 00:06:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9151443D49 for ; Sat, 28 Jan 2006 00:06:21 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0S06Lge066994 for ; Sat, 28 Jan 2006 00:06:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0S06HaD066991 for perforce@freebsd.org; Sat, 28 Jan 2006 00:06:17 GMT (envelope-from imp@freebsd.org) Date: Sat, 28 Jan 2006 00:06:17 GMT Message-Id: <200601280006.k0S06HaD066991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 00:06:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=90535 Change 90535 by imp@imp_harmony on 2006/01/28 00:06:03 IFC @90525 Affected files ... .. //depot/projects/arm/src/sys/Makefile#4 integrate .. //depot/projects/arm/src/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/arm/src/sys/alpha/include/_types.h#4 integrate .. //depot/projects/arm/src/sys/alpha/include/param.h#4 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/arm/src/sys/amd64/include/_types.h#6 integrate .. //depot/projects/arm/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/arm/src/sys/arm/include/_types.h#4 integrate .. //depot/projects/arm/src/sys/arm/include/param.h#3 integrate .. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate .. //depot/projects/arm/src/sys/boot/common/module.c#2 integrate .. //depot/projects/arm/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/arm/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/arm/src/sys/coda/coda_vfsops.c#4 integrate .. //depot/projects/arm/src/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#9 integrate .. //depot/projects/arm/src/sys/conf/NOTES#12 integrate .. //depot/projects/arm/src/sys/conf/files#13 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#7 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#6 integrate .. //depot/projects/arm/src/sys/conf/options#12 integrate .. //depot/projects/arm/src/sys/contrib/pf/net/pf_norm.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#7 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/arm/src/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/arm/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#9 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#7 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/auxio/auxio.c#3 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#7 integrate .. //depot/projects/arm/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/arm/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/arm/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/arm/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/arm/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/arm/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/arm/src/sys/dev/ed/if_ed.c#4 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_3c503.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_hpp.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_isa.c#4 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_sic.c#4 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_wd80x3.c#4 integrate .. //depot/projects/arm/src/sys/dev/ed/if_edvar.h#4 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#11 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/arm/src/sys/dev/ieee488/pcii.c#3 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_inline.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/arm/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/md/md.c#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_init.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/arm/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/arm/src/sys/dev/rp/rp_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/si/si.c#3 integrate .. //depot/projects/arm/src/sys/dev/si/si2_z280.c#2 integrate .. //depot/projects/arm/src/sys/dev/si/si3_t225.c#2 integrate .. //depot/projects/arm/src/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/driver.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ess.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/vchan.c#3 integrate .. //depot/projects/arm/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/arm/src/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralreg.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/ufoma.c#1 branch .. //depot/projects/arm/src/sys/dev/usb/uhci.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/umass.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/arm/src/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#4 integrate .. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/arm/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/arm/src/sys/geom/nop/g_nop.c#4 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/arm/src/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_var.h#4 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate .. //depot/projects/arm/src/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/arm/src/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#4 integrate .. //depot/projects/arm/src/sys/i386/include/_types.h#6 integrate .. //depot/projects/arm/src/sys/i386/include/param.h#3 integrate .. //depot/projects/arm/src/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/arm/src/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/arm/src/sys/ia64/include/_types.h#4 integrate .. //depot/projects/arm/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/param.h#4 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.c#3 integrate .. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/arm/src/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_alq.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_sysctl.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/arm/src/sys/kern/md5c.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/arm/src/sys/kern/subr_disk.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_lock.c#1 branch .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/arm/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/arm/src/sys/kern/tty.c#6 integrate .. //depot/projects/arm/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/arm/src/sys/kern/tty_pts.c#1 branch .. //depot/projects/arm/src/sys/kern/tty_pty.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/arm/src/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/arm/src/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/arm/src/sys/libkern/gets.c#2 integrate .. //depot/projects/arm/src/sys/modules/Makefile#8 integrate .. //depot/projects/arm/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/nwfs/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/smbfs/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/ufoma/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/if.c#5 integrate .. //depot/projects/arm/src/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/arm/src/sys/net/if_ef.c#4 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/arm/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/arm/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/arm/src/sys/net/if_gre.c#3 integrate .. //depot/projects/arm/src/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/arm/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#7 integrate .. //depot/projects/arm/src/sys/netatm/atm_signal.c#2 integrate .. //depot/projects/arm/src/sys/netatm/ipatm/ipatm_vcm.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/ng_lmi.c#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_message.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/arm/src/sys/netgraph/ng_source.c#5 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#6 integrate .. //depot/projects/arm/src/sys/netinet/in.c#4 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/arm/src/sys/netinet/in_var.h#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_gre.h#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#6 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/arm/src/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/arm/src/sys/netipsec/keysock.c#3 integrate .. //depot/projects/arm/src/sys/netipsec/keysock.h#2 integrate .. //depot/projects/arm/src/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/arm/src/sys/netipx/spx_usrreq.c#4 integrate .. //depot/projects/arm/src/sys/netkey/keysock.c#3 integrate .. //depot/projects/arm/src/sys/netkey/keysock.h#2 integrate .. //depot/projects/arm/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/arm/src/sys/netsmb/smb_subr.c#3 integrate .. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#4 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/arm/src/sys/pc98/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/pc98/include/param.h#3 integrate .. //depot/projects/arm/src/sys/pccard/cardinfo.h#2 integrate .. //depot/projects/arm/src/sys/pccard/driver.h#2 delete .. //depot/projects/arm/src/sys/pccard/i82365.h#2 delete .. //depot/projects/arm/src/sys/pccard/meciareg.h#2 delete .. //depot/projects/arm/src/sys/pccard/pccard_nbk.h#2 delete .. //depot/projects/arm/src/sys/pccard/pcic_pci.h#2 delete .. //depot/projects/arm/src/sys/pccard/pcicvar.h#2 delete .. //depot/projects/arm/src/sys/pccard/slot.h#2 delete .. //depot/projects/arm/src/sys/pci/agp.c#3 integrate .. //depot/projects/arm/src/sys/pci/if_sk.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_skreg.h#3 integrate .. //depot/projects/arm/src/sys/pci/if_xl.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/arm/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/arm/src/sys/rpc/rpcclnt.c#4 integrate .. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/central/central.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/arm/src/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc_central.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc_nexus.c#5 integrate .. //depot/projects/arm/src/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/utrap.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/arm/src/sys/sys/_lock.h#3 integrate .. //depot/projects/arm/src/sys/sys/ata.h#3 integrate .. //depot/projects/arm/src/sys/sys/cdefs.h#5 integrate .. //depot/projects/arm/src/sys/sys/ioctl.h#3 integrate .. //depot/projects/arm/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/arm/src/sys/sys/ktr.h#6 integrate .. //depot/projects/arm/src/sys/sys/lock.h#5 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#7 integrate .. //depot/projects/arm/src/sys/sys/md5.h#2 integrate .. //depot/projects/arm/src/sys/sys/mount.h#6 integrate .. //depot/projects/arm/src/sys/sys/mutex.h#4 integrate .. //depot/projects/arm/src/sys/sys/param.h#9 integrate .. //depot/projects/arm/src/sys/sys/proc.h#5 integrate .. //depot/projects/arm/src/sys/sys/select.h#2 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#5 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#6 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/arm/src/sys/sys/taskqueue.h#3 integrate .. //depot/projects/arm/src/sys/sys/tree.h#3 integrate .. //depot/projects/arm/src/sys/sys/ttychars.h#2 integrate .. //depot/projects/arm/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/arm/src/sys/sys/ttydev.h#2 integrate .. //depot/projects/arm/src/sys/sys/turnstile.h#2 integrate .. //depot/projects/arm/src/sys/sys/user.h#3 integrate .. //depot/projects/arm/src/sys/sys/vnode.h#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/arm/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/arm/src/sys/vm/uma_core.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_map.c#5 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/arm/src/sys/vm/vm_object.h#3 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#4 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#5 integrate Differences ... ==== //depot/projects/arm/src/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $ +# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $ # The boot loader .if !defined(NO_BOOT) @@ -11,7 +11,8 @@ CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ isofs kern libkern modules net netatalk netatm netgraph \ netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ - pccard pci posix4 sys ufs vm ${ARCHDIR} + nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \ + ${ARCHDIR} ARCHDIR ?= ${MACHINE} ==== //depot/projects/arm/src/sys/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.191 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $ cpu EV4 cpu EV5 @@ -61,6 +61,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI ==== //depot/projects/arm/src/sys/alpha/include/_types.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.8 2006/01/09 06:05:55 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __PCI_REROUTE_INTERRUPT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/alpha/include/param.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.40 2005/12/06 13:27:20 ru Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.41 2006/01/09 06:05:55 imp Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /*- @@ -66,6 +66,8 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ ==== //depot/projects/arm/src/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.72 2005/12/16 05:57:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $"); #include #include @@ -285,8 +285,10 @@ /* Must bounce */ - if ((error = alloc_bounce_zone(newtag)) != 0) + if ((error = alloc_bounce_zone(newtag)) != 0) { + free(newtag, M_DEVBUF); return (error); + } bz = newtag->bounce_zone; if (ptoa(bz->total_bpages) < maxsize) { ==== //depot/projects/arm/src/sys/amd64/amd64/mptable_pci.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.3 2005/09/18 01:42:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.4 2006/01/06 19:22:18 jhb Exp $"); #include #include @@ -100,13 +100,10 @@ { 0, 0 } }; -static driver_t mptable_hostb_driver = { - "pcib", - mptable_hostb_methods, - 1, -}; +static devclass_t hostb_devclass; -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, pcib_devclass, 0, 0); +DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); +DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); /* PCI to PCI bridge driver. */ @@ -155,11 +152,9 @@ {0, 0} }; -static driver_t mptable_pcib_driver = { - "pcib", - mptable_pcib_pci_methods, - sizeof(struct pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, + sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); ==== //depot/projects/arm/src/sys/amd64/amd64/trap.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.300 2006/01/27 22:22:10 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -220,10 +220,10 @@ printf("kernel trap %d with interrupts disabled\n", type); /* - * We shouldn't enable interrupts while in a critical - * section or servicing an NMI. + * We shouldn't enable interrupts while holding a + * spin lock or servicing an NMI. */ - if (type != T_NMI && td->td_critnest == 0) + if (type != T_NMI && td->td_md.md_spinlock_count == 0) enable_intr(); } } @@ -237,8 +237,16 @@ * do the VM lookup, so just consider it a fatal trap so the * kernel can print out a useful trap message and even get * to the debugger. + * + * If we get a page fault while holding a non-sleepable + * lock, then it is most likely a fatal kernel page fault. + * If WITNESS is enabled, then it's going to whine about + * bogus LORs with various VM locks, so just skip to the + * fatal trap handling directly. */ - if (td->td_critnest != 0) + if (td->td_critnest != 0 || + WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, + "Kernel page fault") != 0) trap_fatal(&frame, frame.tf_addr); } ==== //depot/projects/arm/src/sys/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.447 2005/11/27 23:16:58 ru Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.449 2006/01/12 01:20:59 obrien Exp $ cpu HAMMER ident GENERIC @@ -46,10 +46,10 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Needed by COMPAT_LINUX32 +options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 -options COMPAT_LINUX32 # Compatible with i386 linux binaries options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory @@ -77,6 +77,7 @@ options SMP # Symmetric MultiProcessor Kernel # Linux 32-bit ABI support +options COMPAT_LINUX32 # Compatible with i386 linux binaries options LINPROCFS # Cannot be a module yet. # Bus support. ==== //depot/projects/arm/src/sys/amd64/include/_types.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.10 2006/01/01 20:59:27 imp Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -44,8 +44,6 @@ #endif #define __NO_STRICT_ALIGNMENT -#define __HAVE_ACPI -#define __PCI_REROUTE_INTERRUPT /* * Basic types upon which most other types are built. ==== //depot/projects/arm/src/sys/amd64/include/param.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.19 2005/12/06 13:27:20 ru Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.20 2006/01/09 06:05:56 imp Exp $ */ /* @@ -66,6 +66,9 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ ==== //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.115 2005/12/20 21:09:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.116 2006/01/06 19:22:18 jhb Exp $"); #include "opt_cpu.h" @@ -326,12 +326,9 @@ { 0, 0 } }; -static driver_t legacy_pcib_driver = { - "pcib", - legacy_pcib_methods, - 1, -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, pcib_devclass, 0, 0); @@ -377,12 +374,7 @@ { 0, 0 } }; -static driver_t pcibus_pnp_driver = { - "pcibus_pnp", - pcibus_pnp_methods, - 1, /* no softc */ -}; - static devclass_t pcibus_pnp_devclass; +DEFINE_CLASS_0(pcibus_pnp, pcibus_pnp_driver, pcibus_pnp_methods, 1); DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#5 (text+ko) ==== @@ -23,13 +23,15 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.4 2005/12/20 01:28:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.5 2006/01/20 00:46:44 cognet Exp $"); #include #include #include #include #include #include +#include + #include #include "opt_global.h" @@ -204,7 +206,7 @@ { Elf32_Ehdr *eh; Elf32_Phdr phdr[512] /* XXX */, *php; - Elf32_Shdr *shdr; + Elf32_Shdr shdr[512] /* XXX */; int i,j; void *entry_point; int symtabindex = -1; @@ -228,9 +230,6 @@ } /* Save the symbol tables, as there're about to be scratched. */ - lastaddr = roundup(lastaddr, sizeof(long)); - shdr = (Elf_Shdr *)lastaddr; - lastaddr += sizeof(*shdr) * eh->e_shnum; memcpy(shdr, (void *)(kstart + eh->e_shoff), sizeof(*shdr) * eh->e_shnum); if (eh->e_shnum * eh->e_shentsize != 0 && @@ -337,7 +336,51 @@ extern char func_end[]; extern void *_end; -void __start(void) + +#define PMAP_DOMAIN_KERNEL 15 /* + * Just define it instead of including the + * whole VM headers set. + */ +int __hack; +static __inline void +setup_pagetables(unsigned int pt_addr, vm_paddr_t physstart, vm_paddr_t physend) +{ + unsigned int *pd = (unsigned int *)pt_addr; + vm_paddr_t addr; + int domain = (DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT; + int tmp; + + bzero(pd, L1_TABLE_SIZE); + for (addr = physstart; addr < physend; addr += L1_S_SIZE) + pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)| + L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr; + /* XXX: See below */ + if (0xfff00000 < physstart || 0xfff00000 > physend) + pd[0xfff00000 >> L1_S_SHIFT] = L1_TYPE_S|L1_S_AP(AP_KRW)| + L1_S_DOM(PMAP_DOMAIN_KERNEL)|physstart; + __asm __volatile("mcr p15, 0, %1, c2, c0, 0\n" /* set TTB */ + "mcr p15, 0, %1, c8, c7, 0\n" /* Flush TTB */ + "mcr p15, 0, %2, c3, c0, 0\n" /* Set DAR */ + "mrc p15, 0, %0, c1, c0, 0\n" + "orr %0, %0, #1\n" /* MMU_ENABLE */ + "mcr p15, 0, %0, c1, c0, 0\n" + "mrc p15, 0, %0, c2, c0, 0\n" /* CPWAIT */ + "mov r0, r0\n" + "sub pc, pc, #4\n" : + "=r" (tmp) : "r" (pd), "r" (domain)); + + /* + * XXX: This is the most stupid workaround I've ever wrote. + * For some reason, the KB9202 won't boot the kernel unless + * we access an address which is not in the + * 0x20000000 - 0x20ffffff range. I hope I'll understand + * what's going on later. + */ + __hack = *(volatile int *)0xfffff21c; +} + +void +__start(void) { void *curaddr; void *dst; @@ -348,6 +391,10 @@ curaddr = (void*)((unsigned int)curaddr & 0xfff00000); #ifdef KZIP if (*kernel == 0x1f && kernel[1] == 0x8b) { + int pt_addr = (((int)&_end + KERNSIZE + 0x100) & + ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE; + setup_pagetables(pt_addr, (vm_paddr_t)curaddr, + (vm_paddr_t)curaddr + 0x10000000); /* Gzipped kernel */ dst = inflate_kernel(kernel, &_end); kernel = (char *)&_end; ==== //depot/projects/arm/src/sys/arm/arm/trap.c#4 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.19 2006/01/06 18:02:12 jhb Exp $"); #include @@ -269,7 +269,8 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_critnest == 0 && __predict_true(tf->tf_spsr & I32_bit) == 0) + if (td->td_md.md_spinlock_count == 0 && + __predict_true(tf->tf_spsr & I32_bit) == 0) enable_interrupts(I32_bit); /* Invoke the appropriate handler, if necessary */ @@ -729,7 +730,7 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_critnest == 0 && + if (td->td_md.md_spinlock_count == 0 && __predict_true((tf->tf_spsr & I32_bit) == 0)) enable_interrupts(I32_bit); @@ -1007,7 +1008,7 @@ * 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)) + if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) enable_interrupts(I32_bit); syscall(td, frame, insn); ==== //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.20 2005/12/05 12:58:44 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.21 2006/01/27 21:07:04 cognet Exp $"); #include #include @@ -477,9 +477,11 @@ "smallalloc", 0); in_sleep--; goto retry; + } else if (in_alloc) { + mtx_unlock(&smallalloc_mtx); + return (NULL); } - if (wait & M_WAITOK) - in_alloc = 1; + in_alloc = 1; mtx_unlock(&smallalloc_mtx); /* Try to alloc 1MB of contiguous memory. */ ret = arm_uma_do_alloc(&sp, bytes, zone == l2zone ? ==== //depot/projects/arm/src/sys/arm/include/_types.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.8 2006/01/09 06:05:56 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,8 +43,6 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#define __PCI_REROUTE_INTERRUPT - /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/arm/include/param.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.10 2005/12/06 13:27:20 ru Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.11 2006/01/09 06:05:56 imp Exp $ */ /* @@ -59,6 +59,8 @@ #ifndef _NO_NAMESPACE_POLLUTION +#define __PCI_REROUTE_INTERRUPT + #ifndef _MACHINE_PARAM_H_ #define _MACHINE_PARAM_H_ ==== //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.5 2005/09/25 21:06:50 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.6 2006/01/23 14:03:14 cognet Exp $"); #include #include @@ -368,15 +368,17 @@ rm = &sc->sc_io_rman; bt = sc->sc_pciio; bh = sc->sc_io; - start = start - 0x90000000 + sc->sc_io; - end = end - 0x90000000 + sc->sc_io; + if (start < sc->sc_io) { + start = start - 0x90000000 + sc->sc_io; + end = end - 0x90000000 + sc->sc_io; + } break; default: return (NULL); } rv = rman_reserve_resource(rm, start, end, count, flags, child); - if (rv == NULL) + if (rv == NULL) return (NULL); if (type != SYS_RES_IRQ) { bh += (rman_get_start(rv)); ==== //depot/projects/arm/src/sys/boot/common/module.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.25 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.26 2006/01/12 13:18:49 marius Exp $"); /* * file/module function dispatcher, support, etc. @@ -864,7 +864,8 @@ if (mdp->d_hints != NULL || (mdp->d_flags & MDIR_NOHINTS)) return; path = moduledir_fullpath(mdp, "linker.hints"); - if (stat(path, &st) != 0 || st.st_size < (sizeof(version) + sizeof(int)) || + if (stat(path, &st) != 0 || + st.st_size < (ssize_t)(sizeof(version) + sizeof(int)) || st.st_size > 100 * 1024 || (fd = open(path, O_RDONLY)) < 0) { free(path); mdp->d_flags |= MDIR_NOHINTS; ==== //depot/projects/arm/src/sys/boot/ia64/efi/start.S#2 (text+ko) ==== @@ -23,56 +23,32 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.8 2004/11/23 05:38:30 marcel Exp $ + * $FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.10 2006/01/18 18:49:25 marcel Exp $ */ .text >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 28 00:21:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6E1116A423; Sat, 28 Jan 2006 00:21:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 B518E16A422 for ; Sat, 28 Jan 2006 00:21:41 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CFDC43D46 for ; Sat, 28 Jan 2006 00:21:41 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0S0LfhP067540 for ; Sat, 28 Jan 2006 00:21:41 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0S0LeuP067537 for perforce@freebsd.org; Sat, 28 Jan 2006 00:21:40 GMT (envelope-from alc@freebsd.org) Date: Sat, 28 Jan 2006 00:21:40 GMT Message-Id: <200601280021.k0S0LeuP067537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 00:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90537 Change 90537 by alc@alc_home on 2006/01/28 00:21:15 Introduce buddy_unfree(). It is used to yank a cache state page out of the buddy queues. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_buddy.c#4 edit .. //depot/projects/superpages/src/sys/vm/vm_buddy.h#4 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_buddy.c#4 (text+ko) ==== @@ -253,6 +253,54 @@ } /* + * Extract the give page from the buddy queues. + */ +boolean_t +buddy_unfree(vm_page_t m) +{ + vm_paddr_t half; + vm_page_t buddy, other; + int q; + + KASSERT(m->flags & PG_CACHE, ("xxx")); + buddy = m; + mtx_lock_spin(&vm_page_queue_free_mtx); + for (q = 0; (buddy->queue - buddy->buddyq) != PQ_BUDDY && + q < BUDDY_QUEUES; q++) { + buddy = PHYS_TO_VM_PAGE(m->phys_addr & + (~(vm_paddr_t)0 << (PAGE_SHIFT + q))); + } + if (q == BUDDY_QUEUES || buddy->buddyq < q) { + mtx_unlock_spin(&vm_page_queue_free_mtx); + return (FALSE); + } + q = buddy->buddyq; + + /* + * m is in the free list as part of a chunk of size 1< 0) { + q--; + half = buddy->phys_addr ^ (1 << (PAGE_SHIFT + q)); + if (m->phys_addr < half) + other = PHYS_TO_VM_PAGE(half); + else { + other = buddy; + buddy = PHYS_TO_VM_PAGE(half); + } + buddy_insert(q, other); + } + cnt.v_free_count--; + mtx_unlock_spin(&vm_page_queue_free_mtx); + KASSERT(buddy == m, ("yyy")); + return (TRUE); +} + +/* * */ vm_page_t ==== //depot/projects/superpages/src/sys/vm/vm_buddy.h#4 (text+ko) ==== @@ -6,3 +6,4 @@ vm_page_t buddy_alloc_locked(int magn, boolean_t prefer_zero); void buddy_free(vm_page_t m, int magn); void buddy_free_locked(vm_page_t m, int magn); +boolean_t buddy_unfree(vm_page_t m); From owner-p4-projects@FreeBSD.ORG Sat Jan 28 00:48:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3A1A16A423; Sat, 28 Jan 2006 00:48:14 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6742016A420 for ; Sat, 28 Jan 2006 00:48:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2316843D45 for ; Sat, 28 Jan 2006 00:48:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0S0mDB7078213 for ; Sat, 28 Jan 2006 00:48:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0S0mD8g078208 for perforce@freebsd.org; Sat, 28 Jan 2006 00:48:13 GMT (envelope-from imp@freebsd.org) Date: Sat, 28 Jan 2006 00:48:13 GMT Message-Id: <200601280048.k0S0mD8g078208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 90539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 00:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=90539 Change 90539 by imp@imp_Speedy on 2006/01/28 00:47:55 lock unused. Affected files ... .. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#4 (text+ko) ==== @@ -853,7 +853,9 @@ { struct sleepqueue_chain *sc; struct sleepqueue *sq; +#ifdef INVARIANTS struct lock_object *lock; +#endif struct thread *td; void *wchan; int i; From owner-p4-projects@FreeBSD.ORG Sat Jan 28 06:06:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2813116A423; Sat, 28 Jan 2006 06:06:41 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 DA88016A420 for ; Sat, 28 Jan 2006 06:06:40 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E0FE43D45 for ; Sat, 28 Jan 2006 06:06:40 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0S66e0x002549 for ; Sat, 28 Jan 2006 06:06:40 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0S66eqE002546 for perforce@freebsd.org; Sat, 28 Jan 2006 06:06:40 GMT (envelope-from alc@freebsd.org) Date: Sat, 28 Jan 2006 06:06:40 GMT Message-Id: <200601280606.k0S66eqE002546@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 06:06:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=90548 Change 90548 by alc@alc_home on 2006/01/28 06:06:03 Remove a useless assertion. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#10 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#10 (text+ko) ==== @@ -190,7 +190,6 @@ if (queue != PQ_NONE) { VM_PAGE_SETQUEUE2(m, PQ_NONE); pq = &vm_page_queues[queue]; - KASSERT((m->queue - m->buddyq) != PQ_BUDDY,("vm_pageq_remove: page is un buddy allocator")); TAILQ_REMOVE(&pq->pl, m, pageq); (*pq->cnt)--; pq->lcnt--; From owner-p4-projects@FreeBSD.ORG Sat Jan 28 20:17:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99CC016A425; Sat, 28 Jan 2006 20:17:05 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 6DB8916A425 for ; Sat, 28 Jan 2006 20:17:05 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0176043D75 for ; Sat, 28 Jan 2006 20:17:05 +0000 (GMT) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0SKH4Ux057648 for ; Sat, 28 Jan 2006 20:17:04 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0SKH4op057645 for perforce@freebsd.org; Sat, 28 Jan 2006 20:17:04 GMT (envelope-from alc@freebsd.org) Date: Sat, 28 Jan 2006 20:17:04 GMT Message-Id: <200601282017.k0SKH4op057645@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 90567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 20:17:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=90567 Change 90567 by alc@alc_home on 2006/01/28 20:16:52 Modify vm_pageq_remove() and vm_pageq_remove_nowakeup() to be able to remove cache state pages from the buddy queues. (This is not yet used.) Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_pageq.c#11 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_pageq.c#11 (text+ko) ==== @@ -164,7 +164,11 @@ int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *pq; - if (queue != PQ_NONE) { + if ((queue - m->buddyq) == PQ_BUDDY) { + buddy_unfree(m); + KASSERT(m->queue == PQ_NONE, ("xxx")); + vm_page_flag_clear(m, PG_CACHE); + } else if (queue != PQ_NONE) { pq = &vm_page_queues[queue]; VM_PAGE_SETQUEUE2(m, PQ_NONE); TAILQ_REMOVE(&pq->pl, m, pageq); @@ -187,7 +191,13 @@ int queue = VM_PAGE_GETQUEUE(m); struct vpgqueues *pq; - if (queue != PQ_NONE) { + if ((queue - m->buddyq) == PQ_BUDDY) { + buddy_unfree(m); + KASSERT(m->queue == PQ_NONE, ("xxx")); + vm_page_flag_clear(m, PG_CACHE); + if (vm_paging_needed()) + pagedaemon_wakeup(); + } else if (queue != PQ_NONE) { VM_PAGE_SETQUEUE2(m, PQ_NONE); pq = &vm_page_queues[queue]; TAILQ_REMOVE(&pq->pl, m, pageq); From owner-p4-projects@FreeBSD.ORG Sat Jan 28 21:58:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBCB416A426; Sat, 28 Jan 2006 21:58:54 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 69CB016A420 for ; Sat, 28 Jan 2006 21:58:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02A3343D6E for ; Sat, 28 Jan 2006 21:58:45 +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.13.1/8.13.1) with ESMTP id k0SLwjcH070613 for ; Sat, 28 Jan 2006 21:58:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0SLw9eO070394 for perforce@freebsd.org; Sat, 28 Jan 2006 21:58:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Jan 2006 21:58:09 GMT Message-Id: <200601282158.k0SLw9eO070394@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 Cc: Subject: PERFORCE change 90571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 21:58:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=90571 Change 90571 by rwatson@rwatson_zoo on 2006/01/28 21:57:44 Integrate TrustedBSD audit3 branch src tree (without sys/, which was previously integrated) from TrustedBSD base branch; see @90431 for a list of merged changes. The build nit in fstat is due to a p4 importer problem, not a local merge problem. Affected files ... .. //depot/projects/trustedbsd/audit3/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/audit3/LOCKS#2 integrate .. //depot/projects/trustedbsd/audit3/MAINTAINERS#5 integrate .. //depot/projects/trustedbsd/audit3/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/Makefile.inc1#6 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#2 integrate .. //depot/projects/trustedbsd/audit3/UPDATING#6 integrate .. //depot/projects/trustedbsd/audit3/bin/date/date.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/kenv/kenv.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/ls.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/ls/util.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.1#5 integrate .. //depot/projects/trustedbsd/audit3/bin/rm/rm.c#5 integrate .. //depot/projects/trustedbsd/audit3/bin/setfacl/setfacl.1#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/builtins.def#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/eval.h#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/exec.h#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/histedit.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/jobs.c#4 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/memalloc.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/memalloc.h#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/miscbltin.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/options.c#3 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/output.c#2 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/sh.1#6 integrate .. //depot/projects/trustedbsd/audit3/bin/sh/trap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bc/bc/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/CHANGES#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/README#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/include/dig/dig.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/control.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/config.threads.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/configure.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch06.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/Makefile.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/config.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/configure#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/configure.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/dst_api.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/eventlib_p.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/isc/memcluster.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/port_after.h.in#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_findzonecut.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/bind9/getaddresses.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/validator.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/socket.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/isccfg/namedconf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/api#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/print.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bind9/version#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/NEWS#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/VERSION#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/bsnmpagent.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/bsnmpclient.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/bsnmplib.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmpagent.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/lib/snmpclient.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/mibII_route.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/bsnmpd.1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpd.config#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.3#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/snmpmod.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/trans_udp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/bsnmp/snmpd/trap.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/AUTHORS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/cpio/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/cpio/INSTALL#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/cpio/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/cpio/THANKS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/alloca.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/copyin.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/copyout.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/copypass.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/cpio.1#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/cpio.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/cpio.texi#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/defer.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/defer.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/dirname.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/dstring.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/dstring.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/error.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/extern.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/filemode.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/filetypes.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/global.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/idcache.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/error.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/error.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/system.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/main.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/makepath.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/rmt.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/defer.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/defer.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/extern.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/global.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/main.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/tar.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/tar.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/src/util.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/cpio/stripslash.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/system.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/tar.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/tar.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/userspec.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/util.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/version.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/trustedbsd/audit3/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/COPYING#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/FDL#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/INSTALL#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/INSTALL.gen#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/LICENSE#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/MANIFEST#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/MORE.STUFF#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile.ccpg#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile.comm#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile.cpg#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile.init#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/PROBLEMS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/PROJECTS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/README.MinGW#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/README.WIN32#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/REVISION#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/configure#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/configure.ac#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/groffer.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/groffer.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mm/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mm/groff_mm.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mm/m.tmac#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mm/mmroff.pl#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/BUGS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/ChangeLog#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/NEWS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/elvis_syntax#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/typeset.mom#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/docelement.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/docprocessing.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/goodies.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/inlines.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/intro.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/reserved.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/toc.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/typesetting.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/mom/om.tmac#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/contrib/pic2graph/pic2graph.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-1#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-10#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-11#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-3#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-4#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-5#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-6#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-7#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-8#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff-9#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff.css#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/groff.texinfo#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/pic.ms#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/texinfo.tex#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/doc/webpage.ms#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devdvi/generate/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devhtml/DESC.proto#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devhtml/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devhtml/R.proto#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/ALBB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/ALBR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/AOB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/AOI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/AOR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/CB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/CBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/CI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/CLARENDON#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/CORONET#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/CR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/GB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/GBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/GI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/GR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/LGB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/LGI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/LGR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/MARIGOLD#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/OB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/OBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/OI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/OR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/S#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/TR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UCB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UCBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UCI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UCR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/UR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/generate/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/generate/special.map#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/generate/text.map#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/AB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/ABI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/AI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/AR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HNB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HNBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HNI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HNR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/HR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/NB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/NBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/NI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/NR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/PB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/PBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/PI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/PR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/S#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/SS#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/TB#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/TBI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/TI#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/TR#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/generate/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/generate/afmname#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/generate/textmap#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/prologue.ps#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devps/symbolmap#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devutf8/NOTES#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/font/devutf8/R.proto#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/install-sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/ditroff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/groff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/groff_char.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/groff_diff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/groff_font.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/groff_out.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/groff_tmac.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/man/roff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grodvi/grodvi.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/grohtml.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/html-table.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/html-text.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/html.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grolbp/lbp.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grolj4/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grolj4/grolj4.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grops/grops.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grops/ps.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grotty/grotty.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/assert.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/cmap.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/color.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/config.hin#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/cset.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/device.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/driver.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/errarg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/error.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/font.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/geometry.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/groff-getopt.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/html-strings.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/htmlhint.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/index.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/macropath.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/nonposix.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/paper.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/posix.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/printer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/ptable.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/refid.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/search.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/searchpath.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/stringclass.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libbib/map.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/fmod.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/getcwd.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/iftoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/itoa.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/matherr.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/strerror.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/strtol.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/box.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/eqn.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/eqn.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/eqn.y#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/neqn.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/pbox.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/grn/gprint.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/grn/grn.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/html/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/html/pre-html.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/html/pushback.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/common.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/object.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/output.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/pic.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/pic.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/pic.y#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/position.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/command.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/label.y#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/ref.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/refer.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/refer.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/refer/token.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/soelim/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/soelim/soelim.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/tbl/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/tbl/table.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/preproc/tbl/tbl.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/groff/groff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/groff/pipeline.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/groff/pipeline.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/grog/grog.pl#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/grog/grog.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/nroff/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/nroff/nroff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/nroff/nroff.sh#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/charinfo.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/dictionary.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/div.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/env.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/hvunits.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/input.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/node.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/reg.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/request.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/symbol.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/token.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/troff.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/troff.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/unicode.h#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/uniglyph.cpp#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/roff/troff/uniuni.cpp#2 delete .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/addftinfo/addftinfo.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/addftinfo/guess.cpp#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/addftinfo/guess.h#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/afmtodit/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/afmtodit/afmtodit.man#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/afmtodit/afmtodit.pl#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/hpftodit/Makefile.sub#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/groff/src/utils/hpftodit/hpftodit.cpp#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 28 23:39:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDC2816A434; Sat, 28 Jan 2006 23:39:55 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 3F15416A434 for ; Sat, 28 Jan 2006 23:39:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9687943D6D for ; Sat, 28 Jan 2006 23:39:50 +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.13.1/8.13.1) with ESMTP id k0SNdoKE091422 for ; Sat, 28 Jan 2006 23:39:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0SNdn7U091419 for perforce@freebsd.org; Sat, 28 Jan 2006 23:39:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 28 Jan 2006 23:39:49 GMT Message-Id: <200601282339.k0SNdn7U091419@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 Cc: Subject: PERFORCE change 90577 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2006 23:39:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=90577 Change 90577 by rwatson@rwatson_zoo on 2006/01/28 23:39:12 Integrate TrustedBSD base to pick up changes missed in previous integrations due to a CVS->P4 importer problem, as well as new changes: - rwlocks - ktr clear - ddb show sleepqueue - ddb show turnstile - NFS server cred cleanup looped back from trustedbsd_mac Affected files ... .. //depot/projects/trustedbsd/base/etc/pf.conf#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#46 integrate .. //depot/projects/trustedbsd/base/include/nl_types.h#6 integrate .. //depot/projects/trustedbsd/base/include/stdio.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#22 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.3#10 integrate .. //depot/projects/trustedbsd/base/lib/libutil/pidfile.3#3 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/reloc.c#13 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/rtld_start.S#3 integrate .. //depot/projects/trustedbsd/base/sbin/dhclient/dhclient-script#5 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/ports-supfile#10 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_pppoe.4#11 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#53 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#93 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#66 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/bktr/bktr_os.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_3c503.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_cbus.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_hpp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_isa.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_novell.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_sic.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_wd80x3.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_edvar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#47 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/solo.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#45 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/elf.h#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_alq.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/subr_lock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_turnstile.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_pts.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#70 integrate .. //depot/projects/trustedbsd/base/sys/modules/bktr/bktr/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.h#10 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs.h#12 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#37 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#17 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/central/central.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/ebus/ebus.c#18 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/fhc/fhc_central.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/fhc/fhc_nexus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/psycho.c#31 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sbus/sbus.c#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/_rwlock.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/lock.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#70 integrate .. //depot/projects/trustedbsd/base/sys/sys/rwlock.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/turnstile.h#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#42 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#41 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#41 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#46 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#57 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#38 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#16 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/juggle/juggle.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#45 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#45 integrate .. //depot/projects/trustedbsd/base/usr.bin/ee/ee.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/elfdump/elfdump.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#22 integrate .. //depot/projects/trustedbsd/base/usr.bin/fstat/fstat.c#19 integrate .. //depot/projects/trustedbsd/base/usr.bin/gprof/powerpc.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/ktrdump/ktrdump.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/mail/mail.1#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/mktemp/mktemp.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/ipsec.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/main.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/netstat.h#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/pfkey.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/su/su.1#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.1#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/extern.h#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-fbsd.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-linux.c#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/ia64-fbsd.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/main.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/powerpc-fbsd.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/truss/sparc64-fbsd.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscall.h#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/truss.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/truss.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/wall/ttymsg.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/strnsubst.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.1#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#22 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.sh#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.8#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#19 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/btxld/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/btxld/btxld.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.h#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.y#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/main.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkmakefile.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/mkoptions.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/crontab/crontab.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.8#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.c#19 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.h#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kbdcontrol/kbdcontrol.1#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kbdmap/kbdmap.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mixer/mixer.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#25 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/extract.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/main.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/perform.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/pkg_add.1#15 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/perform.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/pkg_create.1#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/pl.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/info.h#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/perform.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/pkg_info.1#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/lib.h#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/plist.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/url.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/phttpget/phttpget.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/powerd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/powerd/powerd.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/anonFTP.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#20 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dispatch.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#30 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#24 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/media.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#45 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.8#18 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.h#29 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/tcpip.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/traceroute6/traceroute6.8#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/etc/pf.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $ +# $FreeBSD: src/etc/pf.conf,v 1.3 2006/01/27 17:16:20 mlaier Exp $ # $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $ # # See pf.conf(5) and /usr/share/examples/pf for syntax and examples. @@ -72,6 +72,10 @@ #pass in on $ext_if proto { tcp, udp } from any to port 80 keep state # pass incoming ports for ftp-proxy +#pass in on $ext_if inet proto tcp from any to $ext_if port > 49151 keep state + +# Alternate rule to pass incoming ports for ftp-proxy +# NOTE: Please see pf.conf(5) BUGS section before using user/group rules. #pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state # assign packets to a queue. ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#46 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.203 2006/01/21 14:16:01 matteo Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.205 2006/01/28 09:19:20 dds Exp $ % ======================================================================= @@ -29939,6 +29939,11 @@ what is essential is invisible to the eye. -- The Fox, 'The Little Prince" % +It is perfectly permissible for every system call to fail with [ENOTADUCK] +unless the first five bytes of the caller's address space contain the +word "quack". + -- Garrett Wollman +% It is possible by ingenuity and at the expense of clarity... {to do almost anything in any language}. However, the fact that it is possible to push a pea up a mountain with your nose does not mean that this is a sensible @@ -35390,6 +35395,10 @@ % Never delay the ending of a meeting or the beginning of a cocktail hour. % +Never do programs contain so few bugs as when no debugging tools +are available. + -- Niklaus Wirth +% Never do today what you can put off until tomorrow. % Never drink Coca-Cola in a moving elevator. The elevator's motion coupled ==== //depot/projects/trustedbsd/base/include/nl_types.h#6 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $ + * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _NL_TYPES_H_ @@ -97,8 +97,7 @@ __BEGIN_DECLS nl_catd catopen(const char *, int); -char *catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char *catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS ==== //depot/projects/trustedbsd/base/include/stdio.h#14 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _STDIO_H_ @@ -328,12 +328,7 @@ int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); char *fgetln(FILE *, size_t *); -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3 -#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2))) -#else -#define __ATTR_FORMAT_ARG -#endif -__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; +__const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); ==== //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#22 (text+ko) ==== @@ -133,10 +133,19 @@ /******************************************************************************/ -#define MALLOC_DEBUG +/* + * In order to disable various extra features that may have negative + * performance impacts, (assertions, expanded statistics, redzones), define + * NO_MALLOC_EXTRAS. + */ +/* #define NO_MALLOC_EXTRAS */ + +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_DEBUG +#endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.106 2006/01/26 08:11:23 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.110 2006/01/27 07:46:22 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -176,13 +185,16 @@ * Calculate statistics that can be used to get an idea of how well caching is * working. */ -#define MALLOC_STATS -#define MALLOC_STATS_ARENAS +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_STATS +#endif /* * Include redzones before/after every region, and check for buffer overflows. */ -#define MALLOC_REDZONES +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_REDZONES +#endif #ifdef MALLOC_REDZONES # define MALLOC_RED_2POW 4 # define MALLOC_RED ((size_t)(1 << MALLOC_RED_2POW)) @@ -298,10 +310,10 @@ uint64_t nrequests; /* - * Number of best-fit allocations that were successfully serviced by + * Number of exact-fit allocations that were successfully serviced by * this bin. */ - uint64_t nfit; + uint64_t nserviced; /* High-water marks for this bin. */ unsigned long highcached; @@ -311,7 +323,7 @@ * during normal operation, so is maintained here in order to allow * calculating the high water mark. */ - unsigned nregions; + unsigned long curcached; }; typedef struct arena_stats_s arena_stats_t; @@ -349,11 +361,8 @@ /* Frag statistics. */ struct { - /* - * Number of times a region is cached in the "frag" field of - * the arena. - */ - uint64_t ncached; + /* Number of times the "frag" field of the arena is refilled. */ + uint64_t nrefills; /* * Number of times a region is requested from the "frag" field @@ -377,16 +386,10 @@ uint64_t nrequests; /* - * Number of best-fit allocations that were successfully + * Number of allocation requests that were successfully * serviced by large_regions. */ - uint64_t nfit; - - /* - * Number of allocation requests that were successfully serviced - * large_regions, but that a bin could have serviced. - */ - uint64_t noverfit; + uint64_t nserviced; /* * High-water mark for large_regions (number of nodes in tree). @@ -1176,7 +1179,7 @@ stats_arenas->split.nserviced += arena->stats.split.nserviced; /* Frag. */ - stats_arenas->frag.ncached += arena->stats.frag.ncached; + stats_arenas->frag.nrefills += arena->stats.frag.nrefills; stats_arenas->frag.nrequests += arena->stats.frag.nrequests; stats_arenas->frag.nserviced += arena->stats.frag.nserviced; @@ -1184,18 +1187,20 @@ for (i = 0; i < NBINS; i++) { stats_arenas->bins[i].nrequests += arena->stats.bins[i].nrequests; - stats_arenas->bins[i].nfit += arena->stats.bins[i].nfit; + stats_arenas->bins[i].nserviced += + arena->stats.bins[i].nserviced; if (arena->stats.bins[i].highcached > stats_arenas->bins[i].highcached) { stats_arenas->bins[i].highcached = arena->stats.bins[i].highcached; } + stats_arenas->bins[i].curcached + += arena->stats.bins[i].curcached; } /* large and large_regions. */ stats_arenas->large.nrequests += arena->stats.large.nrequests; - stats_arenas->large.nfit += arena->stats.large.nfit; - stats_arenas->large.noverfit += arena->stats.large.noverfit; + stats_arenas->large.nserviced += arena->stats.large.nserviced; if (arena->stats.large.highcached > stats_arenas->large.highcached) stats_arenas->large.highcached = arena->stats.large.highcached; stats_arenas->large.curcached += arena->stats.large.curcached; @@ -1227,28 +1232,29 @@ stats_arenas->split.nserviced); malloc_printf("cached frag usage:\n"); - malloc_printf(" %13s%13s%13s\n", "ncached", "nrequests", "nserviced"); - malloc_printf(" %13llu%13llu%13llu\n", stats_arenas->frag.ncached, + malloc_printf(" %13s%13s%13s\n", "nrefills", "nrequests", "nserviced"); + malloc_printf(" %13llu%13llu%13llu\n", stats_arenas->frag.nrefills, stats_arenas->frag.nrequests, stats_arenas->frag.nserviced); malloc_printf("bins:\n"); - malloc_printf(" %4s%7s%13s%13s%11s\n", "bin", - "size", "nrequests", "nfit", "highcached"); + malloc_printf(" %4s%7s%13s%13s%11s%11s\n", "bin", + "size", "nrequests", "nserviced", "highcached", "curcached"); for (i = 0; i < NBINS; i++) { malloc_printf( - " %4u%7u%13llu%13llu%11lu\n", + " %4u%7u%13llu%13llu%11lu%11lu\n", i, ((i + bin_shift) << opt_quantum_2pow), - stats_arenas->bins[i].nrequests, stats_arenas->bins[i].nfit, - stats_arenas->bins[i].highcached); + stats_arenas->bins[i].nrequests, + stats_arenas->bins[i].nserviced, + stats_arenas->bins[i].highcached, + stats_arenas->bins[i].curcached); } malloc_printf("large:\n"); - malloc_printf(" %13s%13s%13s%13s%13s\n", "nrequests", "nfit", - "noverfit", "highcached", "curcached"); - malloc_printf(" %13llu%13llu%13llu%13lu%13lu\n", - stats_arenas->large.nrequests, stats_arenas->large.nfit, - stats_arenas->large.noverfit, stats_arenas->large.highcached, - stats_arenas->large.curcached); + malloc_printf(" %13s%13s%13s%13s\n", "nrequests", "nserviced", + "highcached", "curcached"); + malloc_printf(" %13llu%13llu%13lu%13lu\n", + stats_arenas->large.nrequests, stats_arenas->large.nserviced, + stats_arenas->large.highcached, stats_arenas->large.curcached); malloc_printf("huge\n"); malloc_printf(" %13s\n", "nrequests"); @@ -1630,16 +1636,14 @@ static unsigned arena_bins_search(arena_t *arena, size_t size) { - unsigned ret, minbin, i; + unsigned minbin, i; int bit; assert(QUANTUM_CEILING(size) == size); assert((size >> opt_quantum_2pow) >= bin_shift); - if (size > bin_maxsize) { - ret = UINT_MAX; - goto RETURN; - } + if (size > bin_maxsize) + return (UINT_MAX); minbin = (size >> opt_quantum_2pow) - bin_shift; assert(minbin < NBINS); @@ -1648,14 +1652,11 @@ & (UINT_MAX << (minbin % (sizeof(int) << 3)))); if (bit != 0) { /* Usable allocation found. */ - ret = (i * (sizeof(int) << 3)) + bit - 1; - goto RETURN; + return ((i * (sizeof(int) << 3)) + bit - 1); } } - ret = UINT_MAX; -RETURN: - return (ret); + return (UINT_MAX); } static __inline void @@ -1715,7 +1716,7 @@ qr_remove(reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions--; + arena->stats.bins[bin].curcached--; #endif if (qr_next(&tbin->regions, next.u.s.link) == &tbin->regions) arena_mask_unset(arena, bin); @@ -2066,12 +2067,12 @@ qr_new(reg, next.u.s.link); qr_before_insert(&tbin->regions, reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions++; + arena->stats.bins[bin].curcached++; - if (arena->stats.bins[bin].nregions + if (arena->stats.bins[bin].curcached > arena->stats.bins[bin].highcached) { arena->stats.bins[bin].highcached - = arena->stats.bins[bin].nregions; + = arena->stats.bins[bin].curcached; } #endif } @@ -2096,12 +2097,12 @@ qr_new(reg, next.u.s.link); qr_after_insert(&tbin->regions, reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions++; + arena->stats.bins[bin].curcached++; - if (arena->stats.bins[bin].nregions + if (arena->stats.bins[bin].curcached > arena->stats.bins[bin].highcached) { arena->stats.bins[bin].highcached - = arena->stats.bins[bin].nregions; + = arena->stats.bins[bin].curcached; } #endif } @@ -2123,7 +2124,7 @@ == ((bin + bin_shift) << opt_quantum_2pow)); qr_remove(ret, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions--; + arena->stats.bins[bin].curcached--; #endif if (qr_next(&tbin->regions, next.u.s.link) == &tbin->regions) arena_mask_unset(arena, bin); @@ -2479,7 +2480,7 @@ frag = node->reg; #ifdef MALLOC_STATS - arena->stats.frag.ncached++; + arena->stats.frag.nrefills++; #endif assert(region_next_free_get(&frag->sep)); region_next_free_unset(&frag->sep); @@ -2499,7 +2500,7 @@ /* Use the smallest available region. */ arena->frag = arena_bin_pop(arena, bin); #ifdef MALLOC_STATS - arena->stats.frag.ncached++; + arena->stats.frag.nrefills++; #endif total_size = region_next_size_get(&arena->frag->sep); @@ -2651,139 +2652,103 @@ static region_t * arena_split_reg_alloc(arena_t *arena, size_t size, bool fit) { - region_t *ret; + + if (arena->split == NULL) + return (NULL); - if (arena->split != NULL) { #ifdef MALLOC_STATS - arena->stats.split.nrequests++; + arena->stats.split.nrequests++; #endif + if (region_next_size_get(&arena->split->sep) >= size) { + region_t *ret; - if (region_next_size_get(&arena->split->sep) >= size) { - if (fit) { - size_t total_size; + if (fit) { + size_t total_size; - /* - * Use split, but try to use the beginning for - * smaller regions, and the end for larger - * regions. This reduces fragmentation in some - * pathological use cases. It tends to group - * short-lived (smaller) regions, which - * increases the effectiveness of coalescing. - */ + /* + * Use split, but try to use the beginning for smaller + * regions, and the end for larger regions. This + * reduces fragmentation in some pathological use + * cases. It tends to group short-lived (smaller) + * regions, which increases the effectiveness of + * coalescing. + */ - total_size = - region_next_size_get(&arena->split->sep); - assert(size % quantum == 0); + total_size = region_next_size_get(&arena->split->sep); + assert(size % quantum == 0); - if (total_size - size >= QUANTUM_CEILING( - sizeof(region_small_sizer_t))) { - if (size <= bin_maxsize) { - region_t *next; - - /* - * Carve space from the - * beginning of split. - */ - - /* ret. */ - ret = arena->split; - region_next_size_set(&ret->sep, - size); - assert(region_next_free_get( - &ret->sep) == false); - - /* next. */ - next = (region_t *)&((char *) - ret)[size]; - region_next_size_set(&next->sep, - total_size - size); - assert(size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - region_prev_free_unset( - &next->sep); - region_next_free_unset( - &next->sep); - - /* Update split. */ - arena->split = next; - } else { - region_t *prev; - size_t prev_size; - - /* - * Carve space from the end of - * split. - */ - - /* prev. */ - prev_size = total_size - size; - prev = arena->split; - region_next_size_set(&prev->sep, - prev_size); - assert(prev_size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - assert(region_next_free_get( - &prev->sep) == false); - - /* ret. */ - ret = (region_t *)&((char *) - prev)[prev_size]; - region_next_size_set(&ret->sep, - size); - region_prev_free_unset( - &ret->sep); - region_next_free_unset( - &ret->sep); - -#ifdef MALLOC_DEBUG - { + if (total_size - size >= + QUANTUM_CEILING(sizeof(region_small_sizer_t))) { + if (size <= bin_maxsize) { region_t *next; - /* next. */ - next = (region_t *)&((char *) ret) - [region_next_size_get(&ret->sep)]; - assert(region_prev_free_get(&next->sep) - == false); - } -#endif - } -#ifdef MALLOC_STATS - arena->stats.nsplit++; -#endif - } else { /* - * split is close enough to the right - * size that there isn't enough room to - * create a neighboring region. + * Carve space from the beginning of + * split. */ /* ret. */ ret = arena->split; - arena->split = NULL; + region_next_size_set(&ret->sep, size); assert(region_next_free_get(&ret->sep) == false); + /* next. */ + next = (region_t *)&((char *)ret)[size]; + region_next_size_set(&next->sep, + total_size - size); + assert(size >= QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + region_prev_free_unset(&next->sep); + region_next_free_unset(&next->sep); + + /* Update split. */ + arena->split = next; + } else { + region_t *prev; + size_t prev_size; + + /* Carve space from the end of split. */ + + /* prev. */ + prev_size = total_size - size; + prev = arena->split; + region_next_size_set(&prev->sep, + prev_size); + assert(prev_size >= + QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + assert(region_next_free_get( + &prev->sep) == false); + + /* ret. */ + ret = (region_t *)&((char *) + prev)[prev_size]; + region_next_size_set(&ret->sep, size); + region_prev_free_unset(&ret->sep); + region_next_free_unset(&ret->sep); + #ifdef MALLOC_DEBUG { - region_t *next; + region_t *next; - /* next. */ - next = (region_t *)&((char *) - ret)[region_next_size_get( - &ret->sep)]; - assert(region_prev_free_get( - &next->sep) == false); + /* next. */ + next = (region_t *)&((char *)ret) + [region_next_size_get(&ret->sep)]; + assert(region_prev_free_get(&next->sep) + == false); } #endif } - #ifdef MALLOC_STATS - arena->stats.split.nserviced++; + arena->stats.nsplit++; #endif } else { - /* Don't fit to the allocation size. */ + /* + * Split is close enough to the right size that + * there isn't enough room to create a + * neighboring region. + */ /* ret. */ ret = arena->split; @@ -2796,35 +2761,59 @@ region_t *next; /* next. */ - next = (region_t *) &((char *) ret) - [region_next_size_get(&ret->sep)]; + next = (region_t *)&((char *) + ret)[region_next_size_get( + &ret->sep)]; assert(region_prev_free_get(&next->sep) == false); } #endif } - region_next_contig_set(&ret->sep); - goto RETURN; - } else if (size <= bin_maxsize) { - region_t *reg; +#ifdef MALLOC_STATS + arena->stats.split.nserviced++; +#endif + } else { + /* Don't fit to the allocation size. */ + + /* ret. */ + ret = arena->split; + arena->split = NULL; + assert(region_next_free_get(&ret->sep) == false); + +#ifdef MALLOC_DEBUG + { + region_t *next; + + /* next. */ + next = (region_t *) &((char *) ret) + [region_next_size_get(&ret->sep)]; + assert(region_prev_free_get(&next->sep) + == false); + } +#endif + } + region_next_contig_set(&ret->sep); + return (ret); + } + /* If we get here, split has failed to service the request. */ + + if (size <= bin_maxsize) { + region_t *reg; - /* - * The split region is too small to service a small - * request. Clear split. - */ + /* + * The split region is too small to service a small request. + * Clear split. + */ - reg = arena->split; - region_next_contig_set(®->sep); + reg = arena->split; + region_next_contig_set(®->sep); - arena->split = NULL; + arena->split = NULL; - arena_delay_cache(arena, reg); - } + arena_delay_cache(arena, reg); } - ret = NULL; -RETURN: - return (ret); + return (NULL); } /* @@ -2884,7 +2873,6 @@ } else arena_mru_cache(arena, next, next_size); } - #ifdef MALLOC_STATS arena->stats.nsplit++; #endif @@ -2911,19 +2899,17 @@ ret = arena_bin_pop(arena, bin); assert(region_next_size_get(&ret->sep) >= size); #ifdef MALLOC_STATS - arena->stats.bins[bin].nfit++; + arena->stats.bins[bin].nserviced++; #endif - goto RETURN; + return (ret); } /* Look at frag to see whether it's large enough. */ ret = arena_frag_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); - ret = NULL; -RETURN: - return (ret); + return (NULL); } /* Look in large_regions for a large enough region. */ @@ -2943,10 +2929,8 @@ region_next_size_set(&key.sep, size); node = RB_NFIND(region_tree_s, &arena->large_regions, &key.next.u.l.node); - if (node == NULL) { - ret = NULL; - goto RETURN; - } + if (node == NULL) + return (NULL); /* Cached large region found. */ ret = node->reg; @@ -2967,13 +2951,9 @@ arena_reg_fit(arena, size, ret, false); #ifdef MALLOC_STATS - if (size > bin_maxsize) - arena->stats.large.nfit++; - else - arena->stats.large.noverfit++; + arena->stats.large.nserviced++; #endif -RETURN: return (ret); } @@ -2985,10 +2965,8 @@ chunk_node_t *chunk; chunk = chunk_alloc(chunk_size); - if (chunk == NULL) { - ret = NULL; - goto RETURN; - } + if (chunk == NULL) + return (NULL); #ifdef MALLOC_DEBUG { @@ -3042,7 +3020,6 @@ if (fit) arena_reg_fit(arena, size, ret, (arena->split == NULL)); -RETURN: return (ret); } @@ -3063,16 +3040,16 @@ if (size <= bin_maxsize) { ret = arena_bin_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); } ret = arena_large_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); ret = arena_split_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); /* * Only try allocating from frag here if size is large, since @@ -3082,16 +3059,14 @@ if (size > bin_maxsize) { ret = arena_frag_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); } ret = arena_chunk_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); - ret = NULL; -RETURN: - return (ret); + return (NULL); } static void * @@ -3109,8 +3084,7 @@ quantum_size = region_ceiling(size); if (quantum_size < size) { /* size is large enough to cause size_t wrap-around. */ - ret = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 29 00:00:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39AA616A423; Sun, 29 Jan 2006 00:00:17 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 D201616A420 for ; Sun, 29 Jan 2006 00:00:16 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6852A43D48 for ; Sun, 29 Jan 2006 00:00:16 +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.13.1/8.13.1) with ESMTP id k0T00GQ8094238 for ; Sun, 29 Jan 2006 00:00:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0T00Fs6094235 for perforce@freebsd.org; Sun, 29 Jan 2006 00:00:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Jan 2006 00:00:15 GMT Message-Id: <200601290000.k0T00Fs6094235@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 Cc: Subject: PERFORCE change 90578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2006 00:00:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=90578 Change 90578 by rwatson@rwatson_zoo on 2006/01/28 23:59:56 Integrate TrustedBSD audit3 to pick up changes missed in previous integrations due to a CVS->P4 importer problem, as well as new changes: - rwlocks - ktr clear - ddb show sleepqueue - ddb show turnstile - NFS server cred cleanup looped back from trustedbsd_mac Affected files ... .. //depot/projects/trustedbsd/audit3/etc/pf.conf#3 integrate .. //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/trustedbsd/audit3/include/nl_types.h#3 integrate .. //depot/projects/trustedbsd/audit3/include/stdio.h#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/libdisk.3#5 integrate .. //depot/projects/trustedbsd/audit3/lib/libutil/pidfile.3#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/ia64/reloc.c#4 integrate .. //depot/projects/trustedbsd/audit3/libexec/rtld-elf/ia64/rtld_start.S#2 integrate .. //depot/projects/trustedbsd/audit3/sbin/dhclient/dhclient-script#3 integrate .. //depot/projects/trustedbsd/audit3/share/examples/cvsup/ports-supfile#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_pppoe.4#5 integrate .. //depot/projects/trustedbsd/audit3/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/amr/amr.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_3c503.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_cbus.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_hpp.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_isa.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ed/if_edvar.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/md/md.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/solo.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/include/elf.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_alq.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_ktr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/kern/subr_lock.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/tty_pts.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/bktr/bktr/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/central/central.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/ebus/ebus.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/fhc/fhc_central.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/fhc/fhc_nexus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/_rwlock.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sys/lock.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/proc.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/rwlock.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/sys/turnstile.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/uma_core.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_map.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_pageq.c#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/netrate/juggle/juggle.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.freebsd#8 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/ee/ee.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/elfdump/elfdump.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/fstat/fstat.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/gprof/powerpc.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/ktrdump/ktrdump.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/mail/mail.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/mktemp/mktemp.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/ipsec.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/netstat.h#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/netstat/pfkey.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/su/su.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/tar/bsdtar.1#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/alpha-fbsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/extern.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/i386-linux.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/powerpc-fbsd.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/truss/sparc64-fbsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/syscalls.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/truss.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/truss/truss.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/wall/ttymsg.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/whois/whois.1#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/whois/whois.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/xargs/strnsubst.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/xargs/xargs.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/xargs/xargs.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/adduser/adduser.sh#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/arp/arp.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/arp/arp.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch .. //depot/projects/trustedbsd/audit3/usr.sbin/btxld/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/btxld/btxld.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/config.y#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkmakefile.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/config/mkoptions.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kbdcontrol/kbdcontrol.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kbdmap/kbdmap.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kldxref/ef_obj.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mixer/mixer.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/newsyslog/newsyslog.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/main.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/add/pkg_add.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/create/perform.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/create/pkg_create.1#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/create/pl.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/info.h#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/main.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/perform.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/pkg_info.1#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/info/show.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/lib.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/plist.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/url.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/phttpget/phttpget.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/portsnap.8#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/portsnap/portsnap/portsnap.sh#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/powerd/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/anonFTP.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/disks.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/dispatch.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/label.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/media.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/menus.c#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/sysinstall.8#6 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/sysinstall.h#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sysinstall/tcpip.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/traceroute6/traceroute6.8#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/etc/pf.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $ +# $FreeBSD: src/etc/pf.conf,v 1.3 2006/01/27 17:16:20 mlaier Exp $ # $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $ # # See pf.conf(5) and /usr/share/examples/pf for syntax and examples. @@ -72,6 +72,10 @@ #pass in on $ext_if proto { tcp, udp } from any to port 80 keep state # pass incoming ports for ftp-proxy +#pass in on $ext_if inet proto tcp from any to $ext_if port > 49151 keep state + +# Alternate rule to pass incoming ports for ftp-proxy +# NOTE: Please see pf.conf(5) BUGS section before using user/group rules. #pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state # assign packets to a queue. ==== //depot/projects/trustedbsd/audit3/games/fortune/datfiles/fortunes#8 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.203 2006/01/21 14:16:01 matteo Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.205 2006/01/28 09:19:20 dds Exp $ % ======================================================================= @@ -29939,6 +29939,11 @@ what is essential is invisible to the eye. -- The Fox, 'The Little Prince" % +It is perfectly permissible for every system call to fail with [ENOTADUCK] +unless the first five bytes of the caller's address space contain the +word "quack". + -- Garrett Wollman +% It is possible by ingenuity and at the expense of clarity... {to do almost anything in any language}. However, the fact that it is possible to push a pea up a mountain with your nose does not mean that this is a sensible @@ -35390,6 +35395,10 @@ % Never delay the ending of a meeting or the beginning of a cocktail hour. % +Never do programs contain so few bugs as when no debugging tools +are available. + -- Niklaus Wirth +% Never do today what you can put off until tomorrow. % Never drink Coca-Cola in a moving elevator. The elevator's motion coupled ==== //depot/projects/trustedbsd/audit3/include/nl_types.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $ + * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _NL_TYPES_H_ @@ -97,8 +97,7 @@ __BEGIN_DECLS nl_catd catopen(const char *, int); -char *catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char *catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS ==== //depot/projects/trustedbsd/audit3/include/stdio.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $ + * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $ */ #ifndef _STDIO_H_ @@ -328,12 +328,7 @@ int asprintf(char **, const char *, ...) __printflike(2, 3); char *ctermid_r(char *); char *fgetln(FILE *, size_t *); -#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3 -#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2))) -#else -#define __ATTR_FORMAT_ARG -#endif -__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG; +__const char *fmtcheck(const char *, const char *) __format_arg(2); int fpurge(FILE *); void setbuffer(FILE *, char *, int); int setlinebuf(FILE *); ==== //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -133,10 +133,19 @@ /******************************************************************************/ -#define MALLOC_DEBUG +/* + * In order to disable various extra features that may have negative + * performance impacts, (assertions, expanded statistics, redzones), define + * NO_MALLOC_EXTRAS. + */ +/* #define NO_MALLOC_EXTRAS */ + +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_DEBUG +#endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.106 2006/01/26 08:11:23 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.110 2006/01/27 07:46:22 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -176,13 +185,16 @@ * Calculate statistics that can be used to get an idea of how well caching is * working. */ -#define MALLOC_STATS -#define MALLOC_STATS_ARENAS +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_STATS +#endif /* * Include redzones before/after every region, and check for buffer overflows. */ -#define MALLOC_REDZONES +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_REDZONES +#endif #ifdef MALLOC_REDZONES # define MALLOC_RED_2POW 4 # define MALLOC_RED ((size_t)(1 << MALLOC_RED_2POW)) @@ -298,10 +310,10 @@ uint64_t nrequests; /* - * Number of best-fit allocations that were successfully serviced by + * Number of exact-fit allocations that were successfully serviced by * this bin. */ - uint64_t nfit; + uint64_t nserviced; /* High-water marks for this bin. */ unsigned long highcached; @@ -311,7 +323,7 @@ * during normal operation, so is maintained here in order to allow * calculating the high water mark. */ - unsigned nregions; + unsigned long curcached; }; typedef struct arena_stats_s arena_stats_t; @@ -349,11 +361,8 @@ /* Frag statistics. */ struct { - /* - * Number of times a region is cached in the "frag" field of - * the arena. - */ - uint64_t ncached; + /* Number of times the "frag" field of the arena is refilled. */ + uint64_t nrefills; /* * Number of times a region is requested from the "frag" field @@ -377,16 +386,10 @@ uint64_t nrequests; /* - * Number of best-fit allocations that were successfully + * Number of allocation requests that were successfully * serviced by large_regions. */ - uint64_t nfit; - - /* - * Number of allocation requests that were successfully serviced - * large_regions, but that a bin could have serviced. - */ - uint64_t noverfit; + uint64_t nserviced; /* * High-water mark for large_regions (number of nodes in tree). @@ -1176,7 +1179,7 @@ stats_arenas->split.nserviced += arena->stats.split.nserviced; /* Frag. */ - stats_arenas->frag.ncached += arena->stats.frag.ncached; + stats_arenas->frag.nrefills += arena->stats.frag.nrefills; stats_arenas->frag.nrequests += arena->stats.frag.nrequests; stats_arenas->frag.nserviced += arena->stats.frag.nserviced; @@ -1184,18 +1187,20 @@ for (i = 0; i < NBINS; i++) { stats_arenas->bins[i].nrequests += arena->stats.bins[i].nrequests; - stats_arenas->bins[i].nfit += arena->stats.bins[i].nfit; + stats_arenas->bins[i].nserviced += + arena->stats.bins[i].nserviced; if (arena->stats.bins[i].highcached > stats_arenas->bins[i].highcached) { stats_arenas->bins[i].highcached = arena->stats.bins[i].highcached; } + stats_arenas->bins[i].curcached + += arena->stats.bins[i].curcached; } /* large and large_regions. */ stats_arenas->large.nrequests += arena->stats.large.nrequests; - stats_arenas->large.nfit += arena->stats.large.nfit; - stats_arenas->large.noverfit += arena->stats.large.noverfit; + stats_arenas->large.nserviced += arena->stats.large.nserviced; if (arena->stats.large.highcached > stats_arenas->large.highcached) stats_arenas->large.highcached = arena->stats.large.highcached; stats_arenas->large.curcached += arena->stats.large.curcached; @@ -1227,28 +1232,29 @@ stats_arenas->split.nserviced); malloc_printf("cached frag usage:\n"); - malloc_printf(" %13s%13s%13s\n", "ncached", "nrequests", "nserviced"); - malloc_printf(" %13llu%13llu%13llu\n", stats_arenas->frag.ncached, + malloc_printf(" %13s%13s%13s\n", "nrefills", "nrequests", "nserviced"); + malloc_printf(" %13llu%13llu%13llu\n", stats_arenas->frag.nrefills, stats_arenas->frag.nrequests, stats_arenas->frag.nserviced); malloc_printf("bins:\n"); - malloc_printf(" %4s%7s%13s%13s%11s\n", "bin", - "size", "nrequests", "nfit", "highcached"); + malloc_printf(" %4s%7s%13s%13s%11s%11s\n", "bin", + "size", "nrequests", "nserviced", "highcached", "curcached"); for (i = 0; i < NBINS; i++) { malloc_printf( - " %4u%7u%13llu%13llu%11lu\n", + " %4u%7u%13llu%13llu%11lu%11lu\n", i, ((i + bin_shift) << opt_quantum_2pow), - stats_arenas->bins[i].nrequests, stats_arenas->bins[i].nfit, - stats_arenas->bins[i].highcached); + stats_arenas->bins[i].nrequests, + stats_arenas->bins[i].nserviced, + stats_arenas->bins[i].highcached, + stats_arenas->bins[i].curcached); } malloc_printf("large:\n"); - malloc_printf(" %13s%13s%13s%13s%13s\n", "nrequests", "nfit", - "noverfit", "highcached", "curcached"); - malloc_printf(" %13llu%13llu%13llu%13lu%13lu\n", - stats_arenas->large.nrequests, stats_arenas->large.nfit, - stats_arenas->large.noverfit, stats_arenas->large.highcached, - stats_arenas->large.curcached); + malloc_printf(" %13s%13s%13s%13s\n", "nrequests", "nserviced", + "highcached", "curcached"); + malloc_printf(" %13llu%13llu%13lu%13lu\n", + stats_arenas->large.nrequests, stats_arenas->large.nserviced, + stats_arenas->large.highcached, stats_arenas->large.curcached); malloc_printf("huge\n"); malloc_printf(" %13s\n", "nrequests"); @@ -1630,16 +1636,14 @@ static unsigned arena_bins_search(arena_t *arena, size_t size) { - unsigned ret, minbin, i; + unsigned minbin, i; int bit; assert(QUANTUM_CEILING(size) == size); assert((size >> opt_quantum_2pow) >= bin_shift); - if (size > bin_maxsize) { - ret = UINT_MAX; - goto RETURN; - } + if (size > bin_maxsize) + return (UINT_MAX); minbin = (size >> opt_quantum_2pow) - bin_shift; assert(minbin < NBINS); @@ -1648,14 +1652,11 @@ & (UINT_MAX << (minbin % (sizeof(int) << 3)))); if (bit != 0) { /* Usable allocation found. */ - ret = (i * (sizeof(int) << 3)) + bit - 1; - goto RETURN; + return ((i * (sizeof(int) << 3)) + bit - 1); } } - ret = UINT_MAX; -RETURN: - return (ret); + return (UINT_MAX); } static __inline void @@ -1715,7 +1716,7 @@ qr_remove(reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions--; + arena->stats.bins[bin].curcached--; #endif if (qr_next(&tbin->regions, next.u.s.link) == &tbin->regions) arena_mask_unset(arena, bin); @@ -2066,12 +2067,12 @@ qr_new(reg, next.u.s.link); qr_before_insert(&tbin->regions, reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions++; + arena->stats.bins[bin].curcached++; - if (arena->stats.bins[bin].nregions + if (arena->stats.bins[bin].curcached > arena->stats.bins[bin].highcached) { arena->stats.bins[bin].highcached - = arena->stats.bins[bin].nregions; + = arena->stats.bins[bin].curcached; } #endif } @@ -2096,12 +2097,12 @@ qr_new(reg, next.u.s.link); qr_after_insert(&tbin->regions, reg, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions++; + arena->stats.bins[bin].curcached++; - if (arena->stats.bins[bin].nregions + if (arena->stats.bins[bin].curcached > arena->stats.bins[bin].highcached) { arena->stats.bins[bin].highcached - = arena->stats.bins[bin].nregions; + = arena->stats.bins[bin].curcached; } #endif } @@ -2123,7 +2124,7 @@ == ((bin + bin_shift) << opt_quantum_2pow)); qr_remove(ret, next.u.s.link); #ifdef MALLOC_STATS - arena->stats.bins[bin].nregions--; + arena->stats.bins[bin].curcached--; #endif if (qr_next(&tbin->regions, next.u.s.link) == &tbin->regions) arena_mask_unset(arena, bin); @@ -2479,7 +2480,7 @@ frag = node->reg; #ifdef MALLOC_STATS - arena->stats.frag.ncached++; + arena->stats.frag.nrefills++; #endif assert(region_next_free_get(&frag->sep)); region_next_free_unset(&frag->sep); @@ -2499,7 +2500,7 @@ /* Use the smallest available region. */ arena->frag = arena_bin_pop(arena, bin); #ifdef MALLOC_STATS - arena->stats.frag.ncached++; + arena->stats.frag.nrefills++; #endif total_size = region_next_size_get(&arena->frag->sep); @@ -2651,139 +2652,103 @@ static region_t * arena_split_reg_alloc(arena_t *arena, size_t size, bool fit) { - region_t *ret; + + if (arena->split == NULL) + return (NULL); - if (arena->split != NULL) { #ifdef MALLOC_STATS - arena->stats.split.nrequests++; + arena->stats.split.nrequests++; #endif + if (region_next_size_get(&arena->split->sep) >= size) { + region_t *ret; - if (region_next_size_get(&arena->split->sep) >= size) { - if (fit) { - size_t total_size; + if (fit) { + size_t total_size; - /* - * Use split, but try to use the beginning for - * smaller regions, and the end for larger - * regions. This reduces fragmentation in some - * pathological use cases. It tends to group - * short-lived (smaller) regions, which - * increases the effectiveness of coalescing. - */ + /* + * Use split, but try to use the beginning for smaller + * regions, and the end for larger regions. This + * reduces fragmentation in some pathological use + * cases. It tends to group short-lived (smaller) + * regions, which increases the effectiveness of + * coalescing. + */ - total_size = - region_next_size_get(&arena->split->sep); - assert(size % quantum == 0); + total_size = region_next_size_get(&arena->split->sep); + assert(size % quantum == 0); - if (total_size - size >= QUANTUM_CEILING( - sizeof(region_small_sizer_t))) { - if (size <= bin_maxsize) { - region_t *next; - - /* - * Carve space from the - * beginning of split. - */ - - /* ret. */ - ret = arena->split; - region_next_size_set(&ret->sep, - size); - assert(region_next_free_get( - &ret->sep) == false); - - /* next. */ - next = (region_t *)&((char *) - ret)[size]; - region_next_size_set(&next->sep, - total_size - size); - assert(size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - region_prev_free_unset( - &next->sep); - region_next_free_unset( - &next->sep); - - /* Update split. */ - arena->split = next; - } else { - region_t *prev; - size_t prev_size; - - /* - * Carve space from the end of - * split. - */ - - /* prev. */ - prev_size = total_size - size; - prev = arena->split; - region_next_size_set(&prev->sep, - prev_size); - assert(prev_size >= - QUANTUM_CEILING(sizeof( - region_small_sizer_t))); - assert(region_next_free_get( - &prev->sep) == false); - - /* ret. */ - ret = (region_t *)&((char *) - prev)[prev_size]; - region_next_size_set(&ret->sep, - size); - region_prev_free_unset( - &ret->sep); - region_next_free_unset( - &ret->sep); - -#ifdef MALLOC_DEBUG - { + if (total_size - size >= + QUANTUM_CEILING(sizeof(region_small_sizer_t))) { + if (size <= bin_maxsize) { region_t *next; - /* next. */ - next = (region_t *)&((char *) ret) - [region_next_size_get(&ret->sep)]; - assert(region_prev_free_get(&next->sep) - == false); - } -#endif - } -#ifdef MALLOC_STATS - arena->stats.nsplit++; -#endif - } else { /* - * split is close enough to the right - * size that there isn't enough room to - * create a neighboring region. + * Carve space from the beginning of + * split. */ /* ret. */ ret = arena->split; - arena->split = NULL; + region_next_size_set(&ret->sep, size); assert(region_next_free_get(&ret->sep) == false); + /* next. */ + next = (region_t *)&((char *)ret)[size]; + region_next_size_set(&next->sep, + total_size - size); + assert(size >= QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + region_prev_free_unset(&next->sep); + region_next_free_unset(&next->sep); + + /* Update split. */ + arena->split = next; + } else { + region_t *prev; + size_t prev_size; + + /* Carve space from the end of split. */ + + /* prev. */ + prev_size = total_size - size; + prev = arena->split; + region_next_size_set(&prev->sep, + prev_size); + assert(prev_size >= + QUANTUM_CEILING(sizeof( + region_small_sizer_t))); + assert(region_next_free_get( + &prev->sep) == false); + + /* ret. */ + ret = (region_t *)&((char *) + prev)[prev_size]; + region_next_size_set(&ret->sep, size); + region_prev_free_unset(&ret->sep); + region_next_free_unset(&ret->sep); + #ifdef MALLOC_DEBUG { - region_t *next; + region_t *next; - /* next. */ - next = (region_t *)&((char *) - ret)[region_next_size_get( - &ret->sep)]; - assert(region_prev_free_get( - &next->sep) == false); + /* next. */ + next = (region_t *)&((char *)ret) + [region_next_size_get(&ret->sep)]; + assert(region_prev_free_get(&next->sep) + == false); } #endif } - #ifdef MALLOC_STATS - arena->stats.split.nserviced++; + arena->stats.nsplit++; #endif } else { - /* Don't fit to the allocation size. */ + /* + * Split is close enough to the right size that + * there isn't enough room to create a + * neighboring region. + */ /* ret. */ ret = arena->split; @@ -2796,35 +2761,59 @@ region_t *next; /* next. */ - next = (region_t *) &((char *) ret) - [region_next_size_get(&ret->sep)]; + next = (region_t *)&((char *) + ret)[region_next_size_get( + &ret->sep)]; assert(region_prev_free_get(&next->sep) == false); } #endif } - region_next_contig_set(&ret->sep); - goto RETURN; - } else if (size <= bin_maxsize) { - region_t *reg; +#ifdef MALLOC_STATS + arena->stats.split.nserviced++; +#endif + } else { + /* Don't fit to the allocation size. */ + + /* ret. */ + ret = arena->split; + arena->split = NULL; + assert(region_next_free_get(&ret->sep) == false); + +#ifdef MALLOC_DEBUG + { + region_t *next; + + /* next. */ + next = (region_t *) &((char *) ret) + [region_next_size_get(&ret->sep)]; + assert(region_prev_free_get(&next->sep) + == false); + } +#endif + } + region_next_contig_set(&ret->sep); + return (ret); + } + /* If we get here, split has failed to service the request. */ + + if (size <= bin_maxsize) { + region_t *reg; - /* - * The split region is too small to service a small - * request. Clear split. - */ + /* + * The split region is too small to service a small request. + * Clear split. + */ - reg = arena->split; - region_next_contig_set(®->sep); + reg = arena->split; + region_next_contig_set(®->sep); - arena->split = NULL; + arena->split = NULL; - arena_delay_cache(arena, reg); - } + arena_delay_cache(arena, reg); } - ret = NULL; -RETURN: - return (ret); + return (NULL); } /* @@ -2884,7 +2873,6 @@ } else arena_mru_cache(arena, next, next_size); } - #ifdef MALLOC_STATS arena->stats.nsplit++; #endif @@ -2911,19 +2899,17 @@ ret = arena_bin_pop(arena, bin); assert(region_next_size_get(&ret->sep) >= size); #ifdef MALLOC_STATS - arena->stats.bins[bin].nfit++; + arena->stats.bins[bin].nserviced++; #endif - goto RETURN; + return (ret); } /* Look at frag to see whether it's large enough. */ ret = arena_frag_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); - ret = NULL; -RETURN: - return (ret); + return (NULL); } /* Look in large_regions for a large enough region. */ @@ -2943,10 +2929,8 @@ region_next_size_set(&key.sep, size); node = RB_NFIND(region_tree_s, &arena->large_regions, &key.next.u.l.node); - if (node == NULL) { - ret = NULL; - goto RETURN; - } + if (node == NULL) + return (NULL); /* Cached large region found. */ ret = node->reg; @@ -2967,13 +2951,9 @@ arena_reg_fit(arena, size, ret, false); #ifdef MALLOC_STATS - if (size > bin_maxsize) - arena->stats.large.nfit++; - else - arena->stats.large.noverfit++; + arena->stats.large.nserviced++; #endif -RETURN: return (ret); } @@ -2985,10 +2965,8 @@ chunk_node_t *chunk; chunk = chunk_alloc(chunk_size); - if (chunk == NULL) { - ret = NULL; - goto RETURN; - } + if (chunk == NULL) + return (NULL); #ifdef MALLOC_DEBUG { @@ -3042,7 +3020,6 @@ if (fit) arena_reg_fit(arena, size, ret, (arena->split == NULL)); -RETURN: return (ret); } @@ -3063,16 +3040,16 @@ if (size <= bin_maxsize) { ret = arena_bin_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); } ret = arena_large_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); ret = arena_split_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); /* * Only try allocating from frag here if size is large, since @@ -3082,16 +3059,14 @@ if (size > bin_maxsize) { ret = arena_frag_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); } ret = arena_chunk_reg_alloc(arena, size, fit); if (ret != NULL) - goto RETURN; + return (ret); - ret = NULL; -RETURN: - return (ret); + return (NULL); } static void * @@ -3109,8 +3084,7 @@ quantum_size = region_ceiling(size); if (quantum_size < size) { /* size is large enough to cause size_t wrap-around. */ - ret = NULL; >>> TRUNCATED FOR MAIL (1000 lines) <<<