From hselasky at FreeBSD.org Sun Nov 1 12:14:24 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Nov 1 12:14:30 2009 Subject: PERFORCE change 170037 for review Message-ID: <200911011214.nA1CENLS042945@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170037 Change 170037 by hselasky@hselasky_laptop001 on 2009/11/01 12:13:52 USB CORE (new feature): - USB linux compat patch. Don't write actual length if the actual length pointer is NULL. - patch from: Manuel Gebele Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#52 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#52 (text+ko) ==== @@ -624,10 +624,11 @@ done: if (do_unlock) mtx_unlock(&Giant); - if (err) { - *p_actlen = 0; - } else { - *p_actlen = urb->actual_length; + if (p_actlen != NULL) { + if (err) + *p_actlen = 0; + else + *p_actlen = urb->actual_length; } return (err); } From mav at FreeBSD.org Sun Nov 1 17:06:15 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Sun Nov 1 17:06:22 2009 Subject: PERFORCE change 170042 for review Message-ID: <200911011706.nA1H6FIe089513@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170042 Change 170042 by mav@mav_mavbook on 2009/11/01 17:05:43 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#10 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#48 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#115 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.ia64#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/highfp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/vm_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/proc.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/swtch.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#25 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/usbconfig.8#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -272,7 +272,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ - -iprefix ${LIB32TMP}/usr/ \ + -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#48 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.10 2009/10/31 10:43:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.11 2009/11/01 11:31:06 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#115 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.230 2009/10/31 10:43:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.231 2009/11/01 11:31:06 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.3 2009/10/21 15:27:48 mav Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.4 2009/11/01 11:31:06 mav Exp $ */ #ifndef _CAM_CAM_XPT_INTERNAL_H ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#22 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.5 2009/10/31 10:43:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.6 2009/11/01 11:31:06 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/conf/files.ia64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.100 2009/09/03 09:33:57 ed Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.101 2009/10/31 22:27:31 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -84,6 +84,7 @@ ia64/ia64/emulate.c standard ia64/ia64/exception.S standard ia64/ia64/gdb_machdep.c optional gdb +ia64/ia64/highfp.c standard ia64/ia64/in_cksum.c optional inet ia64/ia64/interrupt.c standard ia64/ia64/locore.S standard no-obj ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.14 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.15 2009/10/31 14:19:50 mav Exp $"); #include "opt_ata.h" #include @@ -591,7 +591,9 @@ /* chip does not reliably do 64K DMA transfers */ if (ctlr->chip->cfg2 == MV_50XX || ctlr->chip->cfg2 == MV_60XX) - ch->dma.max_iosize = 64 * DEV_BSIZE; + ch->dma.max_iosize = 64 * DEV_BSIZE; + else + ch->dma.max_iosize = (ATA_DMA_ENTRIES - 1) * PAGE_SIZE; } ATA_DECLARE_DRIVER(ata_marvell); ==== //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.9 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.10 2009/11/01 13:06:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#15 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.72 2008/10/14 20:18:57 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.73 2009/10/31 17:06:36 se Exp $"); #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -8582,7 +8582,7 @@ * Allocate a tag for the DMA of user data. */ if (bus_dma_tag_create(np->bus_dmat, 1, (1<<24), - BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, SYM_CONF_MAX_SG, (1<<24), 0, busdma_lock_mutex, &np->mtx, ==== //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.71 2009/08/13 17:09:45 attilio Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/interrupt.c,v 1.72 2009/10/31 22:27:31 marcel Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /*- @@ -216,14 +216,7 @@ asts[PCPU_GET(cpuid)]++; CTR1(KTR_SMP, "IPI_AST, cpuid=%d", PCPU_GET(cpuid)); } else if (vector == ipi_vector[IPI_HIGH_FP]) { - struct thread *thr = PCPU_GET(fpcurthread); - if (thr != NULL) { - mtx_lock_spin(&thr->td_md.md_highfp_mtx); - save_high_fp(&thr->td_pcb->pcb_high_fp); - thr->td_pcb->pcb_fpcpu = NULL; - PCPU_SET(fpcurthread, NULL); - mtx_unlock_spin(&thr->td_md.md_highfp_mtx); - } + ia64_highfp_save_ipi(); } else if (vector == ipi_vector[IPI_RENDEZVOUS]) { rdvs[PCPU_GET(cpuid)]++; CTR1(KTR_SMP, "IPI_RENDEZVOUS, cpuid=%d", PCPU_GET(cpuid)); ==== //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#19 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.247 2009/10/27 10:47:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.248 2009/10/31 22:27:31 marcel Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1461,81 +1461,6 @@ return (0); } -/* - * High FP register functions. - */ - -int -ia64_highfp_drop(struct thread *td) -{ - struct pcb *pcb; - struct pcpu *cpu; - struct thread *thr; - - mtx_lock_spin(&td->td_md.md_highfp_mtx); - pcb = td->td_pcb; - cpu = pcb->pcb_fpcpu; - if (cpu == NULL) { - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - return (0); - } - pcb->pcb_fpcpu = NULL; - thr = cpu->pc_fpcurthread; - cpu->pc_fpcurthread = NULL; - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - - /* Post-mortem sanity checking. */ - KASSERT(thr == td, ("Inconsistent high FP state")); - return (1); -} - -int -ia64_highfp_save(struct thread *td) -{ - struct pcb *pcb; - struct pcpu *cpu; - struct thread *thr; - - /* Don't save if the high FP registers weren't modified. */ - if ((td->td_frame->tf_special.psr & IA64_PSR_MFH) == 0) - return (ia64_highfp_drop(td)); - - mtx_lock_spin(&td->td_md.md_highfp_mtx); - pcb = td->td_pcb; - cpu = pcb->pcb_fpcpu; - if (cpu == NULL) { - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - return (0); - } -#ifdef SMP - if (td == curthread) - sched_pin(); - if (cpu != pcpup) { - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - ipi_send(cpu, IPI_HIGH_FP); - if (td == curthread) - sched_unpin(); - while (pcb->pcb_fpcpu == cpu) - DELAY(100); - return (1); - } else { - save_high_fp(&pcb->pcb_high_fp); - if (td == curthread) - sched_unpin(); - } -#else - save_high_fp(&pcb->pcb_high_fp); -#endif - pcb->pcb_fpcpu = NULL; - thr = cpu->pc_fpcurthread; - cpu->pc_fpcurthread = NULL; - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - - /* Post-mortem sanity cxhecking. */ - KASSERT(thr == td, ("Inconsistent high FP state")); - return (1); -} - void ia64_sync_icache(vm_offset_t va, vm_offset_t sz) { ==== //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.130 2008/03/12 10:11:58 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/trap.c,v 1.131 2009/10/31 22:27:31 marcel Exp $"); #include "opt_ddb.h" #include "opt_ktrace.h" @@ -652,66 +652,10 @@ break; case IA64_VEC_DISABLED_FP: { - struct pcpu *pcpu; - struct pcb *pcb; - struct thread *thr; - - /* Always fatal in kernel. Should never happen. */ - if (!user) + if (user) + ia64_highfp_enable(td, tf); + else trap_panic(vector, tf); - - sched_pin(); - thr = PCPU_GET(fpcurthread); - if (thr == td) { - /* - * Short-circuit handling the trap when this CPU - * already holds the high FP registers for this - * thread. We really shouldn't get the trap in the - * first place, but since it's only a performance - * issue and not a correctness issue, we emit a - * message for now, enable the high FP registers and - * return. - */ - printf("XXX: bogusly disabled high FP regs\n"); - tf->tf_special.psr &= ~IA64_PSR_DFH; - sched_unpin(); - goto out; - } else if (thr != NULL) { - mtx_lock_spin(&thr->td_md.md_highfp_mtx); - pcb = thr->td_pcb; - save_high_fp(&pcb->pcb_high_fp); - pcb->pcb_fpcpu = NULL; - PCPU_SET(fpcurthread, NULL); - mtx_unlock_spin(&thr->td_md.md_highfp_mtx); - thr = NULL; - } - - mtx_lock_spin(&td->td_md.md_highfp_mtx); - pcb = td->td_pcb; - pcpu = pcb->pcb_fpcpu; - -#ifdef SMP - if (pcpu != NULL) { - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - ipi_send(pcpu, IPI_HIGH_FP); - while (pcb->pcb_fpcpu == pcpu) - DELAY(100); - mtx_lock_spin(&td->td_md.md_highfp_mtx); - pcpu = pcb->pcb_fpcpu; - thr = PCPU_GET(fpcurthread); - } -#endif - - if (thr == NULL && pcpu == NULL) { - restore_high_fp(&pcb->pcb_high_fp); - PCPU_SET(fpcurthread, td); - pcb->pcb_fpcpu = pcpup; - tf->tf_special.psr &= ~IA64_PSR_MFH; - tf->tf_special.psr &= ~IA64_PSR_DFH; - } - - mtx_unlock_spin(&td->td_md.md_highfp_mtx); - sched_unpin(); goto out; } ==== //depot/projects/scottl-camlock/src/sys/ia64/ia64/vm_machdep.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.96 2009/06/20 05:36:53 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.97 2009/10/31 22:27:31 marcel Exp $ */ /*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -120,14 +120,11 @@ sp -= sizeof(struct trapframe); td->td_frame = (struct trapframe *)sp; td->td_frame->tf_length = sizeof(struct trapframe); - mtx_init(&td->td_md.md_highfp_mtx, "High FP lock", NULL, MTX_SPIN); } void cpu_thread_free(struct thread *td) { - - mtx_destroy(&td->td_md.md_highfp_mtx); } void @@ -148,6 +145,8 @@ struct pcb *pcb; struct trapframe *tf; + ia64_highfp_save(td0); + tf = td->td_frame; KASSERT(tf != NULL, ("foo")); bcopy(td0->td_frame, tf, sizeof(*tf)); ==== //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.29 2009/05/18 18:44:54 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/md_var.h,v 1.30 2009/10/31 22:27:31 marcel Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -86,7 +86,9 @@ int ia64_flush_dirty(struct thread *, struct _special *); uint64_t ia64_get_hcdp(void); int ia64_highfp_drop(struct thread *); +int ia64_highfp_enable(struct thread *, struct trapframe *); int ia64_highfp_save(struct thread *); +int ia64_highfp_save_ipi(void); struct ia64_init_return ia64_init(void); void ia64_probe_sapics(void); void ia64_sync_icache(vm_offset_t, vm_size_t); ==== //depot/projects/scottl-camlock/src/sys/ia64/include/proc.h#4 (text+ko) ==== @@ -23,14 +23,13 @@ * (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/ia64/include/proc.h,v 1.15 2005/08/06 20:28:19 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/proc.h,v 1.16 2009/10/31 22:27:31 marcel Exp $ */ #ifndef _MACHINE_PROC_H_ #define _MACHINE_PROC_H_ struct mdthread { - struct mtx md_highfp_mtx; int md_spinlock_count; /* (k) */ int md_saved_intr; /* (k) */ }; ==== //depot/projects/scottl-camlock/src/sys/powerpc/aim/copyinout.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/copyinout.c,v 1.16 2007/12/14 22:39:34 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/aim/copyinout.c,v 1.17 2009/10/31 17:59:24 nwhitehorn Exp $"); #include #include @@ -347,8 +347,19 @@ return (-1); } - val = *p; - (void) atomic_cmpset_32((volatile uint32_t *)p, old, new); + __asm __volatile ( + "1:\tlwarx %0, 0, %2\n\t" /* load old value */ + "cmplw %3, %0\n\t" /* compare */ + "bne 2f\n\t" /* exit if not equal */ + "stwcx. %4, 0, %2\n\t" /* attempt to store */ + "bne- 1b\n\t" /* spin if failed */ + "b 3f\n\t" /* we've succeeded */ + "2:\n\t" + "stwcx. %0, 0, %2\n\t" /* clear reservation (74xx) */ + "3:\n\t" + : "=&r" (val), "=m" (*p) + : "r" (p), "r" (old), "r" (new), "m" (*p) + : "cc", "memory"); td->td_pcb->pcb_onfault = NULL; ==== //depot/projects/scottl-camlock/src/sys/powerpc/aim/swtch.S#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/aim/swtch.S,v 1.29 2009/10/11 16:44:58 nwhitehorn Exp $ */ +/* $FreeBSD: src/sys/powerpc/aim/swtch.S,v 1.32 2009/10/31 20:59:13 nwhitehorn Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /*- @@ -57,6 +57,7 @@ */ #include "assym.s" +#include "opt_sched.h" #include @@ -81,36 +82,36 @@ * Switch to a new thread saving the current state in the old thread. */ ENTRY(cpu_switch) - stw %r5,TD_LOCK(%r3) /* ULE: update old thread's lock */ - /* XXX needs to change for MP */ - - lwz %r5,TD_PCB(%r3) /* Get the old thread's PCB ptr */ + lwz %r6,TD_PCB(%r3) /* Get the old thread's PCB ptr */ mr %r12,%r2 - stmw %r12,PCB_CONTEXT(%r5) /* Save the non-volatile GP regs. + stmw %r12,PCB_CONTEXT(%r6) /* Save the non-volatile GP regs. These can now be used for scratch */ mfcr %r16 /* Save the condition register */ - stw %r16,PCB_CR(%r5) + stw %r16,PCB_CR(%r6) mflr %r16 /* Save the link register */ - stw %r16,PCB_LR(%r5) + stw %r16,PCB_LR(%r6) mfsr %r16,USER_SR /* Save USER_SR for copyin/out */ isync - stw %r16,PCB_AIM_USR(%r5) - stw %r1,PCB_SP(%r5) /* Save the stack pointer */ + stw %r16,PCB_AIM_USR(%r6) + stw %r1,PCB_SP(%r6) /* Save the stack pointer */ mr %r14,%r3 /* Copy the old thread ptr... */ mr %r15,%r4 /* and the new thread ptr in scratch */ + mr %r16,%r5 /* and the new lock */ + mr %r17,%r6 /* and the PCB */ - lwz %r6,PCB_FLAGS(%r5) + lwz %r7,PCB_FLAGS(%r17) /* Save FPU context if needed */ - andi. %r6, %r6, PCB_FPU + andi. %r7, %r7, PCB_FPU beq .L1 bl save_fpu .L1: - lwz %r6,PCB_FLAGS(%r5) + mr %r3,%r14 /* restore old thread ptr */ + lwz %r7,PCB_FLAGS(%r17) /* Save Altivec context if needed */ - andi. %r6, %r6, PCB_VEC + andi. %r7, %r7, PCB_VEC beq .L2 bl save_vec @@ -118,7 +119,19 @@ mr %r3,%r14 /* restore old thread ptr */ bl pmap_deactivate /* Deactivate the current pmap */ + stw %r16,TD_LOCK(%r14) /* ULE: update old thread's lock */ + cpu_switchin: +#if defined(SMP) && defined(SCHED_ULE) + /* Wait for the new thread to become unblocked */ + lis %r6,blocked_lock@ha + addi %r6,%r6,blocked_lock@l +blocked_loop: + lwz %r7,TD_LOCK(%r15) + cmpw %r6,%r7 + beq blocked_loop +#endif + mfsprg %r7,0 /* Get the pcpu pointer */ stw %r15,PC_CURTHREAD(%r7) /* Store new current thread */ lwz %r17,TD_PCB(%r15) /* Store new current PCB */ ==== //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/aim/trap.c,v 1.75 2009/04/19 06:30:00 nwhitehorn Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/aim/trap.c,v 1.76 2009/10/31 17:46:50 nwhitehorn Exp $"); #include "opt_ktrace.h" @@ -85,8 +85,6 @@ static int handle_onfault(struct trapframe *frame); static void syscall(struct trapframe *frame); -static __inline void setusr(u_int); - int setfault(faultbuf); /* defined in locore.S */ /* Why are these not defined in a header? */ @@ -558,13 +556,6 @@ return (SIGSEGV); } -static __inline void -setusr(u_int content) -{ - __asm __volatile ("isync; mtsr %0,%1; isync" - :: "n"(USER_SR), "r"(content)); -} - int badaddr(void *addr, size_t size) { ==== //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#25 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.257 2009/10/27 10:15:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.258 2009/10/31 17:39:56 alc Exp $"); #include "opt_vm.h" @@ -1179,7 +1179,7 @@ dst_object->uip = dst_entry->uip; dst_entry->uip = NULL; } - access = prot = dst_entry->max_protection; + access = prot = dst_entry->protection; /* * If not an upgrade, then enter the mappings in the pmap as * read and/or execute accesses. Otherwise, enter them as ==== //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/usbconfig.8#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.2 2009/05/27 19:21:29 thompsa Exp $ +.\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.3 2009/11/01 11:39:07 brueffer Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Sep 28, 2008 +.Dd November 1, 2009 .Dt USBCONFIG 8 .Os .Sh NAME @@ -49,5 +49,13 @@ .It Fl h Show help and available commands. .El +.Pp +When called without options, +.Nm +prints a list of all available USB devices. +.Sh EXAMPLES +Show information about the device on USB bus 1 at address 2: +.Pp +.Dl usbconfig -u 1 -a 2 dump_info .Sh SEE ALSO .Xr usb 4 From pgj at FreeBSD.org Sun Nov 1 18:11:50 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Nov 1 18:11:59 2009 Subject: PERFORCE change 170043 for review Message-ID: <200911011811.nA1IBKjR095443@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170043 Change 170043 by pgj@petymeg-current on 2009/11/01 18:11:03 IFC Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/MAINTAINERS#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#2 edit .. //depot/projects/soc2009/pgj_libstat/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/UPDATING#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cat/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/chflags/chflags.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/chmod/chmod.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/cp/utils.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/df/df.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/df/df.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/hostname/hostname.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ln/ln.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ln/ln.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ls/ls.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ls/print.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/mv/mv.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/ps.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/rm/rm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/mask.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/merge.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/remove.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/setfacl/setfacl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/alias.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/eval.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/exec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/exec.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/expand.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/input.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/input.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/memalloc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/memalloc.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mkinit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mknodes.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/mksyntax.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/nodes.c.pat#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/output.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/parser.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/redir.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/sh.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/trap.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/var.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/test/TEST.sh#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/test/test.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/uuidgen/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/head/assert.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/Makefile.inc#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libctf/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libdtrace/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/lib/libnvpair/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.sbin/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/cddl/usr.sbin/lockstat/Makefile#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/amd/amd/get_args.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/KNOWN-DEFECTS#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/NSEC3-NOTES#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/README#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/README.pkcs11#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/bind9.xsl#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/bind9.xsl.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/convertxsl.pl#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/statschannel.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/statschannel.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/config.guess#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/config.h.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.nsupdate.html#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/index#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3757.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc3901.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4025.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4033.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4034.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4035.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4074.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4159.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4193.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4255.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4343.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4367.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4398.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4408.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4431.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4470.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4634.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4641.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4648.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc4701.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc5155.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/api#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/daemon.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/ftruncate.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/mktemp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/putenv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/readv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/setenv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/setitimer.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/strdup.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/strerror.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/strpbrk.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/strsep.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/strtoul.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/utimes.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/bsd/writev.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/config.h.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/configure.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/dst_api.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/dst_internal.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/md5.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/md5_locl.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/dst/support.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/arpa/inet.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/arpa/nameser.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/fd_setsize.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/hesiod.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/irp.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/irs.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/assertions.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/ctl.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/dst.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/heap.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/list.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/logging.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/misc.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/platform.h.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/isc/tree.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/netdb.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/netgroup.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/res_update.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/resolv.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/include/resolv_mt.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_addr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_data.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_neta.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_netof.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_network.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_gr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_nw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_pr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_pw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/dns_sv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_gr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_ho.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_ng.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_nw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_pr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_pw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gen_sv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getgrent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getgrent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gethostent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getnameinfo.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getnetent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getnetgrent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getprotoent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getpwent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getpwent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getservent.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/getservent_r.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/hesiod.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/hesiod_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_gr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_ho.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_ng.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_nw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_pr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_pw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irp_sv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irpmarshall.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irs_data.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irs_data.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/irs_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_gr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_ho.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_ng.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_nw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_pr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_pw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/lcl_sv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_gr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_ho.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_ng.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_nw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_pr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_pw.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nis_sv.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/nul_ng.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/pathnames.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/irs/util.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/assertions.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/assertions.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/base64.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/bitncmp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ctl_p.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ctl_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ev_files.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ev_streams.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ev_timers.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/ev_waits.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/eventlib.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/eventlib_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/heap.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/heap.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/hex.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/logging.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/logging.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/logging_p.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/memcluster.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/movefile.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/tree.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/isc/tree.mdoc#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/make/includes.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/make/rules.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_date.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_name.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_netint.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_print.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_sign.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/port_after.h.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/port_before.h.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/Makefile.in#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/herror.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/mtctxres.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_comp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_data.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_debug.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_debug.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_init.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_private.h#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_query.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_send.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind/resolv/res_update.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/iptable.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/nsec3.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/iptable.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/nsec3.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/spnego.asn1#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/spnego.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/spnego.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/spnego_asn1.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/spnego_asn1.pl#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/base32.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/httpd.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/base32.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/httpd.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/iterated_hash.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/contrib/bind9/lib/isc/include/isc/os.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Sun Nov 1 19:01:40 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Nov 1 19:01:46 2009 Subject: PERFORCE change 170048 for review Message-ID: <200911011901.nA1J1e5i099388@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170048 Change 170048 by pgj@beehive on 2009/11/01 19:01:16 IFC Affected files ... .. //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#12 integrate Differences ... ==== //depot/projects/docproj_hu/www/hu/platforms/amd64.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ - + From pgj at FreeBSD.org Sun Nov 1 19:11:51 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Nov 1 19:11:57 2009 Subject: PERFORCE change 170049 for review Message-ID: <200911011911.nA1JBoIh001224@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170049 Change 170049 by pgj@beehive on 2009/11/01 19:11:02 MFen (doc): 1.238 -> 1.239 hu_HU.ISO8859-2/books/handbook/config/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#26 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#26 (text+ko) ==== @@ -7,7 +7,7 @@ From mav at FreeBSD.org Sun Nov 1 23:37:17 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Sun Nov 1 23:37:24 2009 Subject: PERFORCE change 170059 for review Message-ID: <200911012337.nA1NbGSc034715@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170059 Change 170059 by mav@mav_mavtest on 2009/11/01 23:36:18 Undo previous timeout handling on ATA XPT layer and implement it on SIM level, same as done for SPI transport. Potentially SIM has lesser possible recovery methods (just bus hard- or device soft-reset), but same time it has full information about the problem to use them properly. Rework siis timeout handling, to make driver wait for concurrently running requests completion or timeout. Concurrent requests may not be affected by fault that cause timeout, especially with PMP used. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#49 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#116 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#19 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#72 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#25 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#34 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#2 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#49 (text+ko) ==== @@ -182,12 +182,10 @@ struct cam_ed *device, void *async_arg); static void ata_action(union ccb *start_ccb); -static void ata_done(union ccb *done_ccb); static struct xpt_xport ata_xport = { .alloc_device = ata_alloc_device, .action = ata_action, - .done = ata_done, .async = ata_dev_async, }; @@ -1227,36 +1225,6 @@ } static void -ata_done(union ccb *done_ccb) -{ - struct cam_path *path; - union ccb *work_ccb; - - switch (done_ccb->ccb_h.status & CAM_STATUS_MASK) { - case CAM_CMD_TIMEOUT: - case CAM_UNCOR_PARITY: - work_ccb = xpt_alloc_ccb_nowait(); - if (work_ccb == NULL) - break; - if (xpt_create_path(&path, xpt_periph, done_ccb->ccb_h.path_id, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) { - xpt_free_ccb(work_ccb); - break; - } - xpt_setup_ccb(&work_ccb->ccb_h, path, CAM_PRIORITY_NORMAL); - work_ccb->ccb_h.func_code = XPT_RESET_BUS; - work_ccb->ccb_h.cbfcnp = NULL; - CAM_DEBUG(path, CAM_DEBUG_SUBTRACE, ("Resetting Bus\n")); - xpt_action(work_ccb); - xpt_free_ccb(work_ccb); - break; - } - - /* Call default done handler. */ - xpt_done_default(done_ccb); -} - -static void scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, int async_update) { ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#116 (text+ko) ==== @@ -3033,13 +3033,6 @@ } void -xpt_done_default(union ccb *done_ccb) -{ - /* Call the peripheral driver's callback */ - (*done_ccb->ccb_h.cbfcnp)(done_ccb->ccb_h.path->periph, done_ccb); -} - -void xpt_polled_action(union ccb *start_ccb) { u_int32_t timeout; @@ -3780,7 +3773,6 @@ static struct xpt_xport xport_default = { .alloc_device = xpt_alloc_device_default, .action = xpt_action_default, - .done = xpt_done_default, .async = xpt_dev_async_default, }; @@ -5067,8 +5059,8 @@ xpt_run_dev_sendq(ccb_h->path->bus); } - /* Call the XPT's callback */ - (*(ccb_h->path->bus->xport->done))((union ccb *)ccb_h); + /* Call the peripheral driver's callback */ + (*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h); } } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.h#19 (text+ko) ==== @@ -87,7 +87,6 @@ void xpt_action(union ccb *new_ccb); void xpt_action_default(union ccb *new_ccb); -void xpt_done_default(union ccb *new_ccb); void xpt_setup_ccb(struct ccb_hdr *ccb_h, struct cam_path *path, u_int32_t priority); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#12 (text+ko) ==== @@ -39,7 +39,6 @@ lun_id_t lun_id); typedef void (*xpt_release_device_func)(struct cam_ed *device); typedef void (*xpt_action_func)(union ccb *start_ccb); -typedef void (*xpt_done_func)(union ccb *done_ccb); typedef void (*xpt_dev_async_func)(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target, @@ -52,7 +51,6 @@ xpt_alloc_device_func alloc_device; xpt_release_device_func reldev; xpt_action_func action; - xpt_done_func done; xpt_dev_async_func async; xpt_announce_periph_func announce; }; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#72 (text+ko) ==== @@ -1275,10 +1275,8 @@ ATA_INL(ch->r_mem, AHCI_P_IS), ATA_INL(ch->r_mem, AHCI_P_CI), ATA_INL(ch->r_mem, AHCI_P_SACT), ch->rslots, ATA_INL(ch->r_mem, AHCI_P_TFD), ATA_INL(ch->r_mem, AHCI_P_SERR)); - /* Kick controller into sane state. */ - ahci_stop(ch->dev); - ahci_start(ch->dev); + ch->fatalerr = 1; /* Handle frozen command. */ if (ch->frozen) { union ccb *fccb = ch->frozen; @@ -1360,6 +1358,7 @@ ccb->csio.scsi_status = SCSI_STATUS_OK; break; case AHCI_ERR_INVALID: + ch->fatalerr = 1; ccb->ccb_h.status |= CAM_REQ_INVALID; break; case AHCI_ERR_INNOCENT: @@ -1375,6 +1374,7 @@ } break; case AHCI_ERR_SATA: + ch->fatalerr = 1; if (!ch->readlog) { xpt_freeze_simq(ch->sim, 1); ccb->ccb_h.status &= ~CAM_STATUS_MASK; @@ -1383,6 +1383,7 @@ ccb->ccb_h.status |= CAM_UNCOR_PARITY; break; case AHCI_ERR_TIMEOUT: + ch->fatalerr = 1; if (!ch->readlog) { xpt_freeze_simq(ch->sim, 1); ccb->ccb_h.status &= ~CAM_STATUS_MASK; @@ -1391,6 +1392,7 @@ ccb->ccb_h.status |= CAM_CMD_TIMEOUT; break; default: + ch->fatalerr = 1; ccb->ccb_h.status |= CAM_REQ_CMP_ERR; } /* Free slot. */ @@ -1414,12 +1416,13 @@ ahci_begin_transaction(dev, ccb); return; } + /* If it was our READ LOG command - process it. */ + if (ch->readlog) { + ahci_process_read_log(dev, ccb); /* If it was NCQ command error, put result on hold. */ - if (et == AHCI_ERR_NCQ) { + } else if (et == AHCI_ERR_NCQ) { ch->hold[slot->slot] = ccb; - } else if (ch->readlog) /* If it was our READ LOG command - process it. */ - ahci_process_read_log(dev, ccb); - else + } else xpt_done(ccb); /* Unfreeze frozen command. */ if (ch->frozen && ch->numrslots == 0) { @@ -1428,6 +1431,13 @@ ahci_begin_transaction(dev, fccb); xpt_release_simq(ch->sim, TRUE); } + /* If we have no other active commands, ... */ + if (ch->rslots == 0) { + /* if there was fatal error - reset port. */ + if (ch->fatalerr) { + ahci_reset(dev); + } + } /* Start PM timer. */ if (ch->numrslots == 0 && ch->pm_level > 3) { callout_schedule(&ch->pm_timer, @@ -1674,6 +1684,13 @@ /* XXX; Commands in loading state. */ ahci_end_transaction(&ch->slot[i], AHCI_ERR_INNOCENT); } + for (i = 0; i < ch->numslots; i++) { + if (!ch->hold[i]) + continue; + xpt_done(ch->hold[i]); + ch->hold[i] = NULL; + } + ch->fatalerr = 0; /* Tell the XPT about the event */ xpt_async(AC_BUS_RESET, ch->path, NULL); /* Disable port interrupts */ ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#25 (text+ko) ==== @@ -366,6 +366,7 @@ int numrslots; /* Number of running slots */ int numtslots; /* Number of tagged slots */ int readlog; /* Our READ LOG active */ + int fatalerr; /* Fatal error happend */ int lastslot; /* Last used slot */ int taggedtarget; /* Last tagged target */ union ccb *frozen; /* Frozen command */ ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#34 (text+ko) ==== @@ -1302,12 +1302,14 @@ { struct ata_channel *ch = device_get_softc(dev); union ccb *ccb = request->ccb; + int fatalerr = 0; ccb->ccb_h.status &= ~CAM_STATUS_MASK; if (request->flags & ATA_R_TIMEOUT) { xpt_freeze_simq(ch->sim, 1); ccb->ccb_h.status &= ~CAM_STATUS_MASK; ccb->ccb_h.status |= CAM_CMD_TIMEOUT | CAM_RELEASE_SIMQ; + fatalerr = 1; } else if (request->status & ATA_S_ERROR) { if (ccb->ccb_h.func_code == XPT_ATA_IO) { ccb->ccb_h.status |= CAM_ATA_STATUS_ERROR; @@ -1344,6 +1346,9 @@ } ata_free_request(request); xpt_done(ccb); + /* Do error recovery if needed. */ + if (fatalerr) + ata_reinit(dev); } static void ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#12 (text+ko) ==== @@ -767,7 +767,7 @@ estatus == SIIS_P_CMDERR_DATAFIS) { tslots = ch->numtslots[port]; for (i = 0; i < SIIS_MAX_SLOTS; i++) { - /* XXX: reqests in loading state. */ + /* XXX: requests in loading state. */ if (((ch->rslots >> i) & 1) == 0) continue; if (ch->slot[i].ccb->ccb_h.target_id != port) @@ -799,7 +799,7 @@ } else et = SIIS_ERR_INVALID; for (i = 0; i < SIIS_MAX_SLOTS; i++) { - /* XXX: reqests in loading state. */ + /* XXX: requests in loading state. */ if (((ch->rslots >> i) & 1) == 0) continue; siis_end_transaction(&ch->slot[i], et); @@ -970,13 +970,33 @@ return; } +/* Must be called with channel locked. */ +static void +siis_process_timeout(device_t dev) +{ + struct siis_channel *ch = device_get_softc(dev); + int i; + + mtx_assert(&ch->mtx, MA_OWNED); + if (!ch->readlog && !ch->recovery) { + xpt_freeze_simq(ch->sim, ch->numrslots); + ch->recovery = 1; + } + /* Handle the rest of commands. */ + for (i = 0; i < SIIS_MAX_SLOTS; i++) { + /* Do we have a running request on slot? */ + if (ch->slot[i].state < SIIS_SLOT_RUNNING) + continue; + siis_end_transaction(&ch->slot[i], SIIS_ERR_TIMEOUT); + } +} + /* Locked by callout mechanism. */ static void siis_timeout(struct siis_slot *slot) { device_t dev = slot->dev; struct siis_channel *ch = device_get_softc(dev); - int i; mtx_assert(&ch->mtx, MA_OWNED); device_printf(dev, "Timeout on slot %d\n", slot->slot); @@ -984,32 +1004,15 @@ __func__, ATA_INL(ch->r_mem, SIIS_P_IS), ATA_INL(ch->r_mem, SIIS_P_SS), ch->rslots, ATA_INL(ch->r_mem, SIIS_P_CMDERR), ATA_INL(ch->r_mem, SIIS_P_STS), ATA_INL(ch->r_mem, SIIS_P_SERR)); - /* Kick controller into sane state. */ - siis_portinit(ch->dev); - if (!ch->readlog) - xpt_freeze_simq(ch->sim, ch->numrslots); - /* Handle frozen command. */ - if (ch->frozen) { - union ccb *fccb = ch->frozen; - ch->frozen = NULL; - fccb->ccb_h.status &= ~CAM_STATUS_MASK; - fccb->ccb_h.status |= CAM_REQUEUE_REQ | CAM_RELEASE_SIMQ; - if (!(fccb->ccb_h.status & CAM_DEV_QFRZN)) { - xpt_freeze_devq(fccb->ccb_h.path, 1); - fccb->ccb_h.status |= CAM_DEV_QFRZN; - } - xpt_done(fccb); - } - /* Handle command with timeout. */ - siis_end_transaction(&ch->slot[slot->slot], SIIS_ERR_TIMEOUT); - /* Handle the rest of commands. */ - for (i = 0; i < SIIS_MAX_SLOTS; i++) { - /* Do we have a running request on slot? */ - if (ch->slot[i].state < SIIS_SLOT_RUNNING) - continue; - siis_end_transaction(&ch->slot[i], SIIS_ERR_INNOCENT); - } + if (ch->toslots == 0) + xpt_freeze_simq(ch->sim, 1); + ch->toslots |= (1 << slot->slot); + if ((ch->rslots & ~ch->toslots) == 0) + siis_process_timeout(dev); + else + device_printf(dev, " ... waiting for slots %08x\n", + ch->rslots & ~ch->toslots); } /* Must be called with channel locked. */ @@ -1074,6 +1077,7 @@ ccb->csio.scsi_status = SCSI_STATUS_OK; break; case SIIS_ERR_INVALID: + ch->fatalerr = 1; ccb->ccb_h.status |= CAM_REQ_INVALID; break; case SIIS_ERR_INNOCENT: @@ -1089,9 +1093,11 @@ } break; case SIIS_ERR_SATA: + ch->fatalerr = 1; ccb->ccb_h.status |= CAM_UNCOR_PARITY; break; case SIIS_ERR_TIMEOUT: + ch->fatalerr = 1; ccb->ccb_h.status |= CAM_CMD_TIMEOUT; break; default: @@ -1100,6 +1106,11 @@ /* Free slot. */ ch->rslots &= ~(1 << slot->slot); ch->aslots &= ~(1 << slot->slot); + if (et != SIIS_ERR_TIMEOUT) { + if (ch->toslots == (1 << slot->slot)) + xpt_release_simq(ch->sim, TRUE); + ch->toslots &= ~(1 << slot->slot); + } slot->state = SIIS_SLOT_EMPTY; slot->ccb = NULL; /* Update channel stats. */ @@ -1108,13 +1119,14 @@ (ccb->ataio.cmd.flags & CAM_ATAIO_FPDMA)) { ch->numtslots[ccb->ccb_h.target_id]--; } + /* If it was our READ LOG command - process it. */ + if (ch->readlog) { + siis_process_read_log(dev, ccb); /* If it was NCQ command error, put result on hold. */ - if (et == SIIS_ERR_NCQ) { + } else if (et == SIIS_ERR_NCQ) { ch->hold[slot->slot] = ccb; ch->numhslots++; - } else if (ch->readlog) /* If it was our READ LOG command - process it. */ - siis_process_read_log(dev, ccb); - else + } else xpt_done(ccb); /* Unfreeze frozen command. */ if (ch->frozen && ch->numrslots == 0) { @@ -1125,13 +1137,20 @@ } /* If we have no other active commands, ... */ if (ch->rslots == 0) { - /* if we have slots in error, we can reinit port. */ - if (ch->eslots != 0) - siis_portinit(dev); - /* if there commands on hold, we can do READ LOG. */ - if (!ch->readlog && ch->numhslots) - siis_issue_read_log(dev); - } + /* if there were timeouts or fatal error - reset port. */ + if (ch->toslots != 0 || ch->fatalerr) { + siis_reset(dev); + } else { + /* if we have slots in error, we can reinit port. */ + if (ch->eslots != 0) + siis_portinit(dev); + /* if there commands on hold, we can do READ LOG. */ + if (!ch->readlog && ch->numhslots) + siis_issue_read_log(dev); + } + /* If all the reset of commands are in timeout - abort them. */ + } else if ((ch->rslots & ~ch->toslots) == 0) + siis_process_timeout(dev); } static void @@ -1304,8 +1323,9 @@ if (bootverbose) device_printf(dev, "SIIS reset...\n"); - xpt_freeze_simq(ch->sim, ch->numrslots); - /* Requeue freezed command. */ + if (!ch->readlog && !ch->recovery) + xpt_freeze_simq(ch->sim, ch->numrslots); + /* Requeue frozen command. */ if (ch->frozen) { union ccb *fccb = ch->frozen; ch->frozen = NULL; @@ -1325,6 +1345,20 @@ /* XXX; Commands in loading state. */ siis_end_transaction(&ch->slot[i], SIIS_ERR_INNOCENT); } + /* Finish all holden commands as-is. */ + for (i = 0; i < SIIS_MAX_SLOTS; i++) { + if (!ch->hold[i]) + continue; + xpt_done(ch->hold[i]); + ch->hold[i] = NULL; + ch->numhslots--; + } + if (ch->toslots != 0) + xpt_release_simq(ch->sim, TRUE); + ch->eslots = 0; + ch->recovery = 0; + ch->toslots = 0; + ch->fatalerr = 0; /* Disable port interrupts */ ATA_OUTL(ch->r_mem, SIIS_P_IECLR, 0x0000FFFF); /* Set speed limit. */ ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#2 (text+ko) ==== @@ -373,13 +373,14 @@ uint32_t rslots; /* Running slots */ uint32_t aslots; /* Slots with atomic commands */ uint32_t eslots; /* Slots in error */ + uint32_t toslots; /* Slots in timeout */ int numrslots; /* Number of running slots */ int numtslots[SIIS_MAX_SLOTS]; /* Number of tagged slots */ int numhslots; /* Number of holden slots */ int readlog; /* Our READ LOG active */ + int fatalerr; /* Fatal error happend */ int recovery; /* Some slots are in error */ int lastslot; /* Last used slot */ - int taggedtarget; /* Last tagged target */ union ccb *frozen; /* Frozen command */ }; From mav at FreeBSD.org Mon Nov 2 08:35:15 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Mon Nov 2 08:35:21 2009 Subject: PERFORCE change 170067 for review Message-ID: <200911020835.nA28ZEi7002840@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170067 Change 170067 by mav@mav_mavbook on 2009/11/02 08:34:50 Remove part left from previous commit. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#23 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#23 (text+ko) ==== @@ -556,7 +556,6 @@ static struct xpt_xport scsi_xport = { .alloc_device = scsi_alloc_device, .action = scsi_action, - .done = xpt_done_default, .async = scsi_dev_async, }; From brueffer at FreeBSD.org Mon Nov 2 12:39:20 2009 From: brueffer at FreeBSD.org (Christian Brueffer) Date: Mon Nov 2 12:39:26 2009 Subject: PERFORCE change 170075 for review Message-ID: <200911021239.nA2CdJaP035845@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170075 Change 170075 by brueffer@brueffer_serenity on 2009/11/02 12:38:24 Fix a typo in a section header and kill eol whitespace. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_fcntl_cmd.3#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_fcntl_cmd.3#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_fcntl_cmd.3#1 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_fcntl_cmd.3#2 $ .\" -.Dd March 5, 2009 +.Dd March 5, 2009 .Dt AU_BSM_TO_FCNTL_CMD 3 .Os .Sh NAME @@ -65,12 +65,12 @@ .Fn au_fcntl_cmd_to_bsm function accepts a local .Xr fcntl 2 -command value, and returns the BSM +command value, and returns the BSM .Xr fcntl 2 -command value for it. This call cannot fail, and instead returns a BSM +command value for it. This call cannot fail, and instead returns a BSM command value indicating to a later decoder that the command value could not be encoded. -.Sh RETURN VALULES +.Sh RETURN VALUES On success, .Fn au_bsm_to_fcntl_cmd returns 0 and a converted command value; on failure, it returns -1 but does @@ -90,7 +90,7 @@ were introduced in OpenBSM 1.1. .Sh AUTHORS These functions were implemented by -.An Stacey Son +.An Stacey Son under contract to Apple Inc. .Pp The Basic Security Module (BSM) interface to audit records and audit event From mav at FreeBSD.org Mon Nov 2 16:49:30 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Mon Nov 2 16:49:37 2009 Subject: PERFORCE change 170082 for review Message-ID: <200911021649.nA2GnUo6078656@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170082 Change 170082 by mav@mav_mavtest on 2009/11/02 16:48:34 Implement ATA error status decoding and printing, including command, status and result. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#17 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#16 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#10 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam.h#10 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#38 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#17 (text+ko) ==== @@ -68,6 +68,185 @@ return 0; } +char * +ata_op_string(struct ata_cmd *cmd) +{ + + switch (cmd->command) { + case 0x00: return ("NOP"); + case 0x03: return ("CFA_REQUEST_EXTENDED_ERROR"); + case 0x08: return ("DEVICE_RESET"); + case 0x20: return ("READ"); + case 0x24: return ("READ48"); + case 0x25: return ("READ_DMA48"); + case 0x26: return ("READ_DMA_QUEUED48"); + case 0x27: return ("READ_NATIVE_MAX_ADDRESS48"); + case 0x29: return ("READ_MUL48"); + case 0x2a: return ("READ_STREAM_DMA48"); + case 0x2b: return ("READ_STREAM48"); + case 0x2f: return ("READ_LOG_EXT"); + case 0x30: return ("WRITE"); + case 0x34: return ("WRITE48"); + case 0x35: return ("WRITE_DMA48"); + case 0x36: return ("WRITE_DMA_QUEUED48"); + case 0x37: return ("SET_MAX_ADDRESS48"); + case 0x39: return ("WRITE_MUL48"); + case 0x3a: return ("WRITE_STREAM_DMA48"); + case 0x3b: return ("WRITE_STREAM48"); + case 0x3d: return ("WRITE_DMA_FUA"); + case 0x3e: return ("WRITE_DMA_FUA48"); + case 0x3f: return ("WRITE_LOG_EXT"); + case 0x40: return ("READ_VERIFY"); + case 0x42: return ("READ_VERIFY48"); + case 0x51: return ("CONFIGURE_STREAM"); + case 0x60: return ("READ_FPDMA_QUEUED"); + case 0x61: return ("WRITE_FPDMA_QUEUED"); + case 0x70: return ("SEEK"); + case 0x87: return ("CFA_TRANSLATE_SECTOR"); + case 0x90: return ("EXECUTE_DEVICE_DIAGNOSTIC"); + case 0x92: return ("DOWNLOAD_MICROCODE"); + case 0xa0: return ("PACKET"); + case 0xa1: return ("ATAPI_IDENTIFY"); + case 0xa2: return ("SERVICE"); + case 0xb0: return ("SMART"); + case 0xb1: return ("DEVICE CONFIGURATION"); + case 0xc0: return ("CFA_ERASE"); + case 0xc4: return ("READ_MUL"); + case 0xc5: return ("WRITE_MUL"); + case 0xc6: return ("SET_MULTI"); + case 0xc7: return ("READ_DMA_QUEUED"); + case 0xc8: return ("READ_DMA"); + case 0xca: return ("WRITE_DMA"); + case 0xcc: return ("WRITE_DMA_QUEUED"); + case 0xcd: return ("CFA_WRITE_MULTIPLE_WITHOUT_ERASE"); + case 0xce: return ("WRITE_MULTIPLE_FUA48"); + case 0xd1: return ("CHECK_MEDIA_CARD_TYPE"); + case 0xda: return ("GET_MEDIA_STATUS"); + case 0xde: return ("MEDIA_LOCK"); + case 0xdf: return ("MEDIA_UNLOCK"); + case 0xe0: return ("STANDBY_IMMEDIATE"); + case 0xe1: return ("IDLE_IMMEDIATE"); + case 0xe2: return ("STANDBY"); + case 0xe3: return ("IDLE"); + case 0xe4: return ("READ_BUFFER/PM"); + case 0xe5: return ("CHECK_POWER_MODE"); + case 0xe6: return ("SLEEP"); + case 0xe7: return ("FLUSHCACHE"); + case 0xe8: return ("WRITE_PM"); + case 0xea: return ("FLUSHCACHE48"); + case 0xec: return ("ATA_IDENTIFY"); + case 0xed: return ("MEDIA_EJECT"); + case 0xef: + switch (cmd->features) { + case 0x03: return ("SETFEATURES SET TRANSFER MODE"); + case 0x02: return ("SETFEATURES ENABLE WCACHE"); + case 0x82: return ("SETFEATURES DISABLE WCACHE"); + case 0xaa: return ("SETFEATURES ENABLE RCACHE"); + case 0x55: return ("SETFEATURES DISABLE RCACHE"); + } + return "SETFEATURES"; + case 0xf1: return ("SECURITY_SET_PASSWORD"); + case 0xf2: return ("SECURITY_UNLOCK"); + case 0xf3: return ("SECURITY_ERASE_PREPARE"); + case 0xf4: return ("SECURITY_ERASE_UNIT"); + case 0xf5: return ("SECURITY_FREE_LOCK"); + case 0xf6: return ("SECURITY DISABLE PASSWORD"); + case 0xf8: return ("READ_NATIVE_MAX_ADDRESS"); + case 0xf9: return ("SET_MAX_ADDRESS"); + } + return "UNKNOWN"; +} + +char * +ata_cmd_string(struct ata_cmd *cmd, char *cmd_string, size_t len) +{ + + snprintf(cmd_string, len, "%02x %02x %02x %02x " + "%02x %02x %02x %02x %02x %02x %02x %02x", + cmd->command, cmd->features, + cmd->lba_low, cmd->lba_mid, cmd->lba_high, cmd->device, + cmd->lba_low_exp, cmd->lba_mid_exp, cmd->lba_high_exp, + cmd->features_exp, cmd->sector_count, cmd->sector_count_exp); + + return(cmd_string); +} + +char * +ata_res_string(struct ata_res *res, char *res_string, size_t len) +{ + + snprintf(res_string, len, "%02x %02x %02x %02x " + "%02x %02x %02x %02x %02x %02x %02x", + res->status, res->error, + res->lba_low, res->lba_mid, res->lba_high, res->device, + res->lba_low_exp, res->lba_mid_exp, res->lba_high_exp, + res->sector_count, res->sector_count_exp); + + return(res_string); +} + +/* + * ata_command_sbuf() returns 0 for success and -1 for failure. + */ +int +ata_command_sbuf(struct ccb_ataio *ataio, struct sbuf *sb) +{ + char cmd_str[(12 * 3) + 1]; + + sbuf_printf(sb, "CMD: %s: %s", + ata_op_string(&ataio->cmd), + ata_cmd_string(&ataio->cmd, cmd_str, sizeof(cmd_str))); + + return(0); +} + +/* + * ata_status_abuf() returns 0 for success and -1 for failure. + */ +int +ata_status_sbuf(struct ccb_ataio *ataio, struct sbuf *sb) +{ + + sbuf_printf(sb, "ATA Status: %02x (%s%s%s%s%s%s%s%s)", + ataio->res.status, + (ataio->res.status & 0x80) ? "BSY " : "", + (ataio->res.status & 0x40) ? "DRDY " : "", + (ataio->res.status & 0x20) ? "DF " : "", + (ataio->res.status & 0x10) ? "SERV " : "", + (ataio->res.status & 0x08) ? "DRQ " : "", + (ataio->res.status & 0x04) ? "CORR " : "", + (ataio->res.status & 0x02) ? "IDX " : "", + (ataio->res.status & 0x01) ? "ERR" : ""); + if (ataio->res.status & 1) { + sbuf_printf(sb, ", Error: %02x (%s%s%s%s%s%s%s%s)", + ataio->res.error, + (ataio->res.error & 0x80) ? "ICRC " : "", + (ataio->res.error & 0x40) ? "UNC " : "", + (ataio->res.error & 0x20) ? "MC " : "", + (ataio->res.error & 0x10) ? "IDNF " : "", + (ataio->res.error & 0x08) ? "MCR " : "", + (ataio->res.error & 0x04) ? "ABRT " : "", + (ataio->res.error & 0x02) ? "NM " : "", + (ataio->res.error & 0x01) ? "ILI" : ""); + } + + return(0); +} + +/* + * ata_res_sbuf() returns 0 for success and -1 for failure. + */ +int +ata_res_sbuf(struct ccb_ataio *ataio, struct sbuf *sb) +{ + char res_str[(11 * 3) + 1]; + + sbuf_printf(sb, "RES: %s", + ata_res_string(&ataio->res, res_str, sizeof(res_str))); + + return(0); +} + void ata_print_ident(struct ata_params *ident_data) { ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#16 (text+ko) ==== @@ -82,6 +82,14 @@ }; int ata_version(int ver); + +char * ata_op_string(struct ata_cmd *cmd); +char * ata_cmd_string(struct ata_cmd *cmd, char *cmd_string, size_t len); +char * ata_res_string(struct ata_res *res, char *res_string, size_t len); +int ata_command_sbuf(struct ccb_ataio *ataio, struct sbuf *sb); +int ata_status_sbuf(struct ccb_ataio *ataio, struct sbuf *sb); +int ata_res_sbuf(struct ccb_ataio *ataio, struct sbuf *sb); + void ata_print_ident(struct ata_params *ident_data); void ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features, ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#10 (text+ko) ==== @@ -229,6 +229,21 @@ return(NULL); switch (ccb->ccb_h.func_code) { + case XPT_ATA_IO: + switch (proto_flags & CAM_EPF_LEVEL_MASK) { + case CAM_EPF_NONE: + break; + case CAM_EPF_ALL: + case CAM_EPF_NORMAL: + proto_flags |= CAM_EAF_PRINT_RESULT; + /* FALLTHROUGH */ + case CAM_EPF_MINIMAL: + proto_flags |= CAM_EAF_PRINT_STATUS; + /* FALLTHROUGH */ + default: + break; + } + break; case XPT_SCSI_IO: switch (proto_flags & CAM_EPF_LEVEL_MASK) { case CAM_EPF_NONE: @@ -256,10 +271,12 @@ sbuf_new(&sb, str, str_len, 0); if (flags & CAM_ESF_COMMAND) { - sbuf_cat(&sb, path_str); - switch (ccb->ccb_h.func_code) { + case XPT_ATA_IO: + ata_command_sbuf(&ccb->ataio, &sb); + sbuf_printf(&sb, "\n"); + break; case XPT_SCSI_IO: #ifdef _KERNEL scsi_command_string(&ccb->csio, &sb); @@ -267,7 +284,6 @@ scsi_command_string(device, &ccb->csio, &sb); #endif /* _KERNEL/!_KERNEL */ sbuf_printf(&sb, "\n"); - break; default: break; @@ -295,6 +311,22 @@ if (flags & CAM_ESF_PROTO_STATUS) { switch (ccb->ccb_h.func_code) { + case XPT_ATA_IO: + if ((ccb->ccb_h.status & CAM_STATUS_MASK) != + CAM_ATA_STATUS_ERROR) + break; + if (proto_flags & CAM_EAF_PRINT_STATUS) { + sbuf_cat(&sb, path_str); + ata_status_sbuf(&ccb->ataio, &sb); + sbuf_printf(&sb, "\n"); + } + if (proto_flags & CAM_EAF_PRINT_RESULT) { + sbuf_cat(&sb, path_str); + ata_res_sbuf(&ccb->ataio, &sb); + sbuf_printf(&sb, "\n"); + } + + break; case XPT_SCSI_IO: if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_SCSI_STATUS_ERROR) @@ -302,10 +334,6 @@ if (proto_flags & CAM_ESF_PRINT_STATUS) { sbuf_cat(&sb, path_str); - /* - * Print out the SCSI status byte as long as - * the user wants some protocol output. - */ sbuf_printf(&sb, "SCSI Status: %s\n", scsi_status_string(&ccb->csio)); } ==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#10 (text+ko) ==== @@ -186,6 +186,12 @@ CAM_ESF_PRINT_SENSE = 0x20 } cam_error_scsi_flags; +typedef enum { + CAM_EAF_PRINT_NONE = 0x00, + CAM_EAF_PRINT_STATUS = 0x10, + CAM_EAF_PRINT_RESULT = 0x20 +} cam_error_ata_flags; + struct cam_status_entry { cam_status status_code; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#38 (text+ko) ==== @@ -1612,6 +1612,7 @@ if (bootverbose && printed == 0) { xpt_print(ccb->ccb_h.path, "Request completed with CAM_ATA_STATUS_ERROR\n"); + cam_error_print(ccb, CAM_ESF_ALL, CAM_EPF_ALL); printed++; } /* FALLTHROUGH */ From mav at FreeBSD.org Mon Nov 2 17:41:23 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Mon Nov 2 17:41:29 2009 Subject: PERFORCE change 170086 for review Message-ID: <200911021741.nA2HfM5b083565@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170086 Change 170086 by mav@mav_mavtest on 2009/11/02 17:41:17 Do not treat soft-reset timeout as fatal error. Let XPT handle it. Workaround ATI bug. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#73 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#73 (text+ko) ==== @@ -1221,6 +1221,13 @@ et = AHCI_ERR_TFE; break; } + /* Workaround for ATI SB600/SB700 chipsets. */ + if (ccb->ccb_h.target_id == 15 && + pci_get_vendor(device_get_parent(dev)) == 0x1002 && + (ATA_INL(ch->r_mem, AHCI_P_IS) & AHCI_P_IX_IPM)) { + et = AHCI_ERR_TIMEOUT; + break; + } } if (timeout && (count >= timeout)) { device_printf(ch->dev, @@ -1383,7 +1390,10 @@ ccb->ccb_h.status |= CAM_UNCOR_PARITY; break; case AHCI_ERR_TIMEOUT: - ch->fatalerr = 1; + /* Do no treat soft-reset timeout as fatal here. */ + if (ccb->ccb_h.func_code != XPT_ATA_IO || + !(ccb->ataio.cmd.flags & CAM_ATAIO_CONTROL)) + ch->fatalerr = 1; if (!ch->readlog) { xpt_freeze_simq(ch->sim, 1); ccb->ccb_h.status &= ~CAM_STATUS_MASK; From mav at FreeBSD.org Mon Nov 2 19:21:04 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Mon Nov 2 19:21:12 2009 Subject: PERFORCE change 170094 for review Message-ID: <200911021921.nA2JL3Pu093005@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170094 Change 170094 by mav@mav_mavbook on 2009/11/02 19:20:11 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/jail#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/accept.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/tty.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/ar.5#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/make.conf.5#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/msdosfs.5#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/adding_user.7#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#117 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_windrv.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_hal.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ndis.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_pe.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/compat/ndis/subr_usbd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-nvidia.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/usb_serial.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_compat_linux.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_map.c#25 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tail/tail.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/wake/wake.8#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/getfacl/getfacl.1#3 (text+ko) ==== @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd September 04, 2009 +.Dd September 4, 2009 .Dt GETFACL 1 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/etc/rc.d/jail#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.43 2009/06/10 18:18:14 ed Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.44 2009/11/02 09:56:46 remko Exp $ # # PROVIDE: jail @@ -728,4 +728,4 @@ if [ -n "$*" ]; then jail_list="$*" fi -run_rc_command "${cmd}" +run_rc_command "${cmd}" & ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2 2008/07/28 09:36:56 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2 2008/07/28 09:36:56 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getflags.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETFLAGS 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETPGROUP 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSIGMASK 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/gen/posix_spawnattr_init.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_INIT 3 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/lib/libc/sys/accept.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.33 2008/06/20 14:47:06 phk Exp $ +.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.34 2009/11/02 07:21:13 cperciva Exp $ .\" .Dd December 11, 1993 .Dt ACCEPT 2 @@ -126,6 +126,10 @@ For some applications, performance may be enhanced by using an .Xr accept_filter 9 to pre-process incoming connections. +.Pp +Portable programs should not rely on the +.Dv O_NONBLOCK +property being inherited. .Sh RETURN VALUES The call returns \-1 on error. If it succeeds, it returns a non-negative ==== //depot/projects/scottl-camlock/src/lib/libpmc/pmc_attach.3#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.1 2007/11/25 06:38:55 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd November 25 2007 +.Dd November 25, 2007 .Os .Dt PMC_ATTACH 3 .Sh NAME ==== //depot/projects/scottl-camlock/src/sbin/mknod/mknod.8#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mknod.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.32 2009/10/31 12:22:23 brueffer Exp $ +.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.33 2009/11/01 18:25:11 brueffer Exp $ .\" .Dd October 31, 2009 .Dt MKNOD 8 @@ -74,7 +74,6 @@ .It Ar major The major device number is an integer number which tells the kernel which device driver entry point to use. -This is a compatibility shim and should be left zero. .It Ar minor The minor device number tells the kernel which subunit the node corresponds to on the device; for example, ==== //depot/projects/scottl-camlock/src/share/man/man4/tty.4#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)tty.4 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/share/man/man4/tty.4,v 1.23 2007/06/27 15:14:06 remko Exp $ +.\" $FreeBSD: src/share/man/man4/tty.4,v 1.24 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Jun 27, 2007 +.Dd June 27, 2007 .Dt TTY 4 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/share/man/man5/ar.5#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/share/man/man5/ar.5,v 1.1 2007/09/08 08:04:28 jkoshy Exp $ +.\" $FreeBSD: src/share/man/man5/ar.5,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd September 07, 2007 +.Dd September 7, 2007 .Os .Dt AR 5 .Sh NAME ==== //depot/projects/scottl-camlock/src/share/man/man5/make.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/make.conf.5,v 1.141 2009/09/01 05:55:10 maxim Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.142 2009/11/02 12:03:04 remko Exp $ .\" .Dd September 1, 2009 .Dt MAKE.CONF 5 @@ -318,6 +318,14 @@ .Xr cvsup 1 to update your ports with .Dq Li "make update" . +.It Va WWWSUPFILE +.Pq Vt str +The www +.Ar supfile +to use when doing a +.Dq Li "make update" +This defaults to +.Pa /usr/share/examples/cvsup/www\-supfile . .El .Ss "BUILDING THE KERNEL" The following list provides a name and short description for variables ==== //depot/projects/scottl-camlock/src/share/man/man5/msdosfs.5#3 (text+ko) ==== @@ -1,8 +1,8 @@ -.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.6 2007/08/22 18:04:08 gabor Exp $ +.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.7 2009/11/02 12:35:38 brueffer Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd Aug 22, 2007 +.Dd August 22, 2007 .Dt MSDOSFS 5 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/share/man/man7/adding_user.7#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)adduser.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/adding_user.7,v 1.1 2009/01/30 15:14:58 gabor Exp $ +.\" $FreeBSD: src/share/man/man7/adding_user.7,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Jan 30, 2009 +.Dd January 30, 2009 .Dt ADDING_USER 8 .Os .Sh NAME ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#117 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.231 2009/11/01 11:31:06 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.232 2009/11/02 08:31:00 mav Exp $"); #include #include @@ -4022,13 +4022,19 @@ && path->device->lun_id != CAM_LUN_WILDCARD && device->lun_id != CAM_LUN_WILDCARD) continue; - + /* + * The async callback could free the device. + * If it is a broadcast async, it doesn't hold + * device reference, so take our own reference. + */ + xpt_acquire_device(device); (*(bus->xport->async))(async_code, bus, target, device, async_arg); xpt_async_bcast(&device->asyncs, async_code, path, async_arg); + xpt_release_device(device); } } ==== //depot/projects/scottl-camlock/src/sys/compat/ndis/kern_ndis.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.105 2009/06/23 02:19:59 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.107 2009/11/02 18:51:24 rpaulo Exp $"); #include #include @@ -184,7 +184,7 @@ break; } - return(error); + return (error); } DEV_MODULE(ndisapi, ndis_modevent, NULL); MODULE_VERSION(ndisapi, 1); @@ -193,7 +193,6 @@ ndis_sendrsrcavail_func(adapter) ndis_handle adapter; { - return; } static void @@ -211,8 +210,7 @@ sc = device_get_softc(block->nmb_physdeviceobj->do_devext); ifp = sc->ifp; if (ifp->if_flags & IFF_DEBUG) - device_printf (sc->ndis_dev, "status: %x\n", status); - return; + device_printf(sc->ndis_dev, "status: %x\n", status); } static void @@ -227,8 +225,7 @@ sc = device_get_softc(block->nmb_physdeviceobj->do_devext); ifp = sc->ifp; if (ifp->if_flags & IFF_DEBUG) - device_printf (sc->ndis_dev, "status complete\n"); - return; + device_printf(sc->ndis_dev, "status complete\n"); } static void @@ -241,7 +238,6 @@ block->nmb_setstat = status; KeSetEvent(&block->nmb_setevent, IO_NO_INCREMENT, FALSE); - return; } static void @@ -254,7 +250,6 @@ block->nmb_getstat = status; KeSetEvent(&block->nmb_getevent, IO_NO_INCREMENT, FALSE); - return; } static void @@ -270,10 +265,8 @@ ifp = sc->ifp; if (ifp->if_flags & IFF_DEBUG) - device_printf (sc->ndis_dev, "reset done...\n"); + device_printf(sc->ndis_dev, "reset done...\n"); KeSetEvent(&block->nmb_resetevent, IO_NO_INCREMENT, FALSE); - - return; } int @@ -287,7 +280,7 @@ struct sysctl_ctx_entry *e; if (arg == NULL) - return(EINVAL); + return (EINVAL); sc = arg; vals = sc->ndis_regvals; @@ -367,7 +360,7 @@ "Interrupt Number", buf, CTLFLAG_RD); } - return(0); + return (0); } int @@ -388,7 +381,7 @@ if (cfg == NULL) { printf("failed for %s\n", key); - return(ENOMEM); + return (ENOMEM); } cfg->ndis_cfg.nc_cfgkey = strdup(key, M_DEVBUF); @@ -415,7 +408,7 @@ cfg->ndis_cfg.nc_cfgdesc); #endif - return(0); + return (0); } /* @@ -451,7 +444,7 @@ free(cfg, M_DEVBUF); } - return(0); + return (0); } static void @@ -488,8 +481,6 @@ KeAcquireSpinLock(&block->nmb_returnlock, &irql); } KeReleaseSpinLock(&block->nmb_returnlock, irql); - - return; } void @@ -522,8 +513,6 @@ IoQueueWorkItem(block->nmb_returnitem, (io_workitem_func)kernndis_functbl[7].ipt_wrap, WORKQUEUE_CRITICAL, block); - - return; } void @@ -540,8 +529,6 @@ IoFreeMdl(b0); b0 = next; } - - return; } void @@ -553,7 +540,6 @@ ndis_free_bufs(p->np_private.npp_head); NdisFreePacket(p); - return; } int @@ -567,26 +553,18 @@ device_t dev; struct resource_list *brl; struct resource_list_entry *brle; -#if __FreeBSD_version < 600022 - struct resource_list brl_rev; - struct resource_list_entry *n; -#endif int error = 0; sc = arg; block = sc->ndis_block; dev = sc->ndis_dev; -#if __FreeBSD_version < 600022 - SLIST_INIT(&brl_rev); -#endif - rl = malloc(sizeof(ndis_resource_list) + (sizeof(cm_partial_resource_desc) * (sc->ndis_rescnt - 1)), M_DEVBUF, M_NOWAIT|M_ZERO); if (rl == NULL) - return(ENOMEM); + return (ENOMEM); rl->cprl_version = 5; rl->cprl_version = 1; @@ -597,37 +575,7 @@ if (brl != NULL) { -#if __FreeBSD_version < 600022 - /* - * We have a small problem. Some PCI devices have - * multiple I/O ranges. Windows orders them starting - * from lowest numbered BAR to highest. We discover - * them in that order too, but insert them into a singly - * linked list head first, which means when time comes - * to traverse the list, we enumerate them in reverse - * order. This screws up some drivers which expect the - * BARs to be in ascending order so that they can choose - * the "first" one as their register space. Unfortunately, - * in order to fix this, we have to create our own - * temporary list with the entries in reverse order. - */ - - SLIST_FOREACH(brle, brl, link) { - n = malloc(sizeof(struct resource_list_entry), - M_TEMP, M_NOWAIT); - if (n == NULL) { - error = ENOMEM; - goto bad; - } - bcopy((char *)brle, (char *)n, - sizeof(struct resource_list_entry)); - SLIST_INSERT_HEAD(&brl_rev, n, link); - } - - SLIST_FOREACH(brle, &brl_rev, link) { -#else STAILQ_FOREACH(brle, brl, link) { -#endif switch (brle->type) { case SYS_RES_IOPORT: prd->cprd_type = CmResourceTypePort; @@ -671,17 +619,7 @@ block->nmb_rlist = rl; -#if __FreeBSD_version < 600022 -bad: - - while (!SLIST_EMPTY(&brl_rev)) { - n = SLIST_FIRST(&brl_rev); - SLIST_REMOVE_HEAD(&brl_rev, link); - free (n, M_TEMP); - } -#endif - - return(error); + return (error); } /* @@ -711,7 +649,7 @@ int diff; if (p == NULL || m0 == NULL) - return(EINVAL); + return (EINVAL); priv = &p->np_private; buf = priv->npp_head; @@ -729,7 +667,7 @@ if (m == NULL) { m_freem(*m0); *m0 = NULL; - return(ENOBUFS); + return (ENOBUFS); } m->m_len = MmGetMdlByteCount(buf); m->m_data = MmGetMdlVirtualAddress(buf); @@ -765,7 +703,7 @@ } (*m0)->m_pkthdr.len = totlen; - return(0); + return (0); } /* @@ -793,7 +731,7 @@ ndis_packet_private *priv; if (p == NULL || *p == NULL || m0 == NULL) - return(EINVAL); + return (EINVAL); priv = &(*p)->np_private; priv->npp_totlen = m0->m_pkthdr.len; @@ -805,7 +743,7 @@ if (buf == NULL) { ndis_free_packet(*p); *p = NULL; - return(ENOMEM); + return (ENOMEM); } MmBuildMdlForNonPagedPool(buf); @@ -818,7 +756,7 @@ priv->npp_tail = buf; - return(0); + return (0); } int @@ -831,25 +769,25 @@ ndis_oid *o; if (arg == NULL || oids == NULL || oidcnt == NULL) - return(EINVAL); + return (EINVAL); len = 0; ndis_get_info(arg, OID_GEN_SUPPORTED_LIST, NULL, &len); o = malloc(len, M_DEVBUF, M_NOWAIT); if (o == NULL) - return(ENOMEM); + return (ENOMEM); rval = ndis_get_info(arg, OID_GEN_SUPPORTED_LIST, o, &len); if (rval) { free(o, M_DEVBUF); - return(rval); + return (rval); } *oids = o; *oidcnt = len / 4; - return(0); + return (0); } int @@ -893,7 +831,7 @@ sc->ndis_block->nmb_devicectx == NULL) { sc->ndis_block->nmb_pendingreq = NULL; KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); - return(ENXIO); + return (ENXIO); } rval = MSCALL6(setfunc, adapter, oid, buf, *buflen, @@ -917,19 +855,19 @@ *buflen = bytesneeded; if (rval == NDIS_STATUS_INVALID_LENGTH) - return(ENOSPC); + return (ENOSPC); if (rval == NDIS_STATUS_INVALID_OID) - return(EINVAL); + return (EINVAL); if (rval == NDIS_STATUS_NOT_SUPPORTED || rval == NDIS_STATUS_NOT_ACCEPTED) - return(ENOTSUP); + return (ENOTSUP); if (rval != NDIS_STATUS_SUCCESS) - return(ENODEV); + return (ENODEV); - return(0); + return (0); } typedef void (*ndis_senddone_func)(ndis_handle, ndis_packet *, ndis_status); @@ -951,7 +889,7 @@ sc = arg; adapter = sc->ndis_block->nmb_miniportadapterctx; if (adapter == NULL) - return(ENXIO); + return (ENXIO); sendfunc = sc->ndis_chars->nmc_sendmulti_func; senddonefunc = sc->ndis_block->nmb_senddone_func; @@ -976,7 +914,7 @@ if (NDIS_SERIALIZED(sc->ndis_block)) KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); - return(0); + return (0); } int @@ -994,7 +932,7 @@ sc = arg; adapter = sc->ndis_block->nmb_miniportadapterctx; if (adapter == NULL) - return(ENXIO); + return (ENXIO); sendfunc = sc->ndis_chars->nmc_sendsingle_func; senddonefunc = sc->ndis_block->nmb_senddone_func; @@ -1006,7 +944,7 @@ if (status == NDIS_STATUS_PENDING) { if (NDIS_SERIALIZED(sc->ndis_block)) KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); - return(0); + return (0); } MSCALL3(senddonefunc, sc->ndis_block, packet, status); @@ -1014,7 +952,7 @@ if (NDIS_SERIALIZED(sc->ndis_block)) KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); - return(0); + return (0); } int @@ -1030,18 +968,18 @@ M_DEVBUF, M_NOWAIT|M_ZERO); if (sc->ndis_tmaps == NULL) - return(ENOMEM); + return (ENOMEM); for (i = 0; i < sc->ndis_maxpkts; i++) { error = bus_dmamap_create(sc->ndis_ttag, 0, &sc->ndis_tmaps[i]); if (error) { free(sc->ndis_tmaps, M_DEVBUF); - return(ENODEV); + return (ENODEV); } } - return(0); + return (0); } int @@ -1070,7 +1008,7 @@ bus_dma_tag_destroy(sc->ndis_ttag); - return(0); + return (0); } int @@ -1093,7 +1031,7 @@ if (adapter == NULL || resetfunc == NULL || sc->ndis_block->nmb_devicectx == NULL) { NDIS_UNLOCK(sc); - return(EIO); + return (EIO); } NDIS_UNLOCK(sc); @@ -1112,7 +1050,7 @@ KeWaitForSingleObject(&sc->ndis_block->nmb_resetevent, 0, 0, FALSE, NULL); - return(0); + return (0); } int @@ -1149,7 +1087,7 @@ adapter = sc->ndis_block->nmb_miniportadapterctx; if (adapter == NULL) { NDIS_UNLOCK(sc); - return(EIO); + return (EIO); } sc->ndis_block->nmb_devicectx = NULL; @@ -1169,7 +1107,7 @@ sc->ndis_block->nmb_miniportadapterctx = NULL; NDIS_UNLOCK(sc); - return(0); + return (0); } int @@ -1186,7 +1124,7 @@ shutdownfunc = sc->ndis_chars->nmc_shutdown_handler; NDIS_UNLOCK(sc); if (adapter == NULL || shutdownfunc == NULL) - return(EIO); + return (EIO); if (sc->ndis_chars->nmc_rsvd0 == NULL) MSCALL1(shutdownfunc, adapter); @@ -1195,7 +1133,7 @@ TAILQ_REMOVE(&ndis_devhead, sc->ndis_block, link); - return(0); + return (0); } int @@ -1215,7 +1153,7 @@ pnpeventfunc = sc->ndis_chars->nmc_pnpevent_handler; NDIS_UNLOCK(sc); if (adapter == NULL || pnpeventfunc == NULL) - return(EIO); + return (EIO); if (sc->ndis_chars->nmc_rsvd0 == NULL) MSCALL4(pnpeventfunc, adapter, type, NULL, 0); @@ -1237,7 +1175,7 @@ uint32_t chosenmedium, i; if (arg == NULL) - return(EINVAL); + return (EINVAL); sc = arg; NDIS_LOCK(sc); @@ -1262,7 +1200,7 @@ NDIS_LOCK(sc); sc->ndis_block->nmb_miniportadapterctx = NULL; NDIS_UNLOCK(sc); - return(ENXIO); + return (ENXIO); } /* @@ -1281,7 +1219,7 @@ sc->ndis_block->nmb_devicectx = sc; NDIS_UNLOCK(sc); - return(0); + return (0); } static void @@ -1305,8 +1243,6 @@ if (KeInsertQueueDpc(&intr->ni_dpc, NULL, NULL) == TRUE) intr->ni_dpccnt++; KeReleaseSpinLockFromDpcLevel(&intr->ni_dpccountlock); - - return; } int @@ -1343,7 +1279,7 @@ sc->ndis_block->nmb_devicectx == NULL) { sc->ndis_block->nmb_pendingreq = NULL; KeReleaseSpinLock(&sc->ndis_block->nmb_lock, irql); - return(ENXIO); + return (ENXIO); } rval = MSCALL6(queryfunc, adapter, oid, buf, *buflen, @@ -1370,19 +1306,19 @@ if (rval == NDIS_STATUS_INVALID_LENGTH || rval == NDIS_STATUS_BUFFER_TOO_SHORT) - return(ENOSPC); + return (ENOSPC); if (rval == NDIS_STATUS_INVALID_OID) - return(EINVAL); + return (EINVAL); if (rval == NDIS_STATUS_NOT_SUPPORTED || rval == NDIS_STATUS_NOT_ACCEPTED) - return(ENOTSUP); + return (ENOTSUP); if (rval != NDIS_STATUS_SUCCESS) - return(ENODEV); + return (ENODEV); - return(0); + return (0); } uint32_t @@ -1403,14 +1339,14 @@ INTR_TYPE_NET | INTR_MPSAFE, NULL, ntoskrnl_intr, NULL, &sc->ndis_intrhand); if (error) - return(NDIS_STATUS_FAILURE); + return (NDIS_STATUS_FAILURE); } status = IoCreateDevice(drv, sizeof(ndis_miniport_block), NULL, FILE_DEVICE_UNKNOWN, 0, FALSE, &fdo); if (status != STATUS_SUCCESS) - return(status); + return (status); >>> TRUNCATED FOR MAIL (1000 lines) <<< From hselasky at FreeBSD.org Tue Nov 3 10:59:43 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Nov 3 10:59:48 2009 Subject: PERFORCE change 170109 for review Message-ID: <200911031059.nA3AxgVB018279@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170109 Change 170109 by hselasky@hselasky_laptop001 on 2009/11/03 10:59:39 USB controller: - ehci_init() will do reset and set the usbrev flag. - fix problem where ehci_reset() was called before ehci_init(). - patch from: Sebastian Huber PR: usb/140242 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#11 (text+ko) ==== @@ -157,8 +157,6 @@ return (ENOMEM); } - sc->sc_bus.usbrev = USB_REV_2_0; - /* NB: hints fix the memory location and irq */ rid = 0; @@ -230,7 +228,6 @@ | EHCI_SCFLG_BIGEMMIO | EHCI_SCFLG_NORESTERM ; - (void) ehci_reset(sc); err = ehci_init(sc); if (!err) { ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#10 (text+ko) ==== @@ -166,8 +166,6 @@ return (ENOMEM); } - sc->sc_bus.usbrev = USB_REV_2_0; - rid = 0; sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (!sc->sc_io_res) { ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#17 (text+ko) ==== @@ -318,13 +318,11 @@ device_printf(self, "pre-2.0 USB revision (ignored)\n"); /* fallthrough */ case PCI_USB_REV_2_0: - sc->sc_bus.usbrev = USB_REV_2_0; break; default: /* Quirk for Parallels Desktop 4.0 */ device_printf(self, "USB revision is unknown. Assuming v2.0.\n"); - sc->sc_bus.usbrev = USB_REV_2_0; - break; + break; } rid = PCI_CBMEM; From hselasky at FreeBSD.org Tue Nov 3 12:32:15 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Nov 3 12:32:21 2009 Subject: PERFORCE change 170113 for review Message-ID: <200911031232.nA3CWFqn027127@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170113 Change 170113 by hselasky@hselasky_laptop001 on 2009/11/03 12:31:28 USB mass storage: - add missing mtx_destroy(). - patch from Sebastian Huber Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#37 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#37 (text+ko) ==== @@ -1671,6 +1671,7 @@ #if (__FreeBSD_version >= 700037) mtx_unlock(&sc->sc_mtx); #endif + mtx_destroy(&sc->sc_mtx); return (0); /* success */ } From mav at FreeBSD.org Tue Nov 3 12:33:17 2009 From: mav at FreeBSD.org (Alexander Motin) Date: Tue Nov 3 12:33:25 2009 Subject: PERFORCE change 170114 for review Message-ID: <200911031233.nA3CXGV5027229@repoman.freebsd.org> http://p4web.freebsd.org/chv.cgi?CH=170114 Change 170114 by mav@mav_mavbook on 2009/11/03 12:32:27 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/ps/keyword.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ddb/ddb_capture.c#3 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#9 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/europe#5 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#50 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#74 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/leave/leave.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.sh#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/dump.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/zic/zdump.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/zic/zic.8#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/ps/keyword.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $"); #include #include @@ -70,7 +70,7 @@ /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ static VAR var[] = { - {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0}, + {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0}, {"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT, "x", 0}, @@ -159,7 +159,7 @@ UINT, UIDFMT, 0}, {"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname, USERLEN, 0, CHAR, NULL, 0}, - {"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0}, + {"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0}, {"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR, NULL, 0}, {"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid), @@ -207,7 +207,7 @@ NULL, 0}, {"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0}, + {"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0}, {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0}, {"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT, "x", 0}, ==== //depot/projects/scottl-camlock/src/sbin/ddb/ddb_capture.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.2 2009/10/29 13:44:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.3 2009/11/02 20:18:50 jhb Exp $"); #include #include @@ -204,6 +204,7 @@ mflag = NULL; nflag = NULL; + kvm = NULL; while ((ch = getopt(argc, argv, "M:N:")) != -1) { switch (ch) { case 'M': ==== //depot/projects/scottl-camlock/src/share/zoneinfo/asia#9 (text+ko) ==== @@ -1,5 +1,4 @@ -# 
-# @(#)asia	8.42
+# @(#)asia	8.44
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -369,14 +368,84 @@
 			5:00	-	KAST	1980 May
 			8:00	PRC	C%sT
 
+
+# From Lee Yiu Chung (2009-10-24):
+# I found there are some mistakes for the historial DST rule for Hong
+# Kong. Accoring to the DST record from Hong Kong Observatory (actually,
+# it is not [an] observatory, but the official meteorological agency of HK,
+# and also serves as the official timing agency), there are some missing
+# and incorrect rules. Although the exact switch over time is missing, I
+# think 3:30 is correct. The official DST record for Hong Kong can be
+# obtained from
+# 
+# http://www.hko.gov.hk/gts/time/Summertime.htm
+# .
+
+# From Arthur David Olson (2009-10-28):
+# Here are the dates given at
+# 
+# http://www.hko.gov.hk/gts/time/Summertime.htm
+# 
+# as of 2009-10-28:
+# Year        Period
+# 1941        1 Apr to 30 Sep
+# 1942        Whole year 
+# 1943        Whole year
+# 1944        Whole year
+# 1945        Whole year
+# 1946        20 Apr to 1 Dec
+# 1947        13 Apr to 30 Dec
+# 1948        2 May to 31 Oct
+# 1949        3 Apr to 30 Oct
+# 1950        2 Apr to 29 Oct
+# 1951        1 Apr to 28 Oct
+# 1952        6 Apr to 25 Oct
+# 1953        5 Apr to 1 Nov
+# 1954        21 Mar to 31 Oct
+# 1955        20 Mar to 6 Nov
+# 1956        18 Mar to 4 Nov
+# 1957        24 Mar to 3 Nov
+# 1958        23 Mar to 2 Nov
+# 1959        22 Mar to 1 Nov
+# 1960        20 Mar to 6 Nov
+# 1961        19 Mar to 5 Nov
+# 1962        18 Mar to 4 Nov
+# 1963        24 Mar to 3 Nov
+# 1964        22 Mar to 1 Nov
+# 1965        18 Apr to 17 Oct
+# 1966        17 Apr to 16 Oct
+# 1967        16 Apr to 22 Oct
+# 1968        21 Apr to 20 Oct
+# 1969        20 Apr to 19 Oct
+# 1970        19 Apr to 18 Oct
+# 1971        18 Apr to 17 Oct
+# 1972        16 Apr to 22 Oct
+# 1973        22 Apr to 21 Oct
+# 1973/74     30 Dec 73 to 20 Oct 74
+# 1975        20 Apr to 19 Oct
+# 1976        18 Apr to 17 Oct
+# 1977        Nil
+# 1978        Nil
+# 1979        13 May to 21 Oct
+# 1980 to Now Nil
+# The page does not give start or end times of day.
+# The page does not give a start date for 1942.
+# The page does not givw an end date for 1945.
+# The Japanese occupation of Hong Kong began on 1941-12-25.
+# The Japanese surrender of Hong Kong was signed 1945-09-15.
+# For lack of anything better, use start of those days as the transition times.
+
 # Hong Kong (Xianggang)
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	HK	1941	only	-	Apr	1	3:30	1:00	S
+Rule	HK	1941	only	-	Sep	30	3:30	0	-
 Rule	HK	1946	only	-	Apr	20	3:30	1:00	S
 Rule	HK	1946	only	-	Dec	1	3:30	0	-
 Rule	HK	1947	only	-	Apr	13	3:30	1:00	S
 Rule	HK	1947	only	-	Dec	30	3:30	0	-
 Rule	HK	1948	only	-	May	2	3:30	1:00	S
-Rule	HK	1948	1952	-	Oct	lastSun	3:30	0	-
+Rule	HK	1948	1951	-	Oct	lastSun	3:30	0	-
+Rule	HK	1952	only	-	Oct	25	3:30	0	-
 Rule	HK	1949	1953	-	Apr	Sun>=1	3:30	1:00	S
 Rule	HK	1953	only	-	Nov	1	3:30	0	-
 Rule	HK	1954	1964	-	Mar	Sun>=18	3:30	1:00	S
@@ -384,13 +453,15 @@
 Rule	HK	1955	1964	-	Nov	Sun>=1	3:30	0	-
 Rule	HK	1965	1977	-	Apr	Sun>=16	3:30	1:00	S
 Rule	HK	1965	1977	-	Oct	Sun>=16	3:30	0	-
-Rule	HK	1979	1980	-	May	Sun>=8	3:30	1:00	S
-Rule	HK	1979	1980	-	Oct	Sun>=16	3:30	0	-
+Rule	HK	1973	only	-	Dec	30	3:30	1:00	S
+Rule	HK	1979	only	-	May	Sun>=8	3:30	1:00	S
+Rule	HK	1979	only	-	Oct	Sun>=16	3:30	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 Oct 30
+			8:00	HK	HK%sT	1941 Dec 25
+			9:00	-	JST	1945 Sep 15
 			8:00	HK	HK%sT
 
-
 ###############################################################################
 
 # Taiwan
@@ -2236,9 +2307,23 @@
 # http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
 # 
 
+# From Steffen Thorsen (2009-10-27):
+# The Syrian Arab News Network on 2009-09-29 reported that Syria will 
+# revert back to winter (standard) time on midnight between Thursday 
+# 2009-10-29 and Friday 2009-10-30:
+# 
+# http://www.sana.sy/ara/2/2009/09/29/247012.htm (Arabic)
+# 
+
+# From Arthur David Olson (2009-10-28):
+# We'll see if future DST switching times turn out to be end of the last
+# Thursday of the month or the start of the last Friday of the month or
+# something else. For now, use the start of the last Friday.
+
 Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2008	max	-	Nov	1	0:00	0	-
+Rule	Syria	2008	only	-	Nov	1	0:00	0	-
 Rule	Syria	2009	max	-	Mar	lastFri	0:00	1:00	S
+Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq

==== //depot/projects/scottl-camlock/src/share/zoneinfo/europe#5 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)europe	8.22
+# @(#)europe	8.24
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -2072,9 +2072,43 @@
 			 6:00	Russia	NOV%sT	1992 Jan 19 2:00s
 			 7:00	Russia	NOV%sT	1993 May 23 # say Shanks & P.
 			 6:00	Russia	NOV%sT
+
+# From Alexander Krivenyshev (2009-10-13):
+# Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
+# March 28, 2010:
+# from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
+# to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
+#
+# This is according to Government of Russia decree # 740, on September
+# 14, 2009 "Application in the territory of the Kemerovo region the Fifth
+# time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
+#
+# Russian Government web site (Russian language)
+# 
+# http://www.government.ru/content/governmentactivity/rfgovernmentdecisions/archive/2009/09/14/991633.htm
+# 
+# or Russian-English translation by WorldTimeZone.com with reference
+# map to local region and new Russia Time Zone map after March 28, 2010
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_russia03.html
+# 
+#
+# Thus, when Russia will switch to DST on the night of March 28, 2010
+# Kemerovo region (Kemerovo oblast') will not change the clock.
 #
+# As a result, Kemerovo oblast' will be in the same time zone as
+# Novosibirsk, Omsk, Tomsk, Barnaul and Altai Republic.
+
+Zone Asia/Novokuznetsk	 5:48:48 -	NMT	1920 Jan  6
+			 6:00	-	KRAT	1930 Jun 21 # Krasnoyarsk Time
+			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
+
+#
 # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-# Kemerovskaya oblast', Krasnoyarskij kraj,
+# Krasnoyarskij kraj,
 # Tajmyrskij (Dolgano-Nenetskij) avtonomnyj okrug,
 # Respublika Tuva, Respublika Khakasiya, Evenkijskij avtonomnyj okrug.
 Zone Asia/Krasnoyarsk	 6:11:20 -	LMT	1920 Jan  6

==== //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # 
-# @(#)zone.tab	8.28
+# @(#)zone.tab	8.29
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
@@ -330,6 +330,7 @@
 RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
 RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
 RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 - Novokuznetsk
 RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
 RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
 RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#18 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.3 2009/09/27 20:50:54 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.4 2009/11/03 11:19:05 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#17 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.2 2009/08/30 16:31:25 mav Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.3 2009/11/03 11:19:05 mav Exp $
  */
 
 #ifndef	CAM_ATA_ALL_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#11 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.13 2009/07/10 08:18:08 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.14 2009/11/03 11:19:05 mav Exp $");
 
 #include 
 #ifdef _KERNEL

==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#11 (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.h,v 1.15 2009/10/31 10:43:38 mav Exp $
+ * $FreeBSD: src/sys/cam/cam.h,v 1.16 2009/11/03 11:19:05 mav Exp $
  */
 
 #ifndef _CAM_CAM_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#39 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.83 2009/10/23 13:39:30 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.84 2009/11/03 11:19:05 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#50 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.241 2009/10/31 10:43:38 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.242 2009/11/02 23:30:15 thompsa Exp $");
 
 #include 
 
@@ -1948,8 +1948,15 @@
 
 done:
 
-	if (error == 0)
-		dasetgeom(periph, block_len, maxsector);
+	if (error == 0) {
+		if (block_len >= MAXPHYS || block_len == 0) {
+			xpt_print(periph->path,
+			    "unsupportable block size %ju\n",
+			    (uintmax_t) block_len);
+			error = EINVAL;
+		} else
+			dasetgeom(periph, block_len, maxsector);
+	}
 
 	xpt_release_ccb(ccb);
 

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#74 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.10 2009/10/23 13:07:22 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.11 2009/11/03 11:47:07 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#26 (text+ko) ====

@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.3 2009/10/21 12:42:25 mav Exp $
+ * $FreeBSD: src/sys/dev/ahci/ahci.h,v 1.4 2009/11/03 11:47:07 mav Exp $
  */
 
 /* ATA register defines */

==== //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#16 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.37 2009/08/01 01:04:26 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.38 2009/11/02 21:22:30 mjacob Exp $");
 
 #include 
 #include 
@@ -193,6 +193,8 @@
 	isp->isp_param = &sbs->sbus_param;
 	isp->isp_osinfo.pc.ptr = &sbs->sbus_spi;
 	isp->isp_revision = 0;	/* XXX */
+	isp->isp_dev = dev;
+	isp->isp_nchan = 1;
 	ISP_SET_PC(isp, 0, role, role);
 
 	/*
@@ -316,18 +318,16 @@
 		goto bad;
 	}
 	isp_init(isp);
-	if (role != ISP_ROLE_NONE && isp->isp_state != ISP_INITSTATE) {
-		isp_uninit(isp);
-		ISP_UNLOCK(isp);
-		goto bad;
+	if (isp->isp_state == ISP_INITSTATE) {
+		isp->isp_state = ISP_RUNSTATE;
 	}
-	isp_attach(isp);
-	if (role != ISP_ROLE_NONE && isp->isp_state != ISP_RUNSTATE) {
+	ISP_UNLOCK(isp);
+	if (isp_attach(isp)) {
+		ISP_LOCK(isp);
 		isp_uninit(isp);
 		ISP_UNLOCK(isp);
 		goto bad;
 	}
-	ISP_UNLOCK(isp);
 	return (0);
 
 bad:
@@ -345,13 +345,10 @@
 	}
 
 	if (regs) {
-		(void) bus_release_resource(dev, 0, 0, regs);
+		(void) bus_release_resource(dev, SYS_RES_MEMORY, 0, regs);
 	}
 
 	if (sbs) {
-		if (sbs->sbus_isp.isp_param) {
-			free(sbs->sbus_isp.isp_param, M_DEVBUF);
-		}
 		free(sbs, M_DEVBUF);
 	}
 	return (ENXIO);
@@ -584,13 +581,6 @@
 	isp = mp->isp;
 	rq = mp->rq;
 	if (nseg) {
-		if (sizeof (bus_addr_t) > 4) {
-			if (rq->req_header.rqs_entry_type == RQSTYPE_T2RQS) {
-				rq->req_header.rqs_entry_type = RQSTYPE_T3RQS;
-			} else if (rq->req_header.rqs_entry_type == RQSTYPE_REQUEST) {
-				rq->req_header.rqs_entry_type = RQSTYPE_A64;
-			}
-		}
 		if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
 			bus_dmamap_sync(isp->isp_osinfo.dmat, PISP_PCMD(csio)->dmap, BUS_DMASYNC_PREREAD);
 			ddir = ISP_FROM_DEVICE;

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#13 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.6 2009/10/23 21:33:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.7 2009/11/03 12:03:13 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/siis/siis.h,v 1.1 2009/07/21 12:32:46 mav Exp $
+ * $FreeBSD: src/sys/dev/siis/siis.h,v 1.2 2009/11/03 12:03:13 mav Exp $
  */
 
 /* ATA register defines */

==== //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.5 2009/06/24 22:57:07 oleg Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ipfw/ip_dummynet.c,v 1.6 2009/11/03 08:41:14 oleg Exp $");
 
 #define	DUMMYNET_DEBUG
 
@@ -244,6 +244,17 @@
 static int	dummynet_io(struct mbuf **, int , struct ip_fw_args *);
 
 /*
+ * Flow queue is idle if:
+ *   1) it's empty for at least 1 tick
+ *   2) it has invalid timestamp (WF2Q case)
+ *   3) parent pipe has no 'exhausted' burst.
+ */
+#define QUEUE_IS_IDLE(q) ((q)->head == NULL && (q)->S == (q)->F + 1 && \
+	curr_time > (q)->idle_time + 1 && \
+	((q)->numbytes + (curr_time - (q)->idle_time - 1) * \
+	(q)->fs->pipe->bandwidth >= q->fs->pipe->burst))
+
+/*
  * Heap management functions.
  *
  * In the heap, first node is element 0. Children of i are 2i+1 and 2i+2.
@@ -1004,7 +1015,7 @@
     fs->last_expired = time_uptime ;
     for (i = 0 ; i <= fs->rq_size ; i++) /* last one is overflow */
 	for (prev=NULL, q = fs->rq[i] ; q != NULL ; )
-	    if (q->head != NULL || q->S != q->F+1) {
+	    if (!QUEUE_IS_IDLE(q)) {
   		prev = q ;
   	        q = q->next ;
   	    } else { /* entry is idle, expire it */
@@ -1134,7 +1145,7 @@
 		break ; /* found */
 
 	    /* No match. Check if we can expire the entry */
-	    if (pipe_expire && q->head == NULL && q->S == q->F+1 ) {
+	    if (pipe_expire && QUEUE_IS_IDLE(q)) {
 		/* entry is idle and not in any heap, expire it */
 		struct dn_flow_queue *old_q = q ;
 
@@ -1408,7 +1419,7 @@
 		if (q->idle_time < curr_time) {
 			/* Calculate available burst size. */
 			q->numbytes +=
-			    (curr_time - q->idle_time) * pipe->bandwidth;
+			    (curr_time - q->idle_time - 1) * pipe->bandwidth;
 			if (q->numbytes > pipe->burst)
 				q->numbytes = pipe->burst;
 			if (io_fast)
@@ -1418,8 +1429,8 @@
 		if (pipe->idle_time < curr_time) {
 			/* Calculate available burst size. */
 			pipe->numbytes +=
-			    (curr_time - pipe->idle_time) * pipe->bandwidth;
-			if (pipe->numbytes > pipe->burst)
+			    (curr_time - pipe->idle_time - 1) * pipe->bandwidth;
+			if (pipe->numbytes > 0 && pipe->numbytes > pipe->burst)
 				pipe->numbytes = pipe->burst;
 			if (io_fast)
 				pipe->numbytes += pipe->bandwidth;

==== //depot/projects/scottl-camlock/src/usr.bin/leave/leave.c#2 (text+ko) ====

@@ -43,7 +43,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/usr.bin/leave/leave.c,v 1.12 2002/09/04 23:29:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/leave/leave.c,v 1.13 2009/11/03 09:25:08 delphij Exp $");
 
 #include 
 #include 
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-void doalarm(u_int);
+static void doalarm(u_int);
 static void usage(void);
 
 /*

==== //depot/projects/scottl-camlock/src/usr.sbin/crashinfo/crashinfo.sh#3 (text+ko) ====

@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/usr.sbin/crashinfo/crashinfo.sh,v 1.2 2009/10/29 13:45:33 jhb Exp $
+# $FreeBSD: src/usr.sbin/crashinfo/crashinfo.sh,v 1.3 2009/11/03 09:17:23 delphij Exp $
 
 usage()
 {
@@ -147,6 +147,8 @@
 
 echo "Writing crash summary to $FILE."
 
+umask 077
+
 # Simulate uname
 ostype=$(echo -e printf '"%s", ostype' | gdb -x /dev/stdin -batch $KERNEL)
 osrelease=$(echo -e printf '"%s", osrelease' | gdb -x /dev/stdin -batch $KERNEL)

==== //depot/projects/scottl-camlock/src/usr.sbin/usbconfig/dump.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.4 2009/02/27 17:27:16 thompsa Exp $ */
+/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.5 2009/11/02 23:50:12 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -100,21 +100,66 @@
 
 	printf("%s%s = 0x%04x ", plevel, field, value);
 
-	if ((field[0] != 'i') || (field[1] == 'd')) {
-		printf("\n");
-		return;
+	if (strlen(plevel) == 8) {
+		/* Endpoint Descriptor */
+
+		if (strcmp(field, "bEndpointAddress") == 0) {
+			if (value & 0x80)
+				printf(" \n");
+			else
+				printf(" \n");
+			return;
+		}
+
+		if (strcmp(field, "bmAttributes") == 0) {
+			switch (value & 0x03) {
+			case 0:
+				printf(" \n");
+				break;
+			case 1:
+				switch (value & 0x0C) {
+				case 0x00:
+					printf(" \n");
+					break;
+				case 0x04:
+					printf(" \n");
+					break;
+				case 0x08:
+					printf(" \n");
+					break;
+				default:
+					printf(" \n");
+					break;
+				}
+				break;
+			case 2:
+				printf(" \n");
+				break;
+			default:
+				printf(" \n");
+				break;
+			}
+			return;
+		}
 	}
-	if (value == 0) {
-		printf(" \n");
+
+	if ((field[0] == 'i') && (field[1] != 'd')) {
+		/* Indirect String Descriptor */
+		if (value == 0) {
+			printf(" \n");
+			return;
+		}
+		if (libusb20_dev_req_string_simple_sync(pdev, value,
+		    temp_string, sizeof(temp_string))) {
+			printf(" \n");
+			return;
+		}
+		printf(" <%s>\n", temp_string);
 		return;
 	}
-	if (libusb20_dev_req_string_simple_sync(pdev, value,
-	    temp_string, sizeof(temp_string))) {
-		printf(" \n");
-		return;
-	}
-	printf(" <%s>\n", temp_string);
-	return;
+
+	/* No additional information */
+	printf("\n");
 }
 
 static void

==== //depot/projects/scottl-camlock/src/usr.sbin/zic/zdump.c#4 (text+ko) ====

@@ -5,8 +5,8 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.12 2009/05/27 12:18:39 edwin Exp $";
-static char	elsieid[] = "@(#)zdump.c	8.9";
+  "$FreeBSD: src/usr.sbin/zic/zdump.c,v 1.13 2009/11/02 23:02:11 edwin Exp $";
+static char	elsieid[] = "@(#)zdump.c	8.10";
 #endif /* not lint */
 
 /*
@@ -152,7 +152,7 @@
 static char *	progname;
 static int	warned;
 
-static void	usage(const char *progname, FILE *stream, int status);
+static void	usage(FILE *stream, int status);
 static char *	abbr(struct tm * tmp);
 static void	abbrok(const char * abbrp, const char * zone);
 static long	delta(struct tm * newp, struct tm * oldp);
@@ -273,7 +273,7 @@
 		if (strcmp(argv[i], "--version") == 0) {
 			errx(EXIT_SUCCESS, "%s", elsieid);
 		} else if (strcmp(argv[i], "--help") == 0) {
-			usage(progname, stdout, EXIT_SUCCESS);
+			usage(stdout, EXIT_SUCCESS);
 		}
 	vflag = 0;
 	cutarg = NULL;
@@ -283,7 +283,7 @@
 		else	cutarg = optarg;
 	if ((c != -1) ||
 		(optind == argc - 1 && strcmp(argv[optind], "=") == 0)) {
-			usage(progname, stderr, EXIT_FAILURE);
+			usage(stderr, EXIT_FAILURE);
 	}
 	if (vflag) {
 		if (cutarg != NULL) {
@@ -468,7 +468,7 @@
 }
 
 static void
-usage(const char *progname, FILE *stream, int status)
+usage(FILE *stream, int status)
 {
 	fprintf(stream,
 _("usage: %s [--version] [-v] [--help] [-c [loyear,]hiyear] zonename ...\n\

==== //depot/projects/scottl-camlock/src/usr.sbin/zic/zic.8#4 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/usr.sbin/zic/zic.8,v 1.23 2009/05/27 12:18:39 edwin Exp $
+.\" $FreeBSD: src/usr.sbin/zic/zic.8,v 1.24 2009/11/02 23:02:11 edwin Exp $
 .Dd June 20, 2004
 .Dt ZIC 8
 .Os
@@ -260,7 +260,7 @@
 .El
 .Pp
 A zone line has the form:
-.Dl "Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	[UNTILYEAR [MONTH [DAY [TIME]]]]
+.Dl "Zone	NAME	GMTOFF	RULES/SAVE	FORMAT	[UNTILYEAR [MONTH [DAY [TIME]]]]"
 For example:
 .Dl "Zone	Australia/Adelaide	9:30	Aus	CST	1971 Oct 31 2:00
 The fields that make up a zone line are:
From trasz at FreeBSD.org  Tue Nov  3 17:36:22 2009
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Tue Nov  3 17:36:36 2009
Subject: PERFORCE change 170121 for review
Message-ID: <200911031736.nA3HaJg2075165@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170121

Change 170121 by trasz@trasz_victim on 2009/11/03 17:35:50

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#37 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#44 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/cat/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/csh/iconv_stub.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/ls/ls.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/ps/keyword.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/bin/uuidgen/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/gcc/config/i386/i386.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/contrib/ncurses/ncurses/base/lib_getch.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/crypto/openssh/sshd_config#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/gettytab#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/bgfsck#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/cleartmp#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/fsck#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/hostid#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/hostname#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/jail#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ldconfig#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/motd#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mountcritlocal#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/moused#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/newsyslog#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/nfsclient#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/pf#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/savecore#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/games/number/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/games/number/number.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/gnu/lib/libgcov/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/kerberos5/lib/libgssapi_krb5/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libbluetooth/bluetooth.3#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libbluetooth/bluetooth.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Makefile.inc#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/Symbol.map#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/getcwd.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/posix_spawnattr_init.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/pselect.3#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/pselect.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/gen/wordexp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/namespace.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/include/un-namespace.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/nls/C.msg#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Makefile.inc#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/Symbol.map#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/accept.2#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/intro.2#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/nanosleep.2#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/sys/pselect.2#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libfetch/common.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/libpmc.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc_attach.3#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/open.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/arch/ia64/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/pthread.map#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libthr/thread/thr_syscalls.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb/libusb20_ugen20.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/README#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/mk/doc.relnotes.mk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/sgml/release.dsl#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/release/scripts/package-split.py#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/adjkerntz/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/atacontrol/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/atm/atmconfig/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/badsect/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/bsdlabel/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/camcontrol/camcontrol.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ccdconfig/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/clri/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/comcontrol/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/conscontrol/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ddb/ddb_capture.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/bpf.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/dhcpd.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dhclient/packet.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dmesg/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dump/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpon/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/geom_part.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/gpart.8#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ggate/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/growfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/gvinum/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/af_nd6.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifieee80211.c#20 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/init/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ipf/Makefile.inc#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/kldunload/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/ldconfig/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/md5/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdconfig/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mdmfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mksnap_ffs/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_autofs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_cd9660/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_ext2fs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_msdosfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nfs/mount_nfs.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_nullfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_reiserfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount_unionfs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/newfs_msdos/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/nfsiod/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/pfctl/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/rcorder/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/reboot/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/recoverdisk/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/routed/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/savecore/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/sconfig/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/shutdown/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/spppcontrol/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/swapon/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/sysctl/sysctl.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/tunefs.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#28 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_hp.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/acpi_wmi.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/atapicam.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/bge.4#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/hifn.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ichwd.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/iwn.4#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/iwnfw.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mac_mls.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/malo.4#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/msk.4#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/sbp_targ.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/targ.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/tty.4#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/umass.4#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/urtw.4#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/ar.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/make.conf.5#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/msdosfs.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/regdomain.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/adding_user.7#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/BUS_BIND_INTR.9#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/get_cyclecount.9#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/bsd-family-tree#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/misc/committers-src.dot#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.sys.mk#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/southamerica#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/acpica/acpi_wakecode.S#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/intr_machdep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/machdep.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/pmap.c#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/GENERIC#27 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/ia32/ia32_signal.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/intr_machdep.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysvec.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/pmap.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/HL200#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/KB920X#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/commands.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/zfsboot/zfsboot.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/zfs/zfs.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/zfs/zfsimpl.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_all.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_pmp.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_xpt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_ccb.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_periph.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_periph.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_queue.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_queue.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/cam_xpt_internal.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_all.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_ch.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_da.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_low.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_pt.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sa.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_sg.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_targ_bh.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_xpt.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/boot/zfs/zfsimpl.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/vnode.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#38 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscall.h#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_syscalls.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_sysent.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_socket.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_ndis.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/kern_windrv.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ndis.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_ntoskrnl.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_pe.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ndis/subr_usbd.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/x86bios/x86bios_alloc.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#42 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#57 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.ia64#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#35 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/changes.txt#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/adfile.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/adisasm.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/adwalk.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmextern.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtable.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/getopt.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evregion.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acapps.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acdebug.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acglobal.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/aclocal.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acpixf.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/LICENSE#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu_util.c#3 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpi_support/acpi_aiboost.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-all.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-disk.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-dma.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-queue.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-raid.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-sata.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-cam.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-cd.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-fd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/atapi-tape.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-ahci.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-intel.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-nvidia.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-promise.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-siliconimage.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-via.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/atkbd.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bcereg.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bge/if_bge.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dpms/dpms.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drmP.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pciids.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_scatter.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/i915_drv.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/mach64_state.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_blit.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/radeon_cp.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fdc/fdc.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/gem/if_gem_pci.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_core.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_mod.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/isp/isp_sbus.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwn.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iwn/if_iwnvar.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/miidevs#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_cam.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_mskreg.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mwl/if_mwl_pci.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge_var.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci.c#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/vga_pci.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/lpt.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ppbus/pcfclock.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/re/if_re.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sym/sym_hipd.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_mbus.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_pci.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehcireg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci_atmelarm.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci_pci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohcireg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhci_pci.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/uhcireg.h#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ukbd.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/input/ums.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/net/if_cdce.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uch341.c#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uchcom.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/usb_serial.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_compat_linux.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_core.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usb_transfer.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#34 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_uath.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_upgt.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_ural.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtwreg.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtwvar.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_zyd.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clport.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clstate.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clsubs.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/smbfs/smbfs_vfsops.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_subr.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_gpt.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/bios/apm.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/GENERIC#29 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/intr_machdep.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/intr_machdep.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_machdep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysvec.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/conf/GENERIC#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/highfp.c#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/interrupt.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/pmap.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/asm.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/md_var.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/param.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/proc.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/bus_if.m#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_elf.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_main.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/init_sysent.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_context.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_cpuset.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_intr.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_ktrace.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thread.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_4bsd.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sched_ule.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/stack_protector.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_taskqueue.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_trap.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_process.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/syscalls.master#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/systrace_args.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sysv_shm.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#28 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_ttydisc.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_syscalls.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/pmap.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#35 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/cam/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dpms/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/Makefile.inc#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn4965/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn5000/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/iwnfw/iwn5150/Makefile#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsclient/Makefile#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/ubser/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/Makefile#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/uch341/Makefile#2 delete
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb/ucom/Makefile#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/vesa/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86bios/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/flowtable.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_enc.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#16 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.c#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/pfil.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net/pfil.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hwmp.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_mesh.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_mesh.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/NOTES#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_bridge.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#26 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#25 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fastfwd.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_icmp.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_output.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_var.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw2.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_pfil.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/libalias/alias.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#22 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_bsd_addr.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_cc_functions.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_output.c#19 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#28 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#21 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_forward.c#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_output.c#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_var.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_kdtrace.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_vnops.c#23 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/GENERIC#17 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/pc98/machdep.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/clock.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/machdep.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mmu_oea.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mmu_oea64.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/mp_cpudep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/platform_chrp.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/swtch.S#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/trap.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/aim/trap_subr.S#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/machdep.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/mp_cpudep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/pmap.c#15 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/hid.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pcpu.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/pmap.h#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/smp.h#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/spr.h#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powermac/hrowpic.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/cpu.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mmu_if.m#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/mp_machdep.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/pmap_dispatch.c#7 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/conf/GENERIC#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/elf.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/in_cksum.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/machdep.c#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/pmap.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/elf.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/machdep.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/sun4v/pmap.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ata.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/conf.h#14 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/interrupt.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/kernel.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ktrace.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#18 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/signalvar.h#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.h#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscall.mk#11 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#12 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/time.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/ttyqueue.h#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/tools/fw_stub.awk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/tools/makeobjops.awk#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/pmap.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/swap_pager.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_extern.h#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_fault.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_glue.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_map.c#13 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_zeroidle.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/expansion/question1.0#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/expansion/set-u1.0#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/expansion/set-u2.0#1 branch
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/rename/21.t#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/libc/gen/test-wordexp.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/lib/libutil/test-flopen.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/netrate/netsend/netsend.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/leave/leave.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/logger/logger.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/job.c#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/make/main.c#9 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/netstat/route.c#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/systat/keyboard.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/systat/main.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/tail/tail.1#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/touch/touch.c#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/vmstat/vmstat.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/iasl/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/crashinfo/crashinfo.sh#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/i2c/i2c.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/jail/jail.8#10 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/nfsd/stablerestart.5#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/doc/ntpd.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/cdrom.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/sysinstall/tcpip.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tzsetup/tzsetup.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/tzsetup/tzsetup.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/dump.c#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.8#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wake/wake.8#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zdump.c#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/zic.8#5 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#18 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -272,7 +272,7 @@
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
-		-iprefix ${LIB32TMP}/usr/ \
+		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
 
@@ -599,11 +599,14 @@
 .if ${MK_INFO} != "no"
 _install-info=	install-info
 .endif
+.if ${MK_ZONEINFO} != "no"
+_zoneinfo=	zic tzsetup
+.endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
-	test true uname wc zic
+	test true uname wc ${_zoneinfo}
 
 #
 # distributeworld
@@ -929,6 +932,10 @@
 _mklocale=	usr.bin/mklocale
 .endif
 
+.if ${BOOTSTRAPPING} < 900002
+_sed=		usr.bin/sed
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -954,6 +961,7 @@
     usr.bin/makewhatis \
     ${_mklocale} \
     usr.bin/rpcgen \
+    ${_sed} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
@@ -1033,7 +1041,6 @@
 .for _tool in \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc \
-    usr.bin/sed \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
@@ -1122,7 +1129,7 @@
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
+kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
     lib/libcrypt__L

==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#37 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20091027: pselect.3 implemented as syscall
+OLD_FILES+=usr/share/man/man3/pselect.3.gz
+# 20091005: fusword.9 and susword.9 removed
+OLD_FILES+=usr/share/man/man9/fusword.9.gz
+OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
@@ -26,6 +31,49 @@
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
+# 20090812: net80211 documentation overhaul
+OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0
@@ -503,6 +551,8 @@
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
+OLD_FILES+=usr/sbin/usbdevs
+OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h

==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#44 (text+ko) ====

@@ -22,6 +22,14 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20091025:
+	The iwn(4) driver has been updated to support the 5000 and 5150 series.
+	There's one kernel module for each firmware. Adding "device iwnfw"
+	to the kernel configuration file means including all three firmware
+	images inside the kernel. If you want to include just the one for
+	your wireless card, use the the devices iwn4965fw, iwn5000fw or
+	iwn5150fw.
+
 20090926:
 	The rc.d/network_ipv6, IPv6 configuration script has been integrated
 	into rc.d/netif.  The changes are the following:
@@ -624,6 +632,15 @@
 	userland (libpmc(3)) and the kernel module (hwpmc(4)) in
 	sync.
 
+20081009:
+	atapci kernel module now includes only generic PCI ATA
+	driver. AHCI driver moved to ataahci kernel module.
+	All vendor-specific code moved into separate kernel modules:
+	ataacard, ataacerlabs, ataadaptec, ataamd, ataati, atacenatek,
+	atacypress, atacyrix, atahighpoint, ataintel, ataite, atajmicron,
+	atamarvell, atamicron, atanational, atanetcell, atanvidia,
+	atapromise, ataserverworks, atasiliconimage, atasis, atavia
+
 20080820:
 	The TTY subsystem of the kernel has been replaced by a new
 	implementation, which provides better scalability and an
@@ -1030,4 +1047,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $
+$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $

==== //depot/projects/soc2008/trasz_nfs4acl/bin/cat/Makefile#3 (text+ko) ====

@@ -1,7 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/cat/Makefile,v 1.8 2009/03/16 12:16:17 des Exp $
+# $FreeBSD: src/bin/cat/Makefile,v 1.9 2009/10/15 18:17:29 ru Exp $
 
 PROG=	cat
-WARNS?=	6
 
 .include 

==== //depot/projects/soc2008/trasz_nfs4acl/bin/csh/iconv_stub.c#2 (text) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.1 2006/02/19 06:40:29 ume Exp $
+ * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.2 2009/10/17 15:53:15 ume Exp $
  */
 
 #include 
@@ -61,9 +61,20 @@
 		if (iconvlib == NULL)
 			return (iconv_t)-1;
 		iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN);
+		if (iconv_open == NULL)
+			goto dlfunc_err;
 		dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE);
+		if (dl_iconv == NULL)
+			goto dlfunc_err;
 		dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib,
 		    ICONV_CLOSE);
+		if (dl_iconv_close == NULL)
+			goto dlfunc_err;
 	}
 	return iconv_open(tocode, fromcode);
+
+dlfunc_err:
+	dlclose(iconvlib);
+	iconvlib = NULL;
+	return (iconv_t)-1;
 }

==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.1#9 (text+ko) ====

@@ -25,12 +25,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
 .\"
-.Dd September 04, 2009
+.Dd September 4, 2009
 .Dt GETFACL 1
 .Os
 .Sh NAME

==== //depot/projects/soc2008/trasz_nfs4acl/bin/ls/ls.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $");
+__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.87 2009/10/13 21:51:50 jilles Exp $");
 
 #include 
 #include 
@@ -399,7 +399,7 @@
 	 * If not -F, -d or -l options, follow any symbolic links listed on
 	 * the command line.
 	 */
-	if (!f_longform && !f_listdir && !f_type)
+	if (!f_longform && !f_listdir && (!f_type || f_slash))
 		fts_options |= FTS_COMFOLLOW;
 
 	/*

==== //depot/projects/soc2008/trasz_nfs4acl/bin/ps/keyword.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
 
 #include 
 #include 
@@ -70,7 +70,7 @@
 
 /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
 static VAR var[] = {
-	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0},
+	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0},
 	{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
 	{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
 		"x", 0},
@@ -159,7 +159,7 @@
 		UINT, UIDFMT, 0},
 	{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
 		USERLEN, 0, CHAR, NULL, 0},
-	{"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0},
+	{"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0},
 	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
 		NULL, 0},
 	{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
@@ -207,7 +207,7 @@
 		NULL, 0},
 	{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
 	{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0},
+	{"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0},
 	{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
 	{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
 		"x", 0},

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.55 2009/06/25 17:14:06 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $");
 
 #include 
 #include 
@@ -657,7 +657,7 @@
 	}
 	varlen = 0;
 	startloc = expdest - stackblock();
-	if (!set && uflag) {
+	if (!set && uflag && *var != '@' && *var != '*') {
 		switch (subtype) {
 		case VSNORMAL:
 		case VSTRIMLEFT:

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#7 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $");
 
 #include 
 #include 
@@ -1308,11 +1308,16 @@
 	struct jmploc *const savehandler = handler;
 	int savelen;
 	int saveprompt;
+	const int bq_startlinno = plinno;
 
 	if (setjmp(jmploc.loc)) {
 		if (str)
 			ckfree(str);
 		handler = savehandler;
+		if (exception == EXERROR) {
+			startlinno = bq_startlinno;
+			synerror("Error in command substitution");
+		}
 		longjmp(handler->loc, 1);
 	}
 	INTOFF;

==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#7 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\" $FreeBSD: src/bin/sh/sh.1,v 1.132 2009/10/07 22:21:53 jilles Exp $
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.133 2009/10/24 21:20:04 jilles Exp $
 .\"
-.Dd May 31, 2009
+.Dd October 24, 2009
 .Dt SH 1
 .Os

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From mav at FreeBSD.org  Tue Nov  3 19:26:14 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov  3 19:26:20 2009
Subject: PERFORCE change 170125 for review
Message-ID: <200911031926.nA3JQD4m085008@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170125

Change 170125 by mav@mav_mavbook on 2009/11/03 19:25:52

	Undo struct cam_sim elements reorder.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#13 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#13 (text+ko) ====

@@ -94,13 +94,23 @@
 	const char		*sim_name;
 	void			*softc;
 	struct mtx		*mtx;
-	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
+	TAILQ_HEAD(, ccb_hdr)	sim_doneq;
 	TAILQ_ENTRY(cam_sim)	links;
 	u_int32_t		path_id;/* The Boot device may set this to 0? */
 	u_int32_t		unit_number;
 	u_int32_t		bus_id;
 	int			max_tagged_dev_openings;
 	int			max_dev_openings;
+	u_int32_t		flags;
+#define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
+#define	CAM_SIM_MPSAFE			0x02
+#define CAM_SIM_ON_DONEQ		0x04
+	struct callout		callout;
+	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
+	int			refcount; /* References to the SIM. */
+
+	/* "Pool" of inactive ccbs managed by xpt_get_ccb and xpt_release_ccb */
+	SLIST_HEAD(,ccb_hdr)	ccb_freeq;
 	/*
 	 * Maximum size of ccb pool.  Modified as devices are added/removed
 	 * or have their * opening counts changed.
@@ -108,15 +118,7 @@
 	u_int			max_ccbs;
 	/* Current count of allocated ccbs */
 	u_int			ccb_count;
-	struct callout		callout;
-	u_int32_t		flags;
-#define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
-#define	CAM_SIM_MPSAFE			0x02
-#define CAM_SIM_ON_DONEQ		0x04
-	int			refcount; /* References to the SIM. */
-	TAILQ_HEAD(, ccb_hdr)	sim_doneq; /* Completed requests queue. */
-	/* "Pool" of inactive ccbs managed by xpt_get_ccb and xpt_release_ccb */
-	SLIST_HEAD(, ccb_hdr)	ccb_freeq;
+
 };
 
 #define CAM_SIM_LOCK(sim)	mtx_lock((sim)->mtx);
From mav at FreeBSD.org  Tue Nov  3 20:19:07 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov  3 20:19:19 2009
Subject: PERFORCE change 170128 for review
Message-ID: <200911032019.nA3KJ6WT089654@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170128

Change 170128 by mav@mav_mavtest on 2009/11/03 20:18:18

	Remove CAM_PERIPH_POLLED flag. It is broken by design. Polling can't
	be periph flag. May be SIM, may be CCB, but now it works fine just
	without it.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#37 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#20 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#118 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#51 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#37 (text+ko) ====

@@ -373,7 +373,6 @@
 	}
 
 	if (length > 0) {
-		periph->flags |= CAM_PERIPH_POLLED;
 		xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
 		ccb.ccb_h.ccb_state = ADA_CCB_DUMP;
 		cam_fill_ataio(&ccb.ataio,
@@ -433,7 +432,6 @@
 					 /*timeout*/0,
 					 /*getcount_only*/0);
 	}
-	periph->flags &= ~CAM_PERIPH_POLLED;
 	cam_periph_unlock(periph);
 	return (0);
 }

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#20 (text+ko) ====

@@ -117,7 +117,6 @@
 #define CAM_PERIPH_INVALID		0x08
 #define CAM_PERIPH_NEW_DEV_FOUND	0x10
 #define CAM_PERIPH_RECOVERY_INPROG	0x20
-#define CAM_PERIPH_POLLED		0x40
 	u_int32_t		 immediate_priority;
 	u_int32_t		 refcount;
 	SLIST_HEAD(, ccb_hdr)	 ccb_list;	/* For "immediate" requests */

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#118 (text+ko) ====

@@ -4257,9 +4257,7 @@
 						  links);
 				mtx_unlock(&cam_simq_lock);
 				sim->flags |= CAM_SIM_ON_DONEQ;
-				if ((done_ccb->ccb_h.path->periph->flags &
-				    CAM_PERIPH_POLLED) == 0)
-					swi_sched(cambio_ih, 0);
+				swi_sched(cambio_ih, 0);
 			}
 			break;
 		default:

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#51 (text+ko) ====

@@ -859,7 +859,6 @@
 	}
 
 	if (length > 0) {
-		periph->flags |= CAM_PERIPH_POLLED;
 		xpt_setup_ccb(&csio.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
 		csio.ccb_h.ccb_state = DA_CCB_DUMP;
 		scsi_read_write(&csio,
@@ -885,7 +884,6 @@
 			else
 				printf("status == 0x%x, scsi status == 0x%x\n",
 				       csio.ccb_h.status, csio.scsi_status);
-			periph->flags |= CAM_PERIPH_POLLED;
 			return(EIO);
 		}
 		cam_periph_unlock(periph);
@@ -929,7 +927,6 @@
 			}
 		}
 	}
-	periph->flags &= ~CAM_PERIPH_POLLED;
 	cam_periph_unlock(periph);
 	return (0);
 }
From mav at FreeBSD.org  Tue Nov  3 20:58:48 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov  3 20:58:54 2009
Subject: PERFORCE change 170130 for review
Message-ID: <200911032058.nA3KwkTr002867@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170130

Change 170130 by mav@mav_mavtest on 2009/11/03 20:57:51

	Remove check unused for at least five years. If we will ever have
	non-BIO devices in CAM, this check is smallest of what we will need.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#119 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#119 (text+ko) ====

@@ -4246,23 +4246,15 @@
 		 * any of the "non-immediate" type of ccbs.
 		 */
 		sim = done_ccb->ccb_h.path->bus->sim;
-		switch (done_ccb->ccb_h.path->periph->type) {
-		case CAM_PERIPH_BIO:
-			TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h,
-					  sim_links.tqe);
-			done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX;
-			if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) {
-				mtx_lock(&cam_simq_lock);
-				TAILQ_INSERT_TAIL(&cam_simq, sim,
-						  links);
-				mtx_unlock(&cam_simq_lock);
-				sim->flags |= CAM_SIM_ON_DONEQ;
-				swi_sched(cambio_ih, 0);
-			}
-			break;
-		default:
-			panic("unknown periph type %d",
-			    done_ccb->ccb_h.path->periph->type);
+		TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h,
+		    sim_links.tqe);
+		done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX;
+		if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) {
+			mtx_lock(&cam_simq_lock);
+			TAILQ_INSERT_TAIL(&cam_simq, sim, links);
+			mtx_unlock(&cam_simq_lock);
+			sim->flags |= CAM_SIM_ON_DONEQ;
+			swi_sched(cambio_ih, 0);
 		}
 	}
 }
From rene at FreeBSD.org  Tue Nov  3 21:27:16 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Tue Nov  3 21:27:23 2009
Subject: PERFORCE change 170132 for review
Message-ID: <200911032127.nA3LRFeV005978@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170132

Change 170132 by rene@rene_self on 2009/11/03 21:26:18

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#31 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#18 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#49 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#26 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#28 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#25 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/sylvio.key#1 branch
.. //depot/projects/docproj_nl/www/en/developers.sgml#24 integrate
.. //depot/projects/docproj_nl/www/en/platforms/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/platforms/amd64.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/platforms/amd64/Makefile#2 delete
.. //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#6 delete
.. //depot/projects/docproj_nl/www/en/projects/projects.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/where.sgml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#12 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#54 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#17 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#31 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -2442,6 +2442,15 @@
       
 
       
+	RELENG_8_0
+
+	
+	  The release branch for FreeBSD-8.0, used only for
+	    security advisories and other critical fixes.
+	
+      
+
+      
 	RELENG_7
 
 	

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#49 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 
 aaron@FreeBSD.org">
@@ -1054,6 +1054,8 @@
 
 swallace@FreeBSD.org">
 
+sylvio@FreeBSD.org">
+
 syrinx@FreeBSD.org">
 
 tabthorpe@FreeBSD.org">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#16 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -1186,6 +1186,11 @@
       &pgpkey.nork;
     
 
+    
+      &a.sylvio;
+      &pgpkey.sylvio;
+    
+
     
       &a.syrinx;
       &pgpkey.syrinx;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#25 (text+ko) ====

@@ -1,5 +1,5 @@
 
-
+
 
 
 
@@ -283,6 +283,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_nl/www/en/developers.sgml#24 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.231 2009/10/04 15:00:07 jh Exp $
+$FreeBSD: www/en/developers.sgml,v 1.232 2009/10/29 23:45:07 sylvio Exp $
 
 -->
 
@@ -524,6 +524,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_nl/www/en/platforms/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/platforms/Makefile,v 1.12 2006/11/09 06:29:55 jb Exp $
+# $FreeBSD: www/en/platforms/Makefile,v 1.13 2009/10/30 17:43:24 brueffer Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -21,7 +21,6 @@
 DOCS+=	x86-64.sgml
 DOCS+=	xbox.sgml
 
-SUBDIR=	amd64
-SUBDIR+=ia64
+SUBDIR=	ia64
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_nl/www/en/platforms/amd64.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -41,7 +41,6 @@
 
   
FreeBSD/amd64 Specific Resources

   
 

==== //depot/projects/docproj_nl/www/en/projects/projects.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -376,23 +376,13 @@
 	hierarchy on your browser to view each file's revision history
 	in a very handy manner.
 
-	
  •  The FreeBSD
 	Laptop Compatibility List: A comprehensive database of
 	laptops and PCMCIA cards that work with FreeBSD.  This site
 	contains detailed information about known hardware and
 	software issues.
    • 
 
-      
  • The FreeBSD
-	Tinderbox: The Tinderbox continuously builds the active branches of the
-	FreeBSD source tree to detect build problems.  When a
-	tinderbox build fails it sends an email to the appropriate
-	mailing list, so that the build can be fixed as fast as
-	possible.  The Tinderbox source code is maintained in the
-	FreeBSD CVS repository in the directory src/tools/tools/tinderbox.
    • 
-
       
  • TET
 	Integration: The Test Execution Toolkit from The Open Group is a

==== //depot/projects/docproj_nl/www/en/where.sgml#4 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 
@@ -38,6 +38,8 @@
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors.html">CD-ROM
 	and DVD Publishers.
    
 
+    
+
     
    Download FreeBSD
    
 
     

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#12 (text+ko) ====

@@ -1,12 +1,12 @@
 
-
+
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.49 2009/08/14 07:00:23 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.50 2009/11/02 13:02:38 remko Exp $
     
   
 
@@ -1012,4 +1012,19 @@
       Brand or custom hardware and network equipments.
     
   
+
+  
+    SevenL Networks Inc.
+    https://www.sevenl.net
+    
+      SevenL Networks Inc. providing
+      affordable
+	FreeBSD dedicated server hosting, VPS, managed web server
+      offerings, colocation, data center space and other hosting services
+      since 2003. SevenL currently hosts server infrastructure for Gentoo,
+      Arch Linux, Linux Mint, CentOS, Startcom Linux and a number of open
+      source software projects. SevenL Networks is located in Toronto,
+      Canada.
+    
+  
 

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#54 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.273 2009/10/11 17:49:27 danger Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.275 2009/10/30 00:00:33 sylvio Exp $
     
   
 
@@ -36,6 +36,31 @@
       10
 
       
+	29
+	
+	  
    New committer: Sylvio
+	    Cesar Teixeira (ports)
    
+	    
+          
+
+      
+	28
+
+	
+	  &os; 8.0-RC2 Available
+
+	  
    The second of the Release Candidates for the &os;-8.0
+	    release cycle is now available.  ISO images for Tier-1
+	    architectures and a memory stick image for
+	    amd64/i386 are now available
+	    on most of the &os;
+	    mirror sites.
    
+	    
+          
+
+      
 	11
 
 	

==== //depot/projects/docproj_nl/www/share/sgml/release.ent#17 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
 
 
@@ -2558,6 +2557,16 @@
 	
 
 	
+	  RELENG_8_0
+
+	  
+	    De uitgavetak voor &os;-8.0, alleen gebruikt voor
+	      beveiligingswaarschuwingen en andere kritische
+	      aanpassingen.
+	  
+	
+
+	
 	  RELENG_7
 
 	  
From mav at FreeBSD.org  Wed Nov  4 09:17:07 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov  4 09:17:14 2009
Subject: PERFORCE change 170153 for review
Message-ID: <200911040917.nA49H7Nd000526@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170153

Change 170153 by mav@mav_mavtest on 2009/11/04 09:16:31

	Add support for sector size > 512 bytes and physical sector of
	several logical sectors, intruduced by ATA-7 specification.

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#27 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#19 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#18 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#39 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#50 edit
.. //depot/projects/scottl-camlock/src/sys/sys/ata.h#14 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#27 (text+ko) ====

@@ -1061,6 +1061,10 @@
 	printf("cylinders             %d\n", parm->cylinders);
 	printf("heads                 %d\n", parm->heads);
 	printf("sectors/track         %d\n", parm->sectors);
+	printf("sector size           logical %u, physical %lu, offset %lu\n",
+	    ata_logical_sector_size(parm),
+	    (unsigned long)ata_physical_sector_size(parm),
+	    (unsigned long)ata_logical_sector_offset(parm));
 
 	if (parm->config == ATA_PROTO_CFA ||
 	    (parm->support.command2 & ATA_SUPPORT_CFA))

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#19 (text+ko) ====

@@ -271,6 +271,38 @@
 	printf(" device\n");
 }
 
+uint32_t
+ata_logical_sector_size(struct ata_params *ident_data)
+{
+	if ((ident_data->pss & 0xc000) == 0x4000 &&
+	    (ident_data->pss & ATA_PSS_LSSABOVE512)) {
+		return ((u_int32_t)ident_data->lss_1 |
+		    ((u_int32_t)ident_data->lss_2 << 16));
+	}
+	return (512);
+}
+
+uint64_t
+ata_physical_sector_size(struct ata_params *ident_data)
+{
+	if ((ident_data->pss & 0xc000) == 0x4000 &&
+	    (ident_data->pss & ATA_PSS_MULTLS)) {
+		return ((uint64_t)ata_logical_sector_size(ident_data) *
+		    (1 << (ident_data->pss & ATA_PSS_LSPPS)));
+	}
+	return (512);
+}
+
+uint64_t
+ata_logical_sector_offset(struct ata_params *ident_data)
+{
+	if ((ident_data->lsalign & 0xc000) == 0x4000) {
+		return ((uint64_t)ata_logical_sector_size(ident_data) *
+		    (ident_data->lsalign & 0x3fff));
+	}
+	return (0);
+}
+
 void
 ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
     uint32_t lba, uint8_t sector_count)

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#18 (text+ko) ====

@@ -92,6 +92,10 @@
 
 void	ata_print_ident(struct ata_params *ident_data);
 
+uint32_t	ata_logical_sector_size(struct ata_params *ident_data);
+uint64_t	ata_physical_sector_size(struct ata_params *ident_data);
+uint64_t	ata_logical_sector_offset(struct ata_params *ident_data);
+
 void	ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
     uint32_t lba, uint8_t sector_count);
 void	ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features,

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#39 (text+ko) ====

@@ -95,10 +95,10 @@
 
 struct disk_params {
 	u_int8_t  heads;
+	u_int8_t  secs_per_track;
 	u_int32_t cylinders;
-	u_int8_t  secs_per_track;
-	u_int32_t secsize;	/* Number of bytes/sector */
-	u_int64_t sectors;	/* total number sectors */
+	u_int32_t secsize;	/* Number of bytes/logical sector */
+	u_int64_t sectors;	/* Total number sectors */
 };
 
 struct ada_softc {
@@ -140,7 +140,7 @@
 			       union ccb *done_ccb);
 static  int		adaerror(union ccb *ccb, u_int32_t cam_flags,
 				u_int32_t sense_flags);
-static void		adasetgeom(struct cam_periph *periph,
+static void		adagetparams(struct cam_periph *periph,
 				struct ccb_getdev *cgd);
 static timeout_t	adasendorderedtag;
 static void		adashutdown(void *arg, int howto);
@@ -653,6 +653,7 @@
 	 * Register this media as a disk
 	 */
 	mtx_unlock(periph->sim->mtx);
+	adagetparams(periph, cgd);
 	softc->disk = disk_alloc();
 	softc->disk->d_open = adaopen;
 	softc->disk->d_close = adaclose;
@@ -666,9 +667,9 @@
 	else if (maxio > MAXPHYS)
 		maxio = MAXPHYS;	/* for safety */
 	if (cgd->ident_data.support.command2 & ATA_SUPPORT_ADDRESS48)
-		maxio = min(maxio, 65536 * 512);
+		maxio = min(maxio, 65536 * softc->params.secsize);
 	else					/* 28bit ATA command limit */
-		maxio = min(maxio, 256 * 512);
+		maxio = min(maxio, 256 * softc->params.secsize);
 	softc->disk->d_maxsize = maxio;
 	softc->disk->d_unit = periph->unit_number;
 	softc->disk->d_flags = 0;
@@ -677,9 +678,12 @@
 	strlcpy(softc->disk->d_ident, cgd->serial_num,
 	    MIN(sizeof(softc->disk->d_ident), cgd->serial_num_len + 1));
 
-	adasetgeom(periph, cgd);
 	softc->disk->d_sectorsize = softc->params.secsize;
-	softc->disk->d_mediasize = softc->params.secsize * (off_t)softc->params.sectors;
+	softc->disk->d_mediasize = (off_t)softc->params.sectors *
+	    softc->params.secsize;
+	softc->disk->d_stripesize = ata_physical_sector_size(&cgd->ident_data);
+	softc->disk->d_stripeoffset = softc->disk->d_stripesize -
+	    ata_logical_sector_offset(&cgd->ident_data);
 	/* XXX: these are not actually "firmware" values, so they may be wrong */
 	softc->disk->d_fwsectors = softc->params.secs_per_track;
 	softc->disk->d_fwheads = softc->params.heads;
@@ -963,14 +967,14 @@
 }
 
 static void
-adasetgeom(struct cam_periph *periph, struct ccb_getdev *cgd)
+adagetparams(struct cam_periph *periph, struct ccb_getdev *cgd)
 {
 	struct ada_softc *softc = (struct ada_softc *)periph->softc;
 	struct disk_params *dp = &softc->params;
 	u_int64_t lbasize48;
 	u_int32_t lbasize;
 
-	dp->secsize = 512;
+	dp->secsize = ata_logical_sector_size(&cgd->ident_data);
 	if ((cgd->ident_data.atavalid & ATA_FLAG_54_58) &&
 		cgd->ident_data.current_heads && cgd->ident_data.current_sectors) {
 		dp->heads = cgd->ident_data.current_heads;

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#50 (text+ko) ====

@@ -363,10 +363,12 @@
 		cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 		cts.type = CTS_TYPE_CURRENT_SETTINGS;
 		if (path->device->transport == XPORT_ATA) {
-			cts.xport_specific.ata.bytecount = sectors * 512;
+			cts.xport_specific.ata.bytecount = sectors *
+			    ata_logical_sector_size(ident_buf);
 			cts.xport_specific.ata.valid = CTS_ATA_VALID_BYTECOUNT;
 		} else {
-			cts.xport_specific.sata.bytecount = sectors * 512;
+			cts.xport_specific.sata.bytecount = sectors *
+			    ata_logical_sector_size(ident_buf);
 			cts.xport_specific.sata.valid = CTS_SATA_VALID_BYTECOUNT;
 		}
 		xpt_action((union ccb *)&cts);

==== //depot/projects/scottl-camlock/src/sys/sys/ata.h#14 (text+ko) ====

@@ -234,7 +234,7 @@
 /*176*/ u_int8_t        media_serial[60];
 /*206*/ u_int16_t       sct;
 	u_int16_t       reserved206[2];
-/*209*/ u_int16_t       lbalign;
+/*209*/ u_int16_t       lsalign;
 /*210*/ u_int16_t       wrv_sectors_m3_1;
 	u_int16_t       wrv_sectors_m3_2;
 /*212*/ u_int16_t       wrv_sectors_m2_1;
From mav at FreeBSD.org  Wed Nov  4 12:11:02 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov  4 12:11:08 2009
Subject: PERFORCE change 170157 for review
Message-ID: <200911041211.nA4CB1HT016458@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170157

Change 170157 by mav@mav_mavtest on 2009/11/04 12:10:45

	If several controllers complete requests same time, call swi_sched()
	only once.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#120 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#120 (text+ko) ====

@@ -4238,6 +4238,7 @@
 xpt_done(union ccb *done_ccb)
 {
 	struct cam_sim *sim;
+	int	first;
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_done\n"));
 	if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) != 0) {
@@ -4251,10 +4252,12 @@
 		done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX;
 		if ((sim->flags & CAM_SIM_ON_DONEQ) == 0) {
 			mtx_lock(&cam_simq_lock);
+			first = TAILQ_EMPTY(&cam_simq);
 			TAILQ_INSERT_TAIL(&cam_simq, sim, links);
 			mtx_unlock(&cam_simq_lock);
 			sim->flags |= CAM_SIM_ON_DONEQ;
-			swi_sched(cambio_ih, 0);
+			if (first)
+				swi_sched(cambio_ih, 0);
 		}
 	}
 }
From mav at FreeBSD.org  Wed Nov  4 13:05:57 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov  4 13:06:03 2009
Subject: PERFORCE change 170158 for review
Message-ID: <200911041305.nA4D5u1X031733@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170158

Change 170158 by mav@mav_mavtest on 2009/11/04 13:05:18

	Do not unarm callout on request completion and change slot selection
	algorithm as done in ahci(4). This saves some CPU time on high
	request rates.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#14 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#14 (text+ko) ====

@@ -641,6 +641,7 @@
 	for (i = 0; i < SIIS_MAX_SLOTS; i++) {
 		struct siis_slot *slot = &ch->slot[i];
 
+		callout_drain(&slot->timeout);
 		if (slot->dma.data_map) {
 			bus_dmamap_destroy(ch->dma.data_tag, slot->dma.data_map);
 			slot->dma.data_map = NULL;
@@ -838,15 +839,11 @@
 	mtx_assert(&ch->mtx, MA_OWNED);
 	/* Choose empty slot. */
 	tag = ch->lastslot;
-	do {
-		tag++;
-		if (tag >= SIIS_MAX_SLOTS)
+	while (ch->slot[tag].state != SIIS_SLOT_EMPTY) {
+		if (++tag >= SIIS_MAX_SLOTS)
 			tag = 0;
-		if (ch->slot[tag].state == SIIS_SLOT_EMPTY)
-			break;
-	} while (tag != ch->lastslot);
-	if (ch->slot[tag].state != SIIS_SLOT_EMPTY)
-		device_printf(ch->dev, "ALL SLOTS BUSY!\n");
+		KASSERT(tag != ch->lastslot, ("siis: ALL SLOTS BUSY!"));
+	}
 	ch->lastslot = tag;
 	/* Occupy chosen slot. */
 	slot = &ch->slot[tag];
@@ -999,6 +996,9 @@
 	struct siis_channel *ch = device_get_softc(dev);
 
 	mtx_assert(&ch->mtx, MA_OWNED);
+	/* Check for stale timeout. */
+	if (slot->state < SIIS_SLOT_RUNNING)
+		return;
 	device_printf(dev, "Timeout on slot %d\n", slot->slot);
 device_printf(dev, "%s is %08x ss %08x rs %08x es %08x sts %08x serr %08x\n",
     __func__, ATA_INL(ch->r_mem, SIIS_P_IS), ATA_INL(ch->r_mem, SIIS_P_SS), ch->rslots,
@@ -1024,8 +1024,6 @@
 	union ccb *ccb = slot->ccb;
 
 	mtx_assert(&ch->mtx, MA_OWNED);
-	/* Cancel command execution timeout */
-	callout_stop(&slot->timeout);
 	bus_dmamap_sync(ch->dma.work_tag, ch->dma.work_map,
 	    BUS_DMASYNC_POSTWRITE);
 	/* Read result registers to the result struct
From mav at FreeBSD.org  Wed Nov  4 16:29:23 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov  4 16:29:30 2009
Subject: PERFORCE change 170179 for review
Message-ID: <200911041629.nA4GTMpb051023@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170179

Change 170179 by mav@mav_mavbook on 2009/11/04 16:28:41

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/UPDATING#20 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#28 integrate
.. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#5 integrate
.. //depot/projects/scottl-camlock/src/secure/usr.bin/bdes/bdes.c#3 integrate
.. //depot/projects/scottl-camlock/src/share/man/man3/tree.3#3 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/at91_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#40 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#51 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#121 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#52 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_log.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_prf.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ata.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/fbio.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/msgbuf.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_fault.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#14 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/UPDATING#20 (text+ko) ====

@@ -537,6 +537,11 @@
 		# Map old usb library to new one for usb2 stack
 		libusb-0.1.so.8	libusb20.so.1
 
+20090209:
+	All USB ethernet devices now attach as interfaces under the name ueN
+	(eg. ue0). This is to provide a predictable name as vendors often
+	change usb chipsets in a product without notice.
+
 20090203:
 	The ichsmb(4) driver has been changed to require SMBus slave
 	addresses be left-justified (xxxxxxx0b) rather than right-justified.
@@ -1047,4 +1052,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $
+$FreeBSD: src/UPDATING,v 1.644 2009/11/03 21:06:19 thompsa Exp $

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#28 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.66 2009/10/31 10:47:47 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.67 2009/11/04 15:24:32 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#5 (text+ko) ====

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.91 2009/10/21 18:31:54 ed Exp $";
+  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.92 2009/11/03 11:41:21 ed Exp $";
 #endif /* not lint */
 
 #include 
@@ -419,14 +419,7 @@
 		warnx("T_dev_T %d != %d", l2, sizeof(*d));
 		return (1);
 	}
-	if ((int)(*d) != -1) {
-		if (minor(*d) > 255 || minor(*d) < 0)
-			printf("{ major = %d, minor = 0x%x }",
-				major(*d), minor(*d));
-		else
-			printf("{ major = %d, minor = %d }",
-				major(*d), minor(*d));
-	}
+	printf("%s", devname(*d, S_IFCHR));
 	return (0);
 }
 

==== //depot/projects/scottl-camlock/src/secure/usr.bin/bdes/bdes.c#3 (text+ko) ====

@@ -81,7 +81,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.10 2008/02/19 07:09:18 ru Exp $");
+__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.11 2009/11/03 18:40:42 jhb Exp $");
 
 #include 
 
@@ -170,11 +170,11 @@
 	int i;				/* counter in a for loop */
 	char *p;			/* used to obtain the key */
 	DES_cblock msgbuf;		/* I/O buffer */
-	int kflag;			/* command-line encryptiooon key */
+	int kflag;			/* command-line encryption key */
 
 	setproctitle("-");		/* Hide command-line arguments */
 
-	/* initialize the initialization vctor */
+	/* initialize the initialization vector */
 	MEMZERO(ivec, 8);
 
 	/* process the argument list */

==== //depot/projects/scottl-camlock/src/share/man/man3/tree.3#3 (text+ko) ====

@@ -28,7 +28,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/share/man/man3/tree.3,v 1.7 2007/12/28 07:03:26 jasone Exp $
+.\" $FreeBSD: src/share/man/man3/tree.3,v 1.8 2009/11/04 04:12:56 benno Exp $
 .\"
 .Dd December 27, 2007
 .Dt TREE 3
@@ -384,7 +384,7 @@
 Finally,
 the
 .Fa CMP
-argument is the name of a function used to compare tree noded
+argument is the name of a function used to compare tree nodes
 with each other.
 The function takes two arguments of type
 .Vt "struct TYPE *" .

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#17 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.176 2009/11/04 01:32:59 attilio Exp $");
 
 #include "opt_cpu.h"
 
@@ -607,6 +607,24 @@
 		printf(", %d lines/tag", (regs[2] >> 8) & 0x0f);
 		print_AMD_l2_assoc((regs[2] >> 12) & 0x0f);	
 	}
+
+	/*
+	 * Opteron Rev E shows a bug as in very rare occasions a read memory 
+	 * barrier is not performed as expected if it is followed by a 
+	 * non-atomic read-modify-write instruction.  
+	 * As long as that bug pops up very rarely (intensive machine usage
+	 * on other operating systems generally generates one unexplainable 
+	 * crash any 2 months) and as long as a model specific fix would be
+	 * impratical at this stage, print out a warning string if the broken
+	 * model and family are identified.
+	 */
+	if (CPUID_TO_FAMILY(cpu_id) == 0xf && CPUID_TO_MODEL(cpu_id) >= 0x20 &&
+	    CPUID_TO_MODEL(cpu_id) <= 0x3f) {
+		printf("WARNING: This architecture revision has known SMP "
+		    "hardware bugs which may cause random instability\n");
+		printf("WARNING: For details see: "
+		    "http://bugzilla.kernel.org/show_bug.cgi?id=11305\n");
+	}
 }
 
 static void

==== //depot/projects/scottl-camlock/src/sys/arm/arm/machdep.c#14 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.34 2009/10/27 10:47:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.35 2009/11/04 04:41:03 alc Exp $");
 
 #include 
 #include 
@@ -77,7 +77,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/arm/at91/at91_machdep.c#5 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_msgbuf.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.6 2009/07/01 20:07:44 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.7 2009/11/04 04:41:03 alc Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include 
@@ -79,7 +79,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#6 (text+ko) ====

@@ -39,7 +39,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.9 2009/10/21 18:44:00 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.10 2009/11/04 04:41:03 alc Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include 
@@ -72,7 +72,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/arm/sa11x0/assabet_machdep.c#15 (text+ko) ====

@@ -47,7 +47,7 @@
 
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.30 2009/07/01 20:07:44 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/assabet_machdep.c,v 1.31 2009/11/04 04:41:03 alc Exp $");
 
 #include "opt_md.h"
 
@@ -82,7 +82,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#20 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.4 2009/11/03 11:19:05 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.6 2009/11/04 16:16:50 mav Exp $");
 
 #include 
 
@@ -378,30 +378,24 @@
 ata_pm_read_cmd(struct ccb_ataio *ataio, int reg, int port)
 {
 	bzero(&ataio->cmd, sizeof(ataio->cmd));
-	ataio->cmd.flags = CAM_ATAIO_48BIT | CAM_ATAIO_NEEDRESULT;
+	ataio->cmd.flags = CAM_ATAIO_NEEDRESULT;
 	ataio->cmd.command = ATA_READ_PM;
 	ataio->cmd.features = reg;
-	ataio->cmd.features_exp = reg >> 8;
 	ataio->cmd.device = port & 0x0f;
 }
 
 void
-ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint64_t val)
+ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint32_t val)
 {
 	bzero(&ataio->cmd, sizeof(ataio->cmd));
-	ataio->cmd.flags = CAM_ATAIO_48BIT | CAM_ATAIO_NEEDRESULT;
+	ataio->cmd.flags = 0;
 	ataio->cmd.command = ATA_WRITE_PM;
 	ataio->cmd.features = reg;
+	ataio->cmd.sector_count = val;
 	ataio->cmd.lba_low = val >> 8;
 	ataio->cmd.lba_mid = val >> 16;
 	ataio->cmd.lba_high = val >> 24;
 	ataio->cmd.device = port & 0x0f;
-	ataio->cmd.lba_low_exp = val >> 40;
-	ataio->cmd.lba_mid_exp = val >> 48;
-	ataio->cmd.lba_high_exp = val >> 56;
-	ataio->cmd.features_exp = reg >> 8;
-	ataio->cmd.sector_count = val;
-	ataio->cmd.sector_count_exp = val >> 32;
 }
 
 void

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#19 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.3 2009/11/03 11:19:05 mav Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.4 2009/11/04 15:24:32 mav Exp $
  */
 
 #ifndef	CAM_ATA_ALL_H

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#40 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.8 2009/10/31 10:43:38 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.10 2009/11/04 15:40:19 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#51 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.11 2009/11/01 11:31:06 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.12 2009/11/04 15:24:32 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.h#21 (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_periph.h,v 1.21 2009/10/31 10:43:38 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_periph.h,v 1.22 2009/11/04 15:40:19 mav Exp $
  */
 
 #ifndef _CAM_CAM_PERIPH_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#121 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.232 2009/11/02 08:31:00 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.233 2009/11/04 15:40:19 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#52 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.242 2009/11/02 23:30:15 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.243 2009/11/04 15:40:19 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/fb/vesa.c,v 1.14 2009/10/23 19:02:53 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fb/vesa.c,v 1.16 2009/11/04 01:00:28 jkim Exp $");
 
 #include "opt_vga.h"
 #include "opt_vesa.h"
@@ -174,10 +174,8 @@
 				   u_char *b, int bits);
 static int vesa_bios_load_palette(int start, int colors, u_char *palette,
 				  int bits);
-#ifdef notyet
 static int vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g,
 				   u_char *b, int bits);
-#endif
 #define STATE_SIZE	0
 #define STATE_SAVE	1
 #define STATE_LOAD	2
@@ -415,9 +413,9 @@
 
 	bits = 8 - bits;
 	for (i = 0; i < colors; ++i) {
-		palette[i*3]     = p[i*4 + 2] << bits;
-		palette[i*3 + 1] = p[i*4 + 1] << bits;
-		palette[i*3 + 2] = p[i*4] << bits;
+		palette[i * 3] = p[i * 4 + 2] << bits;
+		palette[i * 3 + 1] = p[i * 4 + 1] << bits;
+		palette[i * 3 + 2] = p[i * 4] << bits;
 	}
 	x86bios_free(p, colors * 4);
 
@@ -455,9 +453,9 @@
 
 	bits = 8 - bits;
 	for (i = 0; i < colors; ++i) {
-		r[i] = p[i*4 + 2] << bits;
-		g[i] = p[i*4 + 1] << bits;
-		b[i] = p[i*4] << bits;
+		r[i] = p[i * 4 + 2] << bits;
+		g[i] = p[i * 4 + 1] << bits;
+		b[i] = p[i * 4] << bits;
 	}
 	x86bios_free(p, colors * 4);
 
@@ -487,10 +485,10 @@
 
 	bits = 8 - bits;
 	for (i = 0; i < colors; ++i) {
-		p[i*4]	   = palette[i*3 + 2] >> bits;
-		p[i*4 + 1] = palette[i*3 + 1] >> bits;
-		p[i*4 + 2] = palette[i*3] >> bits;
-		p[i*4 + 3] = 0;
+		p[i * 4] = palette[i * 3 + 2] >> bits;
+		p[i * 4 + 1] = palette[i * 3 + 1] >> bits;
+		p[i * 4 + 2] = palette[i * 3] >> bits;
+		p[i * 4 + 3] = 0;
 	}
 	x86bios_intr(®s, 0x10);
 	x86bios_free(p, colors * 4);
@@ -498,7 +496,6 @@
 	return (regs.R_AX != 0x004f);
 }
 
-#ifdef notyet
 static int
 vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g, u_char *b,
 			int bits)
@@ -523,17 +520,16 @@
 
 	bits = 8 - bits;
 	for (i = 0; i < colors; ++i) {
-		p[i*4]	   = b[i] >> bits;
-		p[i*4 + 1] = g[i] >> bits;
-		p[i*4 + 2] = r[i] >> bits;
-		p[i*4 + 3] = 0;
+		p[i * 4] = b[i] >> bits;
+		p[i * 4 + 1] = g[i] >> bits;
+		p[i * 4 + 2] = r[i] >> bits;
+		p[i * 4 + 3] = 0;
 	}
 	x86bios_intr(®s, 0x10);
 	x86bios_free(p, colors * 4);
 
 	return (regs.R_AX != 0x004f);
 }
-#endif
 
 static ssize_t
 vesa_bios_state_buf_size(void)
@@ -702,6 +698,7 @@
 		{ V_MODECOLOR, V_INFO_COLOR, 0 },
 		{ V_MODEGRAPHICS, V_INFO_GRAPHICS, 0 },
 		{ V_MODELFB, V_INFO_LINEAR, 0 },
+		{ V_MODENONVGA, V_INFO_NONVGA, 0 },
 	};
 	int flags;
 	int i;
@@ -1275,7 +1272,8 @@
 	 * the new mode correctly.
 	 */
 	if (VESA_MODE(adp->va_mode)) {
-		if ((*prevvidsw->get_info)(adp, mode, &info) == 0) {
+		if (!VESA_MODE(mode) &&
+		    (*prevvidsw->get_info)(adp, mode, &info) == 0) {
 			int10_set_mode(adp->va_initial_bios_mode);
 			if (adp->va_info.vi_flags & V_INFO_LINEAR)
 				vesa_unmap_buffer(adp->va_buffer,
@@ -1288,7 +1286,7 @@
 	}
 
 	/* we may not need to handle this mode after all... */
-	if ((*prevvidsw->set_mode)(adp, mode) == 0)
+	if (!VESA_MODE(mode) && (*prevvidsw->set_mode)(adp, mode) == 0)
 		return (0);
 
 	/* is the new mode supported? */
@@ -1306,6 +1304,9 @@
 	if (vesa_bios_set_mode(mode | ((info.vi_flags & V_INFO_LINEAR) ? 0x4000 : 0)))
 		return (1);
 
+	if ((vesa_adp_info->v_flags & V_DAC8) != 0)
+		vesa_bios_set_dac(8);
+
 	if (adp->va_info.vi_flags & V_INFO_LINEAR)
 		vesa_unmap_buffer(adp->va_buffer,
 				  vesa_adp_info->v_memsize*64*1024);
@@ -1382,17 +1383,11 @@
 vesa_save_palette(video_adapter_t *adp, u_char *palette)
 {
 	int bits;
-	int error;
 
-	if ((adp == vesa_adp) && (vesa_adp_info->v_flags & V_DAC8)
-	    && VESA_MODE(adp->va_mode)) {
-		bits = vesa_bios_get_dac();
-		error = vesa_bios_save_palette(0, 256, palette, bits);
-		if (error == 0)
-			return (0);
-		if (bits != 6)
-			return (error);
-	}
+	if ((adp == vesa_adp) &&
+	    (adp->va_info.vi_flags & V_INFO_NONVGA) != 0 &&
+	    (bits = vesa_bios_get_dac()) >= 6)
+		return (vesa_bios_save_palette(0, 256, palette, bits));
 
 	return ((*prevvidsw->save_palette)(adp, palette));
 }
@@ -1400,19 +1395,12 @@
 static int
 vesa_load_palette(video_adapter_t *adp, u_char *palette)
 {
-#ifdef notyet
 	int bits;
-	int error;
 
-	if ((adp == vesa_adp) && (vesa_adp_info->v_flags & V_DAC8) 
-	    && VESA_MODE(adp->va_mode) && ((bits = vesa_bios_set_dac(8)) > 6)) {
-		error = vesa_bios_load_palette(0, 256, palette, bits);
-		if (error == 0)
-			return (0);
-		if (vesa_bios_set_dac(6) != 6)
-			return (1);
-	}
-#endif /* notyet */
+	if ((adp == vesa_adp) &&
+	    (adp->va_info.vi_flags & V_INFO_NONVGA) != 0 &&
+	    (bits = vesa_bios_get_dac()) >= 6)
+		return (vesa_bios_load_palette(0, 256, palette, bits));
 
 	return ((*prevvidsw->load_palette)(adp, palette));
 }
@@ -1482,6 +1470,8 @@
 		    (flags & V_INFO_LINEAR) != 0)
 			mode |= 0x4000;
 		(void)vesa_bios_set_mode(mode);
+		if ((vesa_adp_info->v_flags & V_DAC8) != 0)
+			(void)vesa_bios_set_dac(8);
 		(void)(*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1);
 	}
 
@@ -1637,14 +1627,11 @@
 		return (1);
 	if ((base + count) > 256)
 		return (1);
-	if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode))
+	if ((adp->va_info.vi_flags & V_INFO_NONVGA) == 0 ||
+	    (bits = vesa_bios_get_dac()) < 6)
 		return (1);
 
-	bits = vesa_bios_get_dac();
-	if (bits <= 6)
-		return (1);
-
-	r = malloc(count*3, M_DEVBUF, M_WAITOK);
+	r = malloc(count * 3, M_DEVBUF, M_WAITOK);
 	g = r + count;
 	b = g + count;
 	error = vesa_bios_save_palette2(base, count, r, g, b, bits);
@@ -1659,7 +1646,6 @@
 	}
 	free(r, M_DEVBUF);
 
-	/* if error && bits != 6 at this point, we are in trouble... XXX */
 	return (error);
 }
 
@@ -1667,8 +1653,6 @@
 set_palette(video_adapter_t *adp, int base, int count,
 	    u_char *red, u_char *green, u_char *blue, u_char *trans)
 {
-	return (1);
-#ifdef notyet
 	u_char *r;
 	u_char *g;
 	u_char *b;
@@ -1677,11 +1661,11 @@
 
 	if ((base < 0) || (base >= 256) || (base + count > 256))
 		return (1);
-	if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode)
-		|| ((bits = vesa_bios_set_dac(8)) <= 6))
+	if ((adp->va_info.vi_flags & V_INFO_NONVGA) == 0 ||
+	    (bits = vesa_bios_get_dac()) < 6)
 		return (1);
 
-	r = malloc(count*3, M_DEVBUF, M_WAITOK);
+	r = malloc(count * 3, M_DEVBUF, M_WAITOK);
 	g = r + count;
 	b = g + count;
 	copyin(red, r, count);
@@ -1690,13 +1674,8 @@
 
 	error = vesa_bios_load_palette2(base, count, r, g, b, bits);
 	free(r, M_DEVBUF);
-	if (error == 0)
-		return (0);
 
-	/* if the following call fails, we are in trouble... XXX */
-	vesa_bios_set_dac(6);
-	return (1);
-#endif /* notyet */
+	return (error);
 }
 
 static int

==== //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#5 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/fb/vgareg.h,v 1.9 2008/09/27 08:51:18 ed Exp $
+ * $FreeBSD: src/sys/dev/fb/vgareg.h,v 1.10 2009/11/04 00:58:20 jkim Exp $
  */
 
 #ifndef _DEV_FB_VGAREG_H_
@@ -70,6 +70,7 @@
 typedef struct vga_softc {
 	struct video_adapter	*adp;
 	void			*state_buf;
+	void			*pal_buf;
 #ifdef FB_INSTALL_CDEV
 	genfb_softc_t		gensc;
 #endif

==== //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#17 (text+ko) ====

@@ -51,7 +51,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.324 2009/10/27 17:14:22 jh Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/fdc/fdc.c,v 1.325 2009/11/03 19:05:05 jh Exp $");
 
 #include "opt_fdc.h"
 
@@ -1734,6 +1734,10 @@
 	if ((error = bus_generic_detach(dev)))
 		return (error);
 
+	if (fdc->fdc_intr)
+		bus_teardown_intr(dev, fdc->res_irq, fdc->fdc_intr);
+	fdc->fdc_intr = NULL;
+
 	/* kill worker thread */
 	mtx_lock(&fdc->fdc_mtx);
 	fdc->flags |= FDC_KTHREAD_EXIT;
@@ -2031,15 +2035,22 @@
 	return (0);
 }
 
+static void
+fd_detach_geom(void *arg, int flag)
+{
+	struct	fd_data *fd = arg;
+
+	g_topology_assert();
+	g_wither_geom(fd->fd_geom, ENXIO);
+}
+
 static int
 fd_detach(device_t dev)
 {
 	struct	fd_data *fd;
 
 	fd = device_get_softc(dev);
-	g_topology_lock();
-	g_wither_geom(fd->fd_geom, ENXIO);
-	g_topology_unlock();
+	g_waitfor_event(fd_detach_geom, fd, M_WAITOK, NULL);
 	while (device_get_state(dev) == DS_BUSY)
 		tsleep(fd, PZERO, "fdd", hz/10);
 	callout_drain(&fd->toffhandle);

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#15 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.7 2009/11/03 12:03:13 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.8 2009/11/04 15:10:46 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#21 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.476 2009/10/23 18:53:21 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.477 2009/11/03 20:22:09 jkim Exp $");
 
 #include "opt_compat.h"
 #include "opt_syscons.h"
@@ -414,6 +414,9 @@
 #endif
 	    sc_set_graphics_mode(scp, NULL, vmode);
 	    sc_set_pixel_mode(scp, NULL, 0, 0, 16, 8);
+#ifndef SC_NO_PALETTE_LOADING
+	    vidd_save_palette(sc->adp, sc->palette);
+#endif
 	    sc->initial_mode = vmode;
 #ifdef DEV_SPLASH
 	    /* put up the splash again! */

==== //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#9 (text+ko) ====

@@ -15,7 +15,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_urtw.c,v 1.13 2009/10/18 00:11:49 weongyo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_urtw.c,v 1.14 2009/11/03 21:47:07 weongyo Exp $");
 #include 
 #include 
 #include 
@@ -1688,7 +1688,7 @@
 		ieee80211_radiotap_tx(vap, m0);
 	}
 
-	if ((wh->i_fc[10] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_MGT ||
+	if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_MGT ||
 	    (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) {
 		tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)];
 		rate = tp->mgmtrate;

==== //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#21 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.203 2009/09/10 17:27:36 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.204 2009/11/04 01:32:59 attilio Exp $");
 
 #include "opt_cpu.h"
 
@@ -1303,6 +1303,24 @@
 			    (amd_whcr & 0x0100) ? "Enable" : "Disable");
 		}
 	}
+
+	/*
+	 * Opteron Rev E shows a bug as in very rare occasions a read memory
+	 * barrier is not performed as expected if it is followed by a
+	 * non-atomic read-modify-write instruction.
+	 * As long as that bug pops up very rarely (intensive machine usage
+	 * on other operating systems generally generates one unexplainable
+	 * crash any 2 months) and as long as a model specific fix would be
+	 * impratical at this stage, print out a warning string if the broken
+	 * model and family are identified.
+	 */
+	if (CPUID_TO_FAMILY(cpu_id) == 0xf && CPUID_TO_MODEL(cpu_id) >= 0x20 &&
+	    CPUID_TO_MODEL(cpu_id) <= 0x3f) {
+		printf("WARNING: This architecture revision has known SMP "
+		    "hardware bugs which may cause random instability\n");
+		printf("WARNING: For details see: "
+		    "http://bugzilla.kernel.org/show_bug.cgi?id=11305\n");
+	}
 }
 
 static void

==== //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/isa/vga_isa.c,v 1.35 2007/12/29 23:26:59 wkoszek Exp $");
+__FBSDID("$FreeBSD: src/sys/isa/vga_isa.c,v 1.36 2009/11/04 00:58:20 jkim Exp $");
 
 #include "opt_vga.h"
 #include "opt_fb.h"
@@ -179,17 +179,33 @@
 	nbytes = vidd_save_state(sc->adp, NULL, 0);
 	if (nbytes <= 0)
 		return (0);
-	sc->state_buf = malloc(nbytes, M_TEMP, M_NOWAIT | M_ZERO);
-	if (sc->state_buf == NULL)
-		return (0);
-	if (bootverbose)
-		device_printf(dev, "saving %d bytes of video state\n", nbytes);
-	if (vidd_save_state(sc->adp, sc->state_buf, nbytes) != 0) {
-		device_printf(dev, "failed to save state (nbytes=%d)\n",
-		    nbytes);
-		free(sc->state_buf, M_TEMP);
-		sc->state_buf = NULL;
+	sc->state_buf = malloc(nbytes, M_TEMP, M_NOWAIT);
+	if (sc->state_buf != NULL) {
+		if (bootverbose)
+			device_printf(dev, "saving %d bytes of video state\n",
+			    nbytes);
+		if (vidd_save_state(sc->adp, sc->state_buf, nbytes) != 0) {
+			device_printf(dev, "failed to save state (nbytes=%d)\n",
+			    nbytes);
+			free(sc->state_buf, M_TEMP);
+			sc->state_buf = NULL;
+		}
+	}
+
+	/* Save the color palette across the suspend. */
+	if (sc->pal_buf != NULL)
+		free(sc->pal_buf, M_TEMP);
+	sc->pal_buf = malloc(256 * 3, M_TEMP, M_NOWAIT);
+	if (sc->pal_buf != NULL) {
+		if (bootverbose)
+			device_printf(dev, "saving color palette\n");
+		if (vidd_save_palette(sc->adp, sc->pal_buf) != 0) {
+			device_printf(dev, "failed to save palette\n");
+			free(sc->pal_buf, M_TEMP);
+			sc->pal_buf = NULL;
+		}
 	}
+
 	return (0);
 }
 
@@ -205,6 +221,12 @@
 		free(sc->state_buf, M_TEMP);
 		sc->state_buf = NULL;
 	}
+	if (sc->pal_buf != NULL) {
+		if (vidd_load_palette(sc->adp, sc->pal_buf) != 0)
+			device_printf(dev, "failed to reload palette\n");
+		free(sc->pal_buf, M_TEMP);
+		sc->pal_buf = NULL;
+	}
 
 	bus_generic_resume(dev);
 	return 0;

==== //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#12 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/kern_idle.c,v 1.54 2008/03/16 10:58:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_idle.c,v 1.55 2009/11/03 16:46:52 attilio Exp $");
 
 #include 
 #include 
@@ -74,10 +74,9 @@
 		if (error)
 			panic("idle_setup: kproc_create error %d\n", error);
 
-		p->p_flag |= P_NOLOAD;
 		thread_lock(td);
 		TD_SET_CAN_RUN(td);
-		td->td_flags |= TDF_IDLETD;
+		td->td_flags |= TDF_IDLETD | TDF_NOLOAD;
 		sched_class(td, PRI_IDLE);
 		sched_prio(td, PRI_MAX_IDLE);
 		thread_unlock(td);

==== //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#21 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.174 2009/10/15 18:51:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.175 2009/11/03 16:46:52 attilio Exp $");
 
 #include "opt_ddb.h"
 
@@ -1061,6 +1061,7 @@
 swi_add(struct intr_event **eventp, const char *name, driver_intr_t handler,
 	    void *arg, int pri, enum intr_type flags, void **cookiep)
 {
+	struct thread *td;
 	struct intr_event *ie;
 	int error;
 
@@ -1085,11 +1086,10 @@
 	if (error)
 		return (error);
 	if (pri == SWI_CLOCK) {
-		struct proc *p;
-		p = ie->ie_thread->it_thread->td_proc;
-		PROC_LOCK(p);
-		p->p_flag |= P_NOLOAD;
-		PROC_UNLOCK(p);
+		td = ie->ie_thread->it_thread;
+		thread_lock(td);
+		td->td_flags |= TDF_NOLOAD;
+		thread_unlock(td);
 	}
 	return (0);
 }

==== //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#19 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.131 2009/01/25 07:35:10 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.132 2009/11/03 16:46:52 attilio Exp $");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
@@ -728,10 +728,10 @@
 	thread_lock(td);
 	td->td_estcpu = ESTCPULIM(td->td_estcpu + child->td_estcpu);
 	thread_unlock(td);
-	mtx_lock_spin(&sched_lock);
-	if ((child->td_proc->p_flag & P_NOLOAD) == 0)
+	thread_lock(child);
+	if ((child->td_flags & TDF_NOLOAD) == 0)
 		sched_load_rem();
-	mtx_unlock_spin(&sched_lock);
+	thread_unlock(child);
 }
 
 void
@@ -937,7 +937,7 @@
 		thread_unlock(td);
 	}
 
-	if ((p->p_flag & P_NOLOAD) == 0)
+	if ((td->td_flags & TDF_NOLOAD) == 0)
 		sched_load_rem();
 
 	if (newtd)
@@ -980,7 +980,7 @@
 			("trying to run inhibited thread"));
 		newtd->td_flags |= TDF_DIDRUN;
         	TD_SET_RUNNING(newtd);
-		if ((newtd->td_proc->p_flag & P_NOLOAD) == 0)
+		if ((newtd->td_flags & TDF_NOLOAD) == 0)
 			sched_load_add();
 	} else {
 		newtd = choosethread();
@@ -1289,7 +1289,7 @@
 		}
 	}
 
-	if ((td->td_proc->p_flag & P_NOLOAD) == 0)
+	if ((td->td_flags & TDF_NOLOAD) == 0)
 		sched_load_add();
 	runq_add(ts->ts_runq, td, flags);
 	if (cpu != NOCPU)
@@ -1338,7 +1338,7 @@
 		if (maybe_preempt(td))
 			return;
 	}
-	if ((td->td_proc->p_flag & P_NOLOAD) == 0)
+	if ((td->td_flags & TDF_NOLOAD) == 0)
 		sched_load_add();
 	runq_add(ts->ts_runq, td, flags);
 	maybe_resched(td);
@@ -1360,7 +1360,7 @@
 	    "prio:%d", td->td_priority, KTR_ATTR_LINKED,
 	    sched_tdname(curthread));
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From mav at FreeBSD.org  Wed Nov  4 16:44:38 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov  4 16:44:45 2009
Subject: PERFORCE change 170182 for review
Message-ID: <200911041644.nA4Gic3Y052181@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170182

Change 170182 by mav@mav_mavbook on 2009/11/04 16:44:34

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#20 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#20 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.4 2009/11/04 15:24:32 mav Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.5 2009/11/04 16:37:13 mav Exp $
  */
 
 #ifndef	CAM_ATA_ALL_H
@@ -104,7 +104,7 @@
     uint64_t lba, uint16_t sector_count);
 void	ata_reset_cmd(struct ccb_ataio *ataio);
 void	ata_pm_read_cmd(struct ccb_ataio *ataio, int reg, int port);
-void	ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint64_t val);
+void	ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint32_t val);
 
 void	ata_bswap(int8_t *buf, int len);
 void	ata_btrim(int8_t *buf, int len);
From mav at FreeBSD.org  Wed Nov  4 18:39:34 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov  4 18:39:42 2009
Subject: PERFORCE change 170193 for review
Message-ID: <200911041839.nA4IdYrl073191@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170193

Change 170193 by mav@mav_mavbook on 2009/11/04 18:39:11

	Implement device stats accounting for ATA commands.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#40 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#40 (text+ko) ====

@@ -898,7 +898,8 @@
 	 * If the user has supplied a stats structure, and if we understand
 	 * this particular type of ccb, record the transaction start.
 	 */
-	if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO))
+	if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO ||
+	    ccb->ccb_h.func_code == XPT_ATA_IO))
 		devstat_start_transaction(ds, NULL);
 
 	xpt_action(ccb);
@@ -921,15 +922,27 @@
 				 /* timeout */0,
 				 /* getcount_only */ FALSE);
 
-	if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO))
-		devstat_end_transaction(ds,
+	if (ds != NULL) {
+		if (ccb->ccb_h.func_code == XPT_SCSI_IO) {
+			devstat_end_transaction(ds,
 					ccb->csio.dxfer_len,
-					ccb->csio.tag_action & 0xf,
+					ccb->csio.tag_action & 0x3,
+					((ccb->ccb_h.flags & CAM_DIR_MASK) ==
+					CAM_DIR_NONE) ?  DEVSTAT_NO_DATA : 
+					(ccb->ccb_h.flags & CAM_DIR_OUT) ?
+					DEVSTAT_WRITE : 
+					DEVSTAT_READ, NULL, NULL);
+		} else if (ccb->ccb_h.func_code == XPT_ATA_IO) {
+			devstat_end_transaction(ds,
+					ccb->ataio.dxfer_len,
+					ccb->ataio.tag_action & 0x3,
 					((ccb->ccb_h.flags & CAM_DIR_MASK) ==
 					CAM_DIR_NONE) ?  DEVSTAT_NO_DATA : 
 					(ccb->ccb_h.flags & CAM_DIR_OUT) ?
 					DEVSTAT_WRITE : 
 					DEVSTAT_READ, NULL, NULL);
+		}
+	}
 
 	return(error);
 }
From trasz at FreeBSD.org  Thu Nov  5 00:57:54 2009
From: trasz at FreeBSD.org (Edward Tomasz Napierala)
Date: Thu Nov  5 00:58:01 2009
Subject: PERFORCE change 170207 for review
Message-ID: <200911050057.nA50vrWd027560@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170207

Change 170207 by trasz@trasz_victim on 2009/11/05 00:57:37

	Be rational.  Instead of inventing two different semantics for VAPPEND,
	just stick to the notion that VAPPEND is just a modifier for VWRITE.
	Add a few KASSERTs to make sure this is the case.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#10 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#52 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#18 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#42 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#19 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#10 (text+ko) ====

@@ -80,6 +80,13 @@
 To check for other flags, one has to use
 .Fn VOP_ACCESSX
 instead.
+.Pp
+The
+.Dv VAPPEND
+flag may only be set if
+.Dv
+VWRITE
+flag is set.
 .Sh LOCKS
 The vnode will be locked on entry and should remain locked on return.
 .Sh RETURN VALUES

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#52 (text+ko) ====

@@ -82,6 +82,13 @@
 			access_mask |= accmode2mask[i].mask;
 	}
 
+	/*
+	 * VAPPEND is just a modifier for VWRITE; if the caller asked
+	 * for 'VAPPEND | VWRITE', we want to check for ACL_APPEND_DATA only.
+	 */
+	if (access_mask & ACL_APPEND_DATA)
+		access_mask &= ~ACL_WRITE_DATA;
+
 	return (access_mask);
 }
 
@@ -156,6 +163,9 @@
 	int denied, explicitly_denied, access_mask, is_directory,
 	    must_be_owner = 0;
 
+	KASSERT((accmode & VAPPEND) == 0 || (accmode & VWRITE),
+	    	("VAPPEND without VWRITE"));
+
 	if (privused != NULL)
 		*privused = 0;
 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#18 (text+ko) ====

@@ -63,6 +63,8 @@
 
 	KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND)) == 0,
 	    ("invalid bit in accmode"));
+	KASSERT((accmode & VAPPEND) == 0 || (accmode & VWRITE),
+	    	("VAPPEND without VWRITE"));
 
 	/*
 	 * Look for a normal, non-privileged way to access the file/directory

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#42 (text+ko) ====

@@ -3522,6 +3522,8 @@
 
 	KASSERT((accmode & ~(VEXEC | VWRITE | VREAD | VADMIN | VAPPEND)) == 0,
 	    ("invalid bit in accmode"));
+	KASSERT((accmode & VAPPEND) == 0 || (accmode & VWRITE),
+	    	("VAPPEND without VWRITE"));
 
 	/*
 	 * Look for a normal, non-privileged way to access the file/directory

==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#19 (text+ko) ====

@@ -469,7 +469,7 @@
 		 * XXX: Fix the comment above.
 		 */
 		if (flags & WILLBEDIR)
-			error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread);
+			error = VOP_ACCESSX(vdp, VWRITE | VAPPEND, cred, cnp->cn_thread);
 		else
 			error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread);
 		if (error)
@@ -604,7 +604,7 @@
 	 */
 	if (nameiop == RENAME && (flags & ISLASTCN)) {
 		if (flags & WILLBEDIR)
-			error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread);
+			error = VOP_ACCESSX(vdp, VWRITE | VAPPEND, cred, cnp->cn_thread);
 		else
 			error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread);
 		if (error)
@@ -637,7 +637,7 @@
 		 * of EACCESS.
 		 */
 		if (tdp->v_type == VDIR)
-			error = VOP_ACCESSX(vdp, VAPPEND, cred, cnp->cn_thread);
+			error = VOP_ACCESSX(vdp, VWRITE | VAPPEND, cred, cnp->cn_thread);
 		else
 			error = VOP_ACCESS(vdp, VWRITE, cred, cnp->cn_thread);
 		if (error) {
From truncs at FreeBSD.org  Thu Nov  5 10:38:36 2009
From: truncs at FreeBSD.org (Aditya Sarawgi)
Date: Thu Nov  5 10:38:42 2009
Subject: PERFORCE change 170221 for review
Message-ID: <200911051038.nA5AcZbE000160@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170221

Change 170221 by truncs@aditya on 2009/11/05 10:38:02

	Apply locks to ext2_itimes.
	Sync with r198940
	 Map on core EXT2_NODUMP t UF_NODUMP
	 Use APPEND, IMMUTABLE instead of SF_APPEND, SF_IMMUTABLE since APPEND and
	 IMMUTABLE masks bits of UF_APPEND and UF_IMMUTABLE.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#4 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#4 (text+ko) ====

@@ -86,6 +86,7 @@
 	ip->i_flags = 0;
 	ip->i_flags |= (ei->e2di_flags & EXT2_APPEND) ? SF_APPEND : 0;
 	ip->i_flags |= (ei->e2di_flags & EXT2_IMMUTABLE) ? SF_IMMUTABLE : 0;
+	ip->i_flags |= (ei->e2di_flags & EXT2_NODUMP) ? UF_NODUMP : 0;
 	ip->i_blocks = ei->e2di_nblock;
 	ip->i_gen = ei->e2di_gen;
 	ip->i_uid = ei->e2di_uid;
@@ -124,6 +125,7 @@
 	ei->e2di_flags = 0;
 	ei->e2di_flags |= (ip->i_flags & SF_APPEND) ? EXT2_APPEND: 0;
 	ei->e2di_flags |= (ip->i_flags & SF_IMMUTABLE) ? EXT2_IMMUTABLE: 0;
+	ei->e2di_flags |= (ip->i_flags & UF_NODUMP) ? EXT2_NODUMP: 0;
 	ei->e2di_nblock = ip->i_blocks;
 	ei->e2di_gen = ip->i_gen;
 	ei->e2di_uid = ip->i_uid;

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#4 (text+ko) ====

@@ -177,13 +177,14 @@
 	0, DIRBLKSIZ - 12, 2, EXT2_FT_UNKNOWN, ".."
 };
 
-void
-ext2_itimes(vp)
-	struct vnode *vp;
+static void
+ext2_itimes_locked(struct vnode *vp)
 {
 	struct inode *ip;
 	struct timespec ts;
 
+	ASSERT_VI_LOCKED(vp, __func__);	
+
 	ip = VTOI(vp);
 	if ((ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_UPDATE)) == 0)
 		return;
@@ -210,6 +211,15 @@
 	ip->i_flag &= ~(IN_ACCESS | IN_CHANGE | IN_UPDATE);
 }
 
+void
+ext2_itimes(struct vnode *vp)
+{
+
+	VI_LOCK(vp);
+	ext2_itimes_locked(vp);
+	VI_UNLOCK(vp);
+}
+
 /*
  * Create a regular file
  */
@@ -248,7 +258,7 @@
 	/*
 	 * Files marked append-only must be opened for appending.
 	 */
-	if ((VTOI(ap->a_vp)->i_flags & SF_APPEND) &&
+	if ((VTOI(ap->a_vp)->i_flags & APPEND) &&
 	    (ap->a_mode & (FWRITE | O_APPEND)) == FWRITE)
 		return (EPERM);
 
@@ -392,11 +402,9 @@
 	if (vap->va_flags != VNOVAL) {
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
 			return (EROFS);
-		/* 
-		 * Deny setting of UF flags
-		 */
-		if(vap->va_flags & UF_SETTABLE)
-			return(EOPNOTSUPP);	
+		/* Disallow flags not supported by ext2fs. */
+		if(vap->va_flags & ~(SF_APPEND | SF_IMMUTABLE | UF_NODUMP))
+			return(EOPNOTSUPP);
 		/*
 		 * Callers may only modify the file flags on objects they
 		 * have VADMIN rights for.
@@ -425,10 +433,10 @@
 			ip->i_flags &= SF_SETTABLE;
 		}
 		ip->i_flag |= IN_CHANGE;
-		if (vap->va_flags & (SF_IMMUTABLE | SF_APPEND))
+		if (vap->va_flags & (IMMUTABLE | APPEND))
 			return (0);
 	}
-	if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND))
+	if (ip->i_flags & (IMMUTABLE | APPEND))
 		return (EPERM);
 	/*
 	 * Go through the fields and update iff not VNOVAL.
@@ -677,8 +685,8 @@
 	int error;
 
 	ip = VTOI(vp);
-	if ((ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) ||
-	    (VTOI(dvp)->i_flags & SF_APPEND)) {
+	if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) ||
+	    (VTOI(dvp)->i_flags & APPEND)) {
 		error = EPERM;
 		goto out;
 	}
@@ -721,7 +729,7 @@
 		error = EMLINK;
 		goto out;
 	}
-	if (ip->i_flags & (SF_IMMUTABLE | SF_APPEND)) {
+	if (ip->i_flags & (IMMUTABLE | APPEND)) {
 		error = EPERM;
 		goto out;
 	}
@@ -740,7 +748,27 @@
 
 /*
  * Rename system call.
- *   See comments in sys/ufs/ufs/ufs_vnops.c
+ * 	rename("foo", "bar");
+ * is essentially
+ *	unlink("bar");
+ *	link("foo", "bar");
+ *	unlink("foo");
+ * but ``atomically''.  Can't do full commit without saving state in the
+ * inode on disk which isn't feasible at this time.  Best we can do is
+ * always guarantee the target exists.
+ *
+ * Basic algorithm is:
+ *
+ * 1) Bump link count on source while we're linking it to the
+ *    target.  This also ensure the inode won't be deleted out
+ *    from underneath us while we work (it may be truncated by
+ *    a concurrent `trunc' or `open' for creation).
+ * 2) Link source to destination.  If destination already exists,
+ *    delete it first.
+ * 3) Unlink source reference to inode if still around. If a
+ *    directory was moved and the parent of the destination
+ *    is different from the source, patch the ".." entry in the
+ *    directory.
  */
 static int
 ext2_rename(ap)
@@ -788,8 +816,8 @@
 		return (error);
 	}
 
-	if (tvp && ((VTOI(tvp)->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) ||
-	    (VTOI(tdvp)->i_flags & SF_APPEND))) {
+	if (tvp && ((VTOI(tvp)->i_flags & (NOUNLINK | IMMUTABLE | APPEND)) ||
+	    (VTOI(tdvp)->i_flags & APPEND))) {
 		error = EPERM;
 		goto abortit;
 	}
@@ -813,8 +841,8 @@
  		error = EMLINK;
  		goto abortit;
  	}
-	if ((ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND))
-	    || (dp->i_flags & SF_APPEND)) {
+	if ((ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND))
+	    || (dp->i_flags & APPEND)) {
 		VOP_UNLOCK(fvp, 0);
 		error = EPERM;
 		goto abortit;
@@ -1269,8 +1297,8 @@
 		error = ENOTEMPTY;
 		goto out;
 	}
-	if ((dp->i_flags & SF_APPEND)
-	    || (ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND))) {
+	if ((dp->i_flags & APPEND)
+	    || (ip->i_flags & (NOUNLINK | IMMUTABLE | APPEND))) {
 		error = EPERM;
 		goto out;
 	}
From truncs at FreeBSD.org  Thu Nov  5 15:17:15 2009
From: truncs at FreeBSD.org (Aditya Sarawgi)
Date: Thu Nov  5 15:17:22 2009
Subject: PERFORCE change 170226 for review
Message-ID: <200911051517.nA5FHEJn035517@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170226

Change 170226 by truncs@aditya on 2009/11/05 15:17:12

	Build fixes.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#16 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#8 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#9 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#5 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_alloc.c#16 (text+ko) ====

@@ -736,7 +736,7 @@
 	if (ipref == -1)
 		ipref = 0;
 	fs = ip->i_e2fs;
-	ump = ip_i_ump;
+	ump = ip->i_ump;
 	if (fs->e2fs_gd[cg].ext2bgd_nifree == 0)
 		return (0);
 	EXT2_UNLOCK(ump);	

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_balloc.c#8 (text+ko) ====

@@ -48,7 +48,7 @@
 #include 
 #include 
 #include 
-
+#include 
 /*
  * Balloc defines the structure of file system storage
  * by allocating the physical blocks on a device given
@@ -135,7 +135,7 @@
 				nsize = fragroundup(fs, size);
 			else
 				nsize = fs->e2fs_bsize;
-			EXT2_LOCK(ump);	
+			EXT2_LOCK(ump);
 			error = ext2_alloc(ip, lbn,
 			    ext2_blkpref(ip, lbn, (int)lbn, &ip->i_db[0], 0),
 			    nsize, cred, &newb);
@@ -180,7 +180,7 @@
 		   after i_db[11], but it's not utterly clear whether this also
 		   applies to i_ib[1] and i_ib[0]
 		*/
-		
+
 		EXT2_LOCK(ump);
 		pref = ext2_blkpref(ip, lbn, indirs[0].in_off + 
 					     EXT2_NDIR_BLOCKS, &ip->i_db[0], 0);
@@ -232,7 +232,7 @@
 			 */
 			pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap,
 						bp->b_lblkno);
-#else			
+#else
 			EXT2_LOCK(ump);
 			pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0);
 #endif

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vfsops.c#9 (text+ko) ====

@@ -876,6 +876,7 @@
 	vp->v_data = ip;
 	ip->i_vnode = vp;
 	ip->i_e2fs = fs = ump->um_e2fs;
+	ip->i_ump  = ump;
 	ip->i_number = ino;
 
 	lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL);

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#5 (text+ko) ====

@@ -63,6 +63,7 @@
 struct inode {
 	struct	vnode  *i_vnode;/* Vnode associated with this inode. */
 	struct	vnode  *i_devvp;/* Vnode for block I/O. */
+	struct	ext2mount *i_ump;
 	u_int32_t i_flag;	/* flags, see below */
 	ino_t	  i_number;	/* The identity of the inode. */
 
@@ -140,7 +141,8 @@
 #define	IN_HASHED	0x0020		/* Inode is on hash list */
 #define	IN_LAZYMOD	0x0040		/* Modified, but don't write yet. */
 #define	IN_SPACECOUNTED	0x0080		/* Blocks to be freed in free count. */
-
+#define IN_LAZYACCESS   0x0100		/* Process IN_ACCESS after the
+					    suspension finished */
 #ifdef _KERNEL
 /*
  * Structure used to pass around logical block paths generated by
From pgj at FreeBSD.org  Thu Nov  5 20:23:25 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Thu Nov  5 20:23:31 2009
Subject: PERFORCE change 170239 for review
Message-ID: <200911052023.nA5KNOxf073311@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170239

Change 170239 by pgj@beehive on 2009/11/05 20:23:23

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#27 integrate
.. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#13 integrate
.. //depot/projects/docproj_hu/www/en/internal/i18n.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/projects/projects.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/where.sgml#4 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#16 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#16 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#3 integrate
.. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#10 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#27 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.63 2009/08/24 18:50:35 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.65 2009/11/05 12:35:43 remko Exp $
     
   
 
@@ -3016,4 +3016,40 @@
       Source project it sells products for.
     
   
+
+  
+    Mejo Jose
+    http://www.kannayath.com
+    
+      Open source technology consultant based in Dubai, UAE.  More
+      information on the website -
+      www.kannayath.com
+    
+  
+
+  
+    Interfuture Systems Ltd
+    http://www.interfuture.co.uk
+    
+      Interfuture is an UK company offering a full range of UNIX
+      consultancy, from desktop installation and support through to
+      mission-critical server support and troubleshooting. One of our
+      specialist areas and preferred operating systems is FreeBSD.
+      Visit our website for more information:
+      http://www.interfuture.co.uk/specialists/unix.php
+      or call +44 203 002 2111.
+    
+  
+
+  
+    Sense of Security Pty Ltd
+    http://www.senseofsecurity.com.au/
+    
+      Sense of Security is an Australian provider of Free BSD and Unix
+      consulting services. We have a strong focus on building secure
+      networks and systems, including firewalls, VPNs, web servers, etc.
+      We are also experts at conducting security review, audit,
+      penetration testing, and assessment services.
+    
+  
 

==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#16 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.49 2009/08/14 07:00:23 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.52 2009/11/05 12:39:39 remko Exp $
     
   
 
@@ -1012,4 +1012,59 @@
       Brand or custom hardware and network equipments.
     
   
+
+  
+    SevenL Networks Inc.
+    https://www.sevenl.net
+    
+      SevenL Networks Inc. providing
+      affordable
+	FreeBSD dedicated server hosting, VPS, managed web server
+      offerings, colocation, data center space and other hosting services
+      since 2003. SevenL currently hosts server infrastructure for Gentoo,
+      Arch Linux, Linux Mint, CentOS, Startcom Linux and a number of open
+      source software projects. SevenL Networks is located in Toronto,
+      Canada.
+    
+  
+
+  
+    Argentina.com
+    http://www.argentina.com
+    
+      Argentina.com is an Argentina
+      based Hosting and e-mail provider with FreeBSD infrastructure and
+      Globalcrossing connectivity.  We offer FreeBSD-stable dedicated
+      servers with great connectivity, Shared hosting on Plesk for FreeBSD,
+      and Corporate FreeBSD based email hosting.
+    
+  
+
+  
+    SkilTech, Inc.
+    http://www.skiltech.com
+    
+      SkilTech Web Design and Hosting, based in Elkton, MD, has been
+      offering FreeBSD based hosting since 1998. Both shared and dedicated
+      web hosting solutions are available, and unlike many larger firms,
+      we can work with our customers to address their individual hosting
+      needs.
+    
+  
+
+  
+    Ermis | Domeinruimte
+    http://www.ermis.nl
+    
+      Ermis | Domeinruimte has been hosting websites since 2004 on FreeBSD
+      servers, but also offer anti-spam services, backup MX, handle domain
+      name registrations and offer IT services to our corporate clients.
+      We strive to bring the best service for the lowest price.  Since we
+      are based in Rotterdam (the Netherlands) all our services are
+      available primarily in Dutch, where possible but also offer services
+      in English for our international clients.  We colocated our
+      infrastructure in a climate neutral datacenter and our servers'
+      energy consumption is remarkably low but retain performance.
+    
+  
 

==== //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.software.xml,v 1.11 2009/02/26 20:48:10 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.software.xml,v 1.12 2009/11/05 12:30:58 remko Exp $
     
   
 
@@ -1997,4 +1997,20 @@
 	href='http://www.advsofteng.com/download.html'>http://www.advsofteng.com/download.html.
     
   
+
+  
+    Lingua-Systems Software GmbH
+    http://www.lingua-systems.com
+    
+      Lingua-Systems is dedicated to providing high-quality, Unix-based
+      software solutions for natural language processing that fulfill
+      the principles of simplicity and efficiency and are developed with
+      passion founded on solid research.  All our
+      products,
+      including the
+      "lid" language identifier,
+      are available for FreeBSD.  For more information, visit our website:
+      http://www.lingua-systems.com/.
+    
+  
 

==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#10 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.82 2009/11/05 12:24:41 remko Exp $
     
   
 
@@ -596,7 +596,7 @@
 
   
     The Berkeley Unix User Group
-    http://www.weak.org/buug
+    http://www.buug.org
     The Berkeley Unix User Group is a general Unix Users
       Group for anyone in the San Fransico Bay Area.  We meet on a
       weekly basis in downtown Berkeley.  Visit the web site or send a
From pgj at FreeBSD.org  Thu Nov  5 21:05:13 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Thu Nov  5 21:05:20 2009
Subject: PERFORCE change 170242 for review
Message-ID: <200911052105.nA5L5CvV087791@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170242

Change 170242 by pgj@beehive on 2009/11/05 21:05:08

	MFen (www):
		1.100      -> 1.101      hu/where.sgml
		1.209      -> 1.210      hu/projects/projects.sgml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/projects/projects.sgml#9 edit
.. //depot/projects/docproj_hu/www/hu/where.sgml#16 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/projects/projects.sgml#9 (text+ko) ====

@@ -12,7 +12,7 @@
 
 
 
@@ -622,19 +622,6 @@
       és szoftveres problémákról is
       tartalmaz néhány információt.
 
-    
  • A &os; Tinderbox:
-      A Tinderbox folyamatosan fordítja a &os; aktív
-      fejlesztési ágait, ezzel igyekszik észlelni a
-      fordítási hibákat.  Ha egy ágban
-      fordítási hibát talál, levelet
-      küld a megfelelõ levelezési listára, hogy
-      a hibát a lehetõ leggyorsabban ki lehessen
-      javítani.  A Tinderbox forráskódját a
-      &os; CVS repositoryban tartják karban az src/tools/tools/tinderbox
-      könyvtárban.
    • 
-
     
  • TET Integráció:
       Az Open Group

==== //depot/projects/docproj_hu/www/hu/where.sgml#16 (text+ko) ====

@@ -8,7 +8,7 @@
 
 
 
@@ -54,6 +54,8 @@
       egyikétõl megvásárolható CD-ROM
       vagy DVD-ROM lemezen.
    
 
+    
+
     
    A &os; letöltése
    
 
     
    • 
 
 
 
    
From pgj at FreeBSD.org  Fri Nov  6 23:03:39 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Fri Nov  6 23:03:44 2009
Subject: PERFORCE change 170299 for review
Message-ID: <200911062303.nA6N3c0q088541@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170299

Change 170299 by pgj@beehive on 2009/11/06 23:02:40

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/platforms/arm.sgml#4 integrate
.. //depot/projects/docproj_hu/www/hu/projects/projects.sgml#10 integrate
.. //depot/projects/docproj_hu/www/hu/where.sgml#17 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/platforms/arm.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
@@ -88,7 +88,7 @@
 
       
    &a.cognet; (cognet@FreeBSD.org) has written a mini-install guide for the
         current FreeBSD source.  It is
-      available here.
    
+      available here.
    FreeBSD/ARM mailing list
    
 

==== //depot/projects/docproj_hu/www/hu/projects/projects.sgml#10 (text+ko) ====

@@ -1,7 +1,7 @@
 
-
+
 

==== //depot/projects/docproj_hu/www/hu/where.sgml#17 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
From pgj at FreeBSD.org  Fri Nov  6 23:37:12 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Fri Nov  6 23:37:18 2009
Subject: PERFORCE change 170300 for review
Message-ID: <200911062337.nA6NbBPC091045@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170300

Change 170300 by pgj@beehive on 2009/11/06 23:37:05

	MFC (www):
		1.13       -> 1.14       hu/platforms/arm.sgml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#11 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#11 (text+ko) ====

@@ -11,7 +11,7 @@
 
@@ -107,7 +107,7 @@
     telepítési útmutatót a jelenlegi &os;
     forráskódhoz.  Az útmutató
     elérhetõ itt.
    
+      href="http://people.freebsd.org/~cognet/arm.html">itt.
    A &os;/ARM levelezési lista
    
 
From hselasky at FreeBSD.org  Sat Nov  7 00:04:40 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov  7 00:04:47 2009
Subject: PERFORCE change 170302 for review
Message-ID: <200911070004.nA704dsC094088@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170302

Change 170302 by hselasky@hselasky_laptop001 on 2009/11/07 00:04:21

	
	USB controller (EHCI)
	
	 - integrate lost interrupts patch from the 
	   old USB stack.
	 - patch from: Alexander Nedotsukov

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#39 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#39 (text+ko) ====

@@ -116,10 +116,12 @@
 extern struct usb_pipe_methods ehci_device_isoc_fs_methods;
 extern struct usb_pipe_methods ehci_device_isoc_hs_methods;
 
-static void ehci_do_poll(struct usb_bus *bus);
-static void ehci_device_done(struct usb_xfer *xfer, usb_error_t error);
-static uint8_t ehci_check_transfer(struct usb_xfer *xfer);
-static void ehci_timeout(void *arg);
+static void ehci_do_poll(struct usb_bus *);
+static void ehci_device_done(struct usb_xfer *, usb_error_t);
+static uint8_t ehci_check_transfer(struct usb_xfer *);
+static void ehci_timeout(void *);
+static void ehci_poll_timeout(void *);
+
 static void ehci_root_intr(ehci_softc_t *sc);
 
 struct ehci_std_temp {
@@ -246,6 +248,7 @@
 	DPRINTF("start\n");
 
 	usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0);
+	usb_callout_init_mtx(&sc->sc_tmo_poll, &sc->sc_bus.bus_mtx, 0);
 
 #if USB_DEBUG
 	if (ehcidebug > 2) {
@@ -523,6 +526,7 @@
 	USB_BUS_LOCK(&sc->sc_bus);
 
 	usb_callout_stop(&sc->sc_tmo_pcd);
+	usb_callout_stop(&sc->sc_tmo_poll);
 
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 	USB_BUS_UNLOCK(&sc->sc_bus);
@@ -535,6 +539,7 @@
 	usb_pause_mtx(NULL, hz / 20);
 
 	usb_callout_drain(&sc->sc_tmo_pcd);
+	usb_callout_drain(&sc->sc_tmo_poll);
 }
 
 void
@@ -1475,6 +1480,28 @@
 	}
 }
 
+/*
+ * Some EHCI chips from VIA / ATI seem to trigger interrupts before
+ * writing back the qTD status, or miss signalling occasionally under
+ * heavy load.  If the host machine is too fast, we can miss
+ * transaction completion - when we scan the active list the
+ * transaction still seems to be active. This generally exhibits
+ * itself as a umass stall that never recovers.
+ *
+ * We work around this behaviour by setting up this callback after any
+ * softintr that completes with transactions still pending, giving us
+ * another chance to check for completion after the writeback has
+ * taken place.
+ */
+static void
+ehci_poll_timeout(void *arg)
+{
+	ehci_softc_t *sc = arg;
+
+	DPRINTFN(3, "ehci_intrq_timeout\n");
+	ehci_interrupt_poll(sc);
+}
+
 /*------------------------------------------------------------------------*
  *	ehci_interrupt - EHCI interrupt handler
  *
@@ -1542,6 +1569,11 @@
 	/* poll all the USB transfers */
 	ehci_interrupt_poll(sc);
 
+	if (sc->sc_flags & EHCI_SCFLG_LOSTINTRBUG) {
+		usb_callout_reset(&sc->sc_tmo_poll, hz / 128,
+		    (void *)&ehci_poll_timeout, sc);
+	}
+
 done:
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#14 (text+ko) ====

@@ -321,6 +321,7 @@
 	struct ehci_hw_softc sc_hw;
 	struct usb_bus sc_bus;		/* base device */
 	struct usb_callout sc_tmo_pcd;
+	struct usb_callout sc_tmo_poll;
 	union ehci_hub_desc sc_hub_desc;
 
 	struct usb_device *sc_devices[EHCI_MAX_DEVICES];
@@ -348,6 +349,7 @@
 #define	EHCI_SCFLG_BIGEDESC	0x0008	/* big-endian byte order descriptors */
 #define	EHCI_SCFLG_BIGEMMIO	0x0010	/* big-endian byte order MMIO */
 #define	EHCI_SCFLG_TT		0x0020	/* transaction translator present */
+#define	EHCI_SCFLG_LOSTINTRBUG	0x0040	/* workaround for VIA / ATI chipsets */
 
 	uint8_t	sc_offs;		/* offset to operational registers */
 	uint8_t	sc_doorbell_disable;	/* set on doorbell failure */

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#18 (text+ko) ====

@@ -439,6 +439,20 @@
 		break;
 	}
 
+	/* Dropped interrupts workaround */
+
+	switch (pci_get_vendor(self)) {
+	case PCI_EHCI_VENDORID_ATI:
+	case PCI_EHCI_VENDORID_VIA:
+		sc->sc_flags |= EHCI_SCFLG_LOSTINTRBUG;
+		if (bootverbose)
+			device_printf(self,
+			    "Dropped interrupts workaround enabled\n");
+		break;
+	default:
+		break;
+	}
+
 	err = ehci_init(sc);
 	if (!err) {
 		err = device_probe_and_attach(sc->sc_bus.bdev);
From hselasky at FreeBSD.org  Sat Nov  7 01:02:40 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov  7 01:02:46 2009
Subject: PERFORCE change 170304 for review
Message-ID: <200911070102.nA712dKn008846@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170304

Change 170304 by hselasky@hselasky_laptop001 on 2009/11/07 01:02:23

	
	LibUSB:
	 - fix a memory leak on the USB backend
	 - fix invalid pointer computations (in one case memory outside 
	   the allocated area was written in LibUSB v1.0)
	 - make sure memory is always initialised, also in failing cases
	 - patch by: Robert Jenssen

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb10.c#12 edit
.. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#9 edit
.. //depot/projects/usb/src/lib/libusb/libusb20.c#8 edit
.. //depot/projects/usb/src/lib/libusb/libusb20_desc.c#4 edit
.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#10 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb10.c#12 (text+ko) ====

@@ -416,6 +416,8 @@
 	libusb10_remove_pollfd(ctx, &dev->dev_poll);
 
 	libusb20_dev_close(pdev);
+
+	/* unref will free the "pdev" when the refcount reaches zero */
 	libusb_unref_device(dev);
 
 	/* make sure our event loop detects the closed device */

==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#9 (text+ko) ====

@@ -35,6 +35,8 @@
 #include "libusb.h"
 #include "libusb10.h"
 
+#define	N_ALIGN(n) (-((-(n)) & (-8UL)))
+
 /* USB descriptors */
 
 int
@@ -114,17 +116,17 @@
 
 	nalt = nif = pconf->num_interface;
 	nep = 0;
-	nextra = pconf->extra.len;
+	nextra = N_ALIGN(pconf->extra.len);
 
 	for (i = 0; i < nif; i++) {
 
 		pinf = pconf->interface + i;
-		nextra += pinf->extra.len;
+		nextra += N_ALIGN(pinf->extra.len);
 		nep += pinf->num_endpoints;
 		k = pinf->num_endpoints;
 		pend = pinf->endpoints;
 		while (k--) {
-			nextra += pend->extra.len;
+			nextra += N_ALIGN(pend->extra.len);
 			pend++;
 		}
 
@@ -132,12 +134,12 @@
 		nalt += pinf->num_altsetting;
 		pinf = pinf->altsetting;
 		while (j--) {
-			nextra += pinf->extra.len;
+			nextra += N_ALIGN(pinf->extra.len);
 			nep += pinf->num_endpoints;
 			k = pinf->num_endpoints;
 			pend = pinf->endpoints;
 			while (k--) {
-				nextra += pend->extra.len;
+				nextra += N_ALIGN(pend->extra.len);
 				pend++;
 			}
 			pinf++;
@@ -150,17 +152,18 @@
 	    (nalt * sizeof(libusb_interface_descriptor)) +
 	    (nep * sizeof(libusb_endpoint_descriptor));
 
+	nextra = N_ALIGN(nextra);
+
 	pconfd = malloc(nextra);
 
 	if (pconfd == NULL) {
 		free(pconf);
 		return (LIBUSB_ERROR_NO_MEM);
 	}
-	/* make sure memory is clean */
+	/* make sure memory is initialised */
 	memset(pconfd, 0, nextra);
 
-	pconfd->interface = (libusb_interface *) (pconfd +
-	    sizeof(libusb_config_descriptor));
+	pconfd->interface = (libusb_interface *) (pconfd + 1);
 
 	ifd = (libusb_interface_descriptor *) (pconfd->interface + nif);
 	endd = (libusb_endpoint_descriptor *) (ifd + nalt);
@@ -181,7 +184,7 @@
 		pconfd->extra_length = pconf->extra.len;
 		pconfd->extra = pextra;
 		memcpy(pextra, pconf->extra.ptr, pconfd->extra_length);
-		pextra += pconfd->extra_length;
+		pextra += N_ALIGN(pconfd->extra_length);
 	}
 	/* setup all interface and endpoint pointers */
 
@@ -221,7 +224,7 @@
 				ifd->extra_length = pinf->extra.len;
 				ifd->extra = pextra;
 				memcpy(pextra, pinf->extra.ptr, pinf->extra.len);
-				pextra += pinf->extra.len;
+				pextra += N_ALIGN(pinf->extra.len);
 			}
 			for (k = 0; k < pinf->num_endpoints; k++) {
 				pend = &pinf->endpoints[k];
@@ -238,7 +241,7 @@
 					endd->extra_length = pend->extra.len;
 					endd->extra = pextra;
 					memcpy(pextra, pend->extra.ptr, pend->extra.len);
-					pextra += pend->extra.len;
+					pextra += N_ALIGN(pend->extra.len);
 				}
 			}
 		}

==== //depot/projects/usb/src/lib/libusb/libusb20.c#8 (text+ko) ====

@@ -630,6 +630,9 @@
 	struct LIBUSB20_CONTROL_SETUP_DECODED req;
 	int error;
 
+	/* make sure memory is initialised */
+	memset(ptr, 0, len);
+
 	if (len < 4) {
 		/* invalid length */
 		return (LIBUSB20_ERROR_INVALID_PARAM);
@@ -1093,7 +1096,8 @@
 	if (pbe->methods->exit_backend) {
 		pbe->methods->exit_backend(pbe);
 	}
-	return;
+	/* free backend */
+	free(pbe);
 }
 
 void
@@ -1101,7 +1105,6 @@
 {
 	pdev->beMethods = pbe->methods;	/* copy backend methods */
 	TAILQ_INSERT_TAIL(&(pbe->usb_devs), pdev, dev_entry);
-	return;
 }
 
 void
@@ -1109,5 +1112,4 @@
     struct libusb20_device *pdev)
 {
 	TAILQ_REMOVE(&(pbe->usb_devs), pdev, dev_entry);
-	return;
 }

==== //depot/projects/usb/src/lib/libusb/libusb20_desc.c#4 (text+ko) ====

@@ -118,6 +118,9 @@
 	if (lub_config == NULL) {
 		return (NULL);		/* out of memory */
 	}
+	/* make sure memory is initialised */
+	memset(lub_config, 0, size);
+
 	lub_interface = (void *)(lub_config + 1);
 	lub_alt_interface = (void *)(lub_interface + niface_no_alt);
 	lub_endpoint = (void *)(lub_interface + niface);

==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#10 (text+ko) ====

@@ -449,6 +449,8 @@
 	uint16_t len;
 	int error;
 
+	/* make sure memory is initialised */
+	memset(&cdesc, 0, sizeof(cdesc));
 	memset(&gen_desc, 0, sizeof(gen_desc));
 
 	gen_desc.ugd_data = &cdesc;
@@ -468,6 +470,10 @@
 	if (!ptr) {
 		return (LIBUSB20_ERROR_NO_MEM);
 	}
+
+	/* make sure memory is initialised */
+	memset(ptr, 0, len);
+
 	gen_desc.ugd_data = ptr;
 	gen_desc.ugd_maxlen = len;
 
From hselasky at FreeBSD.org  Sat Nov  7 01:25:03 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov  7 01:25:09 2009
Subject: PERFORCE change 170307 for review
Message-ID: <200911070125.nA71P2oO011564@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170307

Change 170307 by hselasky@hselasky_laptop001 on 2009/11/07 01:24:09

	
	LibUSB v1.0 only:
	  - fix refcounting error during data transfer
	  - reported by Robert Jenssen

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#9 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#9 (text+ko) ====

@@ -148,19 +148,19 @@
 		goto do_done;
 	}
 	for (i = 0; i != nfds; i++) {
-		if (fds[i].revents == 0)
-			continue;
 		if (ppdev[i] != NULL) {
 			dev = libusb_get_device(ppdev[i]);
 
-			err = libusb20_dev_process(ppdev[i]);
+			if (fds[i].revents == 0)
+				err = 0;	/* nothing to do */
+			else
+				err = libusb20_dev_process(ppdev[i]);
+
 			if (err) {
 				/* cancel all transfers - device is gone */
 				libusb10_cancel_all_transfer(dev);
-				/*
-				 * make sure we don't go into an infinite
-				 * loop
-				 */
+
+				/* remove USB device from polling loop */
 				libusb10_remove_pollfd(dev->ctx, &dev->dev_poll);
 			}
 			CTX_UNLOCK(ctx);
From pgj at FreeBSD.org  Sat Nov  7 14:47:28 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sat Nov  7 14:47:36 2009
Subject: PERFORCE change 170318 for review
Message-ID: <200911071447.nA7ElQcn015333@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170318

Change 170318 by pgj@petymeg-current on 2009/11/07 14:46:27

	IFC

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/UPDATING#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith_lex.l#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/jail#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/accept.2#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/mmap.2#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libkvm/kvm_i386.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libmemstat/Makefile#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_attach.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/lib/libstand/udp.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/ddb/ddb_capture.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sbin/sysctl/sysctl.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/secure/usr.bin/bdes/bdes.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/chpmon.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/eltsub.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/eltsub.h#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getencstat.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getnobj.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getobjmap.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getobjstat.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/inienc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/sesd.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/setencstat.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/setobjstat.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/tree.3#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ata.4#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/tty.4#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/ar.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/make.conf.5#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/msdosfs.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/man/man7/adding_user.7#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/misc/iso3166#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/asia#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/europe#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/zone.tab#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/identcpu.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/gdb_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/at91_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/mv/mv_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_pmp.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_ccb.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_periph.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_periph.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt_internal.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_sg.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_xpt.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ipc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/kern_ndis.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/kern_windrv.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_ndis.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_pe.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_usbd.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.ia64#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-sata.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_scatter.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vgareg.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/isp_sbus.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nfe/if_nfe.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/vga_pci.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sk/if_sk.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/usb_serial.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_urtw.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vge.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vgevar.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/fs/fifofs/fifo_vnops.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/identcpu.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/highfp.c#1 branch
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/md_var.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/proc.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/isa/vga_isa.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_intr.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_lock.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_log.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_acl.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_default.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_vnops.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_ef.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_iface.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_sppp.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/swtch.S#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/cpu.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/ata.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/conf.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/fbio.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/mman.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/msgbuf.h#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/proc.h#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/sys/signalvar.h#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/leave/leave.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/logger/logger.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/tail/tail.1#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/crashinfo/crashinfo.sh#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/i2c/i2c.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/nfsd/stablerestart.5#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/usbconfig/dump.c#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/usbconfig/usbconfig.8#3 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/wake/wake.8#2 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/zic/zdump.c#4 integrate
.. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/zic/zic.8#4 integrate

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -272,7 +272,7 @@
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
-		-iprefix ${LIB32TMP}/usr/ \
+		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
 

==== //depot/projects/soc2009/pgj_libstat/src/UPDATING#4 (text+ko) ====

@@ -537,6 +537,11 @@
 		# Map old usb library to new one for usb2 stack
 		libusb-0.1.so.8	libusb20.so.1
 
+20090209:
+	All USB ethernet devices now attach as interfaces under the name ueN
+	(eg. ue0). This is to provide a predictable name as vendors often
+	change usb chipsets in a product without notice.
+
 20090203:
 	The ichsmb(4) driver has been changed to require SMBus slave
 	addresses be left-justified (xxxxxxx0b) rather than right-justified.
@@ -1047,4 +1052,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $
+$FreeBSD: src/UPDATING,v 1.644 2009/11/03 21:06:19 thompsa Exp $

==== //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.1#3 (text+ko) ====

@@ -25,12 +25,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
 .\"
-.Dd September 04, 2009
+.Dd September 4, 2009
 .Dt GETFACL 1
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
 
 #include 
 #include 
@@ -70,7 +70,7 @@
 
 /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
 static VAR var[] = {
-	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0},
+	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0},
 	{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
 	{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
 		"x", 0},
@@ -159,7 +159,7 @@
 		UINT, UIDFMT, 0},
 	{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
 		USERLEN, 0, CHAR, NULL, 0},
-	{"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0},
+	{"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0},
 	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
 		NULL, 0},
 	{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
@@ -207,7 +207,7 @@
 		NULL, 0},
 	{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
 	{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0},
+	{"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0},
 	{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
 	{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
 		"x", 0},

==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith_lex.l#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $");
 
 #include 
 
@@ -51,6 +51,13 @@
 
 int yylex(void);
 
+struct varname
+{
+	struct varname *next;
+	char name[1];
+};
+static struct varname *varnames;
+
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
 	result = (*buf = *arith_buf++) ? 1 : YY_NULL;
@@ -80,11 +87,14 @@
 			 * If variable doesn't exist, we should initialize
 			 * it to zero.
 			 */
-			char *temp;
+			struct varname *temp;
 			if (lookupvar(yytext) == NULL)
 				setvarsafe(yytext, "0", 0);
-			temp = (char *)ckmalloc(strlen(yytext) + 1);
-			yylval.s_value = strcpy(temp, yytext);
+			temp = ckmalloc(sizeof(struct varname) +
+			    strlen(yytext));
+			temp->next = varnames;
+			varnames = temp;
+			yylval.s_value = strcpy(temp->name, yytext);
 
 			return ARITH_VAR;
 		}
@@ -130,5 +140,15 @@
 void
 arith_lex_reset(void)
 {
+	struct varname *name, *next;
+
 	YY_NEW_FILE;
+
+	name = varnames;
+	while (name != NULL) {
+		next = name->next;
+		ckfree(name);
+		name = next;
+	}
+	varnames = NULL;
 }

==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/jail#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/jail,v 1.43 2009/06/10 18:18:14 ed Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.44 2009/11/02 09:56:46 remko Exp $
 #
 
 # PROVIDE: jail
@@ -728,4 +728,4 @@
 if [ -n "$*" ]; then
 	jail_list="$*"
 fi
-run_rc_command "${cmd}"
+run_rc_command "${cmd}" &

==== //depot/projects/soc2009/pgj_libstat/src/games/fortune/datfiles/fortunes#3 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.278 2009/11/04 18:40:05 dougb Exp $
 %
 =======================================================================
 ||								     ||
@@ -25228,7 +25228,8 @@
 		-- Sylvestre Matuschka, "the Hungarian Train Wreck Freak",
 		   escaped prison 1937, not heard from since
 %
-Iam
+I
+am
 not
 very
 happy

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2 2008/07/28 09:36:56 ed Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWN 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2 2008/07/28 09:36:56 ed Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getflags.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETFLAGS 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETPGROUP 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSIGMASK 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_init.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_INIT 3
 .Os
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/accept.2#2 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.33 2008/06/20 14:47:06 phk Exp $
+.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.34 2009/11/02 07:21:13 cperciva Exp $
 .\"
 .Dd December 11, 1993
 .Dt ACCEPT 2
@@ -126,6 +126,10 @@
 For some applications, performance may be enhanced by using an
 .Xr accept_filter 9
 to pre-process incoming connections.
+.Pp
+Portable programs should not rely on the
+.Dv O_NONBLOCK
+property being inherited.
 .Sh RETURN VALUES
 The call returns \-1 on error.
 If it succeeds, it returns a non-negative

==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/mmap.2#3 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.59 2009/07/26 06:38:56 alc Exp $
+.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.60 2009/11/06 07:17:31 ed Exp $
 .\"
-.Dd July 26, 2009
+.Dd November 6, 2009
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -108,6 +108,10 @@
 argument is ignored.
 .\".It Dv MAP_FILE
 .\"Mapped from a regular file or character-special device memory.
+.It Dv MAP_ANONYMOUS
+This flag is identical to
+.Dv MAP_ANON
+and is provided for compatibility.
 .It Dv MAP_FIXED
 Do not permit the system to select a different address than the one
 specified.

==== //depot/projects/soc2009/pgj_libstat/src/lib/libkvm/kvm_i386.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.22 2009/06/14 12:42:06 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.23 2009/11/06 13:10:12 jhb Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -295,9 +295,9 @@
 #define	PG_FRAME4M	(~PAGE4M_MASK)
 		pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK);
 		s = _kvm_pa2off(kd, pde_pa, &ofs);
-		if (s < sizeof pde) {
-			_kvm_syserr(kd, kd->program,
-			    "_kvm_vatop: pde_pa not found");
+		if (s == 0) {
+			_kvm_err(kd, kd->program,
+			    "_kvm_vatop: 4MB page address not in dump");
 			goto invalid;
 		}
 		*pa = ofs;
@@ -391,9 +391,9 @@
 #define	PG_FRAME2M	(~PAGE2M_MASK)
 		pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK);
 		s = _kvm_pa2off(kd, pde_pa, &ofs);
-		if (s < sizeof pde) {
-			_kvm_syserr(kd, kd->program,
-			    "_kvm_vatop_pae: pde_pa not found");
+		if (s == 0) {
+			_kvm_err(kd, kd->program,
+			    "_kvm_vatop: 2MB page address not in dump");
 			goto invalid;
 		}
 		*pa = ofs;

==== //depot/projects/soc2009/pgj_libstat/src/lib/libmemstat/Makefile#2 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/lib/libmemstat/Makefile,v 1.6 2007/05/21 02:49:05 deischen Exp $
+# $FreeBSD: src/lib/libmemstat/Makefile,v 1.7 2009/07/19 17:25:24 kensmith Exp $
 
 WARNS?=		3
 LIB=		memstat
-SHLIB_MAJOR=	2
+SHLIB_MAJOR=	3
 DPADD=		${LIBKVM}
 LDADD=		-lkvm
 SRCS+=		memstat.c

==== //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_attach.3#2 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.1 2007/11/25 06:38:55 jkoshy Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd November 25 2007
+.Dd November 25, 2007
 .Os
 .Dt PMC_ATTACH 3
 .Sh NAME

==== //depot/projects/soc2009/pgj_libstat/src/lib/libstand/udp.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.6 2007/01/09 01:02:04 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.7 2009/11/05 06:08:04 marcel Exp $");
 
 #include 
 #include 
@@ -90,7 +90,7 @@
 	ip->ip_hl = sizeof(*ip) >> 2;		/* half-char */
 	ip->ip_len = htons(len);
 	ip->ip_p = IPPROTO_UDP;			/* char */
-	ip->ip_ttl = IP_TTL;			/* char */
+	ip->ip_ttl = IPDEFTTL;			/* char */
 	ip->ip_src = d->myip;
 	ip->ip_dst = d->destip;
 	ip->ip_sum = in_cksum(ip, sizeof(*ip));	 /* short, but special */

==== //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.65 2009/09/27 22:00:26 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.67 2009/11/04 15:24:32 mav Exp $");
 
 #include 
 #include 
@@ -186,7 +186,7 @@
 			 char *combinedopt, int retry_count, int timeout);
 static int scsiinquiry(struct cam_device *device, int retry_count, int timeout);
 static int scsiserial(struct cam_device *device, int retry_count, int timeout);
-static int scsixferrate(struct cam_device *device);
+static int camxferrate(struct cam_device *device);
 #endif /* MINIMALISTIC */
 static int parse_btl(char *tstr, int *bus, int *target, int *lun,
 		     cam_argmask *arglst);
@@ -663,7 +663,7 @@
 		return(error);
 
 	if (arglist & CAM_ARG_GET_XFERRATE)
-		error = scsixferrate(device);
+		error = camxferrate(device);
 
 	return(error);
 }
@@ -873,14 +873,18 @@
 }
 
 static int
-scsixferrate(struct cam_device *device)
+camxferrate(struct cam_device *device)
 {
+	struct ccb_pathinq cpi;
 	u_int32_t freq = 0;
 	u_int32_t speed = 0;
 	union ccb *ccb;
 	u_int mb;
 	int retval = 0;
 
+	if ((retval = get_cpi(device, &cpi)) != 0)
+		return (1);
+
 	ccb = cam_getccb(device);
 
 	if (ccb == NULL) {
@@ -913,6 +917,8 @@
 
 	}
 
+	speed = cpi.base_transfer_speed;
+	freq = 0;
 	if (ccb->cts.transport == XPORT_SPI) {
 		struct ccb_trans_settings_spi *spi =
 		    &ccb->cts.xport_specific.spi;
@@ -920,31 +926,44 @@
 		if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) != 0) {
 			freq = scsi_calc_syncsrate(spi->sync_period);
 			speed = freq;
-		} else {
-			struct ccb_pathinq cpi;
-
-			retval = get_cpi(device, &cpi);
-			if (retval == 0) {
-				speed = cpi.base_transfer_speed;
-				freq = 0;
-			}
 		}
-
-		fprintf(stdout, "%s%d: ", device->device_name,
-			device->dev_unit_num);
-
 		if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) {
 			speed *= (0x01 << spi->bus_width);
 		}
+	} else if (ccb->cts.transport == XPORT_FC) {
+		struct ccb_trans_settings_fc *fc =
+		    &ccb->cts.xport_specific.fc;
 
-		mb = speed / 1000;
+		if (fc->valid & CTS_FC_VALID_SPEED)
+			speed = fc->bitrate;
+	} else if (ccb->cts.transport == XPORT_SAS) {
+		struct ccb_trans_settings_sas *sas =
+		    &ccb->cts.xport_specific.sas;
+
+		if (sas->valid & CTS_SAS_VALID_SPEED)
+			speed = sas->bitrate;
+	} else if (ccb->cts.transport == XPORT_SATA) {
+		struct ccb_trans_settings_sata *sata =
+		    &ccb->cts.xport_specific.sata;
+
+		if (sata->valid & CTS_SATA_VALID_SPEED)
+			speed = sata->bitrate;
+	}
+
+	mb = speed / 1000;
+	if (mb > 0) {
+		fprintf(stdout, "%s%d: %d.%03dMB/s transfers ",
+			device->device_name, device->dev_unit_num,
+			mb, speed % 1000);
+	} else {
+		fprintf(stdout, "%s%d: %dKB/s transfers ",
+			device->device_name, device->dev_unit_num,
+			speed);
+	}
 
-		if (mb > 0) 
-			fprintf(stdout, "%d.%03dMB/s transfers ",
-				mb, speed % 1000);
-		else
-			fprintf(stdout, "%dKB/s transfers ",
-				speed);
+	if (ccb->cts.transport == XPORT_SPI) {
+		struct ccb_trans_settings_spi *spi =
+		    &ccb->cts.xport_specific.spi;
 
 		if (((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0)
 		 && (spi->sync_offset != 0))
@@ -964,25 +983,22 @@
 		 && (spi->sync_offset != 0)) {
 			fprintf(stdout, ")");
 		}
-	} else {
-		struct ccb_pathinq cpi;
+	} else if (ccb->cts.transport == XPORT_ATA) {
+		struct ccb_trans_settings_ata *ata =
+		    &ccb->cts.xport_specific.ata;
 
-		retval = get_cpi(device, &cpi);
+		if (ata->valid & CTS_ATA_VALID_BYTECOUNT) {
+			fprintf(stdout, "(PIO size %dbytes)",
+			    ata->bytecount);
+		}
+	} else if (ccb->cts.transport == XPORT_SATA) {
+		struct ccb_trans_settings_sata *sata =
+		    &ccb->cts.xport_specific.sata;
 
-		if (retval != 0)
-			goto xferrate_bailout;
-
-		speed = cpi.base_transfer_speed;
-		freq = 0;
-
-		mb = speed / 1000;
-
-		if (mb > 0) 
-			fprintf(stdout, "%d.%03dMB/s transfers ",
-				mb, speed % 1000);
-		else
-			fprintf(stdout, "%dKB/s transfers ",
-				speed);
+		if (sata->valid & CTS_SATA_VALID_BYTECOUNT) {
+			fprintf(stdout, "(PIO size %dbytes)",
+			    sata->bytecount);
+		}
 	}
 
 	if (ccb->cts.protocol == PROTO_SCSI) {
@@ -1045,6 +1061,10 @@
 	printf("cylinders             %d\n", parm->cylinders);
 	printf("heads                 %d\n", parm->heads);
 	printf("sectors/track         %d\n", parm->sectors);
+	printf("sector size           logical %u, physical %lu, offset %lu\n",
+	    ata_logical_sector_size(parm),
+	    (unsigned long)ata_physical_sector_size(parm),
+	    (unsigned long)ata_logical_sector_offset(parm));
 
 	if (parm->config == ATA_PROTO_CFA ||
 	    (parm->support.command2 & ATA_SUPPORT_CFA))
@@ -1305,6 +1325,7 @@
 	fprintf(stdout, "%s%d: ", device->device_name,
 		device->dev_unit_num);
 	ata_print_ident(ident_buf);
+	camxferrate(device);
 	atacapprint(ident_buf);
 
 	free(ident_buf);

==== //depot/projects/soc2009/pgj_libstat/src/sbin/ddb/ddb_capture.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.2 2009/10/29 13:44:58 jhb Exp $");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.3 2009/11/02 20:18:50 jhb Exp $");
 
 #include 
 #include 
@@ -204,6 +204,7 @@
 
 	mflag = NULL;
 	nflag = NULL;
+	kvm = NULL;
 	while ((ch = getopt(argc, argv, "M:N:")) != -1) {
 		switch (ch) {
 		case 'M':

==== //depot/projects/soc2009/pgj_libstat/src/sbin/mknod/mknod.8#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.31 2005/02/10 09:19:30 ru Exp $
+.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.33 2009/11/01 18:25:11 brueffer Exp $
 .\"
-.Dd December 15, 2004
+.Dd October 31, 2009
 .Dt MKNOD 8
 .Os
 .Sh NAME
@@ -74,9 +74,6 @@
 .It Ar major
 The major device number is an integer number which tells the kernel
 which device driver entry point to use.
-To learn what
-major device number to use for a particular device, check
-.Pa /usr/src/sys/conf/majors .
 .It Ar minor
 The minor device number tells the kernel which subunit
 the node corresponds to on the device; for example,

==== //depot/projects/soc2009/pgj_libstat/src/sbin/sysctl/sysctl.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)from: sysctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.91 2009/10/21 18:31:54 ed Exp $";
+  "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.92 2009/11/03 11:41:21 ed Exp $";
 #endif /* not lint */
 
 #include 
@@ -419,14 +419,7 @@
 		warnx("T_dev_T %d != %d", l2, sizeof(*d));
 		return (1);
 	}
-	if ((int)(*d) != -1) {
-		if (minor(*d) > 255 || minor(*d) < 0)
-			printf("{ major = %d, minor = 0x%x }",
-				major(*d), minor(*d));
-		else
-			printf("{ major = %d, minor = %d }",
-				major(*d), minor(*d));
-	}
+	printf("%s", devname(*d, S_IFCHR));
 	return (0);
 }
 

==== //depot/projects/soc2009/pgj_libstat/src/secure/usr.bin/bdes/bdes.c#2 (text+ko) ====

@@ -81,7 +81,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.10 2008/02/19 07:09:18 ru Exp $");
+__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.11 2009/11/03 18:40:42 jhb Exp $");
 
 #include 
 
@@ -170,11 +170,11 @@
 	int i;				/* counter in a for loop */
 	char *p;			/* used to obtain the key */
 	DES_cblock msgbuf;		/* I/O buffer */
-	int kflag;			/* command-line encryptiooon key */
+	int kflag;			/* command-line encryption key */
 
 	setproctitle("-");		/* Hide command-line arguments */
 
-	/* initialize the initialization vctor */
+	/* initialize the initialization vector */
 	MEMZERO(ivec, 8);
 
 	/* process the argument list */

==== //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/chpmon.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.1 2000/02/29 05:44:16 mjacob Exp $ */
+/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.2 2009/11/04 23:36:23 delphij Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -47,9 +47,7 @@
 #define	BADSTAT	\
 	(SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL)
 int
-main(a, v)
-	int a;
-	char **v;

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From hselasky at FreeBSD.org  Sat Nov  7 16:46:27 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov  7 16:46:33 2009
Subject: PERFORCE change 170319 for review
Message-ID: <200911071646.nA7GkQ5I025782@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170319

Change 170319 by hselasky@hselasky_laptop001 on 2009/11/07 16:45:42

	
	USB CORE:
	  - improve support for high speed isochronous
	  endpoints which does not run 1:1, but needs
	  intervalling 1:2, 1:4 or 1:8

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#40 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#29 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#171 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdi.h#13 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#40 (text+ko) ====

@@ -2143,7 +2143,7 @@
 	DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n",
 	    xfer, xfer->endpoint);
 
-	while (nframes--) {
+	while (nframes) {
 		if (td == NULL) {
 			panic("%s:%d: out of TD's\n",
 			    __FUNCTION__, __LINE__);
@@ -2165,21 +2165,26 @@
 
 		DPRINTFN(2, "status=0x%08x, len=%u\n", status, len);
 
-		if (*plen >= len) {
-			/*
-			 * The length is valid. NOTE: The complete
-			 * length is written back into the status
-			 * field, and not the remainder like with
-			 * other transfer descriptor types.
-			 */
-		} else {
-			/* Invalid length - truncate */
-			len = 0;
+		if (xfer->usb_smask & (1 << td_no)) {
+
+			if (*plen >= len) {
+				/*
+				 * The length is valid. NOTE: The
+				 * complete length is written back
+				 * into the status field, and not the
+				 * remainder like with other transfer
+				 * descriptor types.
+				 */
+			} else {
+				/* Invalid length - truncate */
+				len = 0;
+			}
+
+			*plen = len;
+			plen++;
+			nframes--;
 		}
 
-		*plen = len;
-
-		plen++;
 		td_no++;
 
 		if ((td_no == 8) || (nframes == 0)) {
@@ -2396,10 +2401,9 @@
 ehci_device_intr_close(struct usb_xfer *xfer)
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
-	uint8_t slot;
 
-	slot = usb_intr_schedule_adjust
-	    (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb_uframe);
+	usb_intr_schedule_adjust(xfer->xroot->udev,
+	    -(xfer->max_frame_size), xfer->usb_uframe);
 
 	sc->sc_intr_stat[xfer->qh_pos]--;
 
@@ -2725,7 +2729,29 @@
 	ehci_itd_t *td;
 	uint32_t temp;
 	uint8_t ds;
+	uint8_t slot;
+
+	slot = usb_intr_schedule_adjust(xfer->xroot->udev, xfer->max_frame_size,
+	    USB_HS_MICRO_FRAMES_MAX);
 
+	xfer->usb_uframe = slot;
+	xfer->usb_cmask = 0;
+
+	switch (usbd_xfer_get_fps_shift(xfer)) {
+	case 0:
+		xfer->usb_smask = 0xFF;
+		break;
+	case 1:
+		xfer->usb_smask = 0x55 << (slot & 1);
+		break;
+	case 2:
+		xfer->usb_smask = 0x11 << (slot & 3);
+		break;
+	default:
+		xfer->usb_smask = 0x01 << (slot & 7);
+		break;
+	}
+
 	/* initialize all TD's */
 
 	for (ds = 0; ds != 2; ds++) {
@@ -2768,6 +2794,10 @@
 static void
 ehci_device_isoc_hs_close(struct usb_xfer *xfer)
 {
+
+	usb_intr_schedule_adjust(xfer->xroot->udev,
+	    -(xfer->max_frame_size), xfer->usb_uframe);
+
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
 }
 
@@ -2857,7 +2887,7 @@
 
 	xfer->qh_pos = xfer->endpoint->isoc_next;
 
-	while (nframes--) {
+	while (nframes) {
 		if (td == NULL) {
 			panic("%s:%d: out of TD's\n",
 			    __FUNCTION__, __LINE__);
@@ -2877,13 +2907,21 @@
 #endif
 			*plen = xfer->max_frame_size;
 		}
-		status = (EHCI_ITD_SET_LEN(*plen) |
-		    EHCI_ITD_ACTIVE |
-		    EHCI_ITD_SET_PG(0));
-		td->itd_status[td_no] = htohc32(sc, status);
-		itd_offset[td_no] = buf_offset;
-		buf_offset += *plen;
-		plen++;
+
+		if (xfer->usb_smask & (1 << td_no)) {
+			status = (EHCI_ITD_SET_LEN(*plen) |
+			    EHCI_ITD_ACTIVE |
+			    EHCI_ITD_SET_PG(0));
+			td->itd_status[td_no] = htohc32(sc, status);
+			itd_offset[td_no] = buf_offset;
+			buf_offset += *plen;
+			plen++;
+			nframes --;
+		} else {
+			td->itd_status[td_no] = 0;	/* not active */
+			itd_offset[td_no] = buf_offset;
+		}
+
 		td_no++;
 
 		if ((td_no == 8) || (nframes == 0)) {
@@ -2940,7 +2978,7 @@
 			}
 			/* set IOC bit if we are complete */
 			if (nframes == 0) {
-				td->itd_status[7] |= htohc32(sc, EHCI_ITD_IOC);
+				td->itd_status[td_no - 1] |= htohc32(sc, EHCI_ITD_IOC);
 			}
 			usb_pc_cpu_flush(td->page_cache);
 #if USB_DEBUG
@@ -3586,7 +3624,8 @@
 
 		usbd_transfer_setup_sub(parm);
 
-		nitd = (xfer->nframes + 7) / 8;
+		nitd = ((xfer->nframes + 7) / 8) <<
+		    usbd_xfer_get_fps_shift(xfer);
 
 	} else {
 

==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#29 (text+ko) ====

@@ -165,6 +165,7 @@
 	uint8_t	usb_cmask;
 	uint8_t	usb_uframe;
 	uint8_t	usb_state;
+	uint8_t fps_shift;		/* down shift of FPS, 0..3 */
 
 	usb_error_t error;
 

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#171 (text+ko) ====

@@ -416,9 +416,15 @@
 		case USB_SPEED_LOW:
 		case USB_SPEED_FULL:
 			frame_limit = USB_MAX_FS_ISOC_FRAMES_PER_XFER;
+			xfer->fps_shift = 0;
 			break;
 		default:
 			frame_limit = USB_MAX_HS_ISOC_FRAMES_PER_XFER;
+			xfer->fps_shift = edesc->bInterval;
+			if (xfer->fps_shift > 0)
+				xfer->fps_shift--;
+			if (xfer->fps_shift > 3)
+				xfer->fps_shift = 3;
 			break;
 		}
 
@@ -1826,6 +1832,23 @@
 	return (&xfer->frbuffers[frindex]);
 }
 
+/*------------------------------------------------------------------------*
+ *	usbd_xfer_get_fps_shift
+ *
+ * The following function is only useful for isochronous transfers. It
+ * returns how many times the frame execution rate has been shifted
+ * down.
+ *
+ * Return value:
+ * Success: 0..3
+ * Failure: 0
+ *------------------------------------------------------------------------*/
+uint8_t
+usbd_xfer_get_fps_shift(struct usb_xfer *xfer)
+{
+	return (xfer->fps_shift);
+}
+
 usb_frlength_t
 usbd_xfer_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex)
 {

==== //depot/projects/usb/src/sys/dev/usb/usbdi.h#13 (text+ko) ====

@@ -478,6 +478,7 @@
 usb_frlength_t usbd_xfer_max_len(struct usb_xfer *xfer);
 usb_frlength_t usbd_xfer_max_framelen(struct usb_xfer *xfer);
 usb_frcount_t usbd_xfer_max_frames(struct usb_xfer *xfer);
+uint8_t	usbd_xfer_get_fps_shift(struct usb_xfer *xfer);
 usb_frlength_t usbd_xfer_frame_len(struct usb_xfer *xfer,
 	    usb_frcount_t frindex);
 void	usbd_xfer_set_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex,
From hselasky at FreeBSD.org  Sat Nov  7 16:48:29 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov  7 16:48:36 2009
Subject: PERFORCE change 170320 for review
Message-ID: <200911071648.nA7GmSYg036124@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170320

Change 170320 by hselasky@hselasky_laptop001 on 2009/11/07 16:47:30

	
	USB audio:
	 - improve support for High-speed USB audio
	   devices.
	 - fix issues regarding the mixer, where
	   the interface number was not set in time.
	 - fix wrong use of resolution parameter.

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#58 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#58 (text+ko) ====

@@ -105,10 +105,9 @@
     &uaudio_default_channels, 0, "uaudio default sample channels");
 #endif
 
-#define	UAUDIO_MINFRAMES       16	/* must be factor of 8 due HS-USB */
+#define	UAUDIO_NFRAMES		64	/* must be factor of 8 due HS-USB */
 #define	UAUDIO_NCHANBUFS        2	/* number of outstanding request */
 #define	UAUDIO_RECURSE_LIMIT   24	/* rounds */
-#define	UAUDIO_MINFRAMES_ALIGN(x) ((x) & ~(UAUDIO_MINFRAMES - 1))
 
 #define	MAKE_WORD(h,l) (((h) << 8) | (l))
 #define	BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
@@ -119,7 +118,7 @@
 	int32_t	maxval;
 #define	MIX_MAX_CHAN 8
 	int32_t	wValue[MIX_MAX_CHAN];	/* using nchan */
-	uint32_t delta;
+	uint32_t mod;		/* modulus */
 	uint32_t mul;
 	uint32_t ctl;
 
@@ -169,7 +168,7 @@
 					 * buffer */
 
 	uint32_t intr_size;		/* in bytes */
-	uint32_t block_size;
+	uint32_t intr_frames;		/* in units */
 	uint32_t sample_rate;
 	uint32_t format;
 	uint32_t pcm_format[2];
@@ -410,7 +409,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = 0,	/* use "wMaxPacketSize * frames" */
-		.frames = UAUDIO_MINFRAMES,
+		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
 		.callback = &uaudio_chan_record_callback,
 	},
@@ -420,7 +419,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
 		.bufsize = 0,	/* use "wMaxPacketSize * frames" */
-		.frames = UAUDIO_MINFRAMES,
+		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
 		.callback = &uaudio_chan_record_callback,
 	},
@@ -433,7 +432,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = 0,	/* use "wMaxPacketSize * frames" */
-		.frames = UAUDIO_MINFRAMES,
+		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
 		.callback = &uaudio_chan_play_callback,
 	},
@@ -443,7 +442,7 @@
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_OUT,
 		.bufsize = 0,	/* use "wMaxPacketSize * frames" */
-		.frames = UAUDIO_MINFRAMES,
+		.frames = UAUDIO_NFRAMES,
 		.flags = {.short_xfer_ok = 1,},
 		.callback = &uaudio_chan_play_callback,
 	},
@@ -506,7 +505,6 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(struct usb_device_request),
-		.flags = {},
 		.callback = &umidi_write_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,	/* 50ms */
@@ -517,7 +515,6 @@
 		.endpoint = 0x00,	/* Control pipe */
 		.direction = UE_DIR_ANY,
 		.bufsize = sizeof(struct usb_device_request),
-		.flags = {},
 		.callback = &umidi_read_clear_stall_callback,
 		.timeout = 1000,	/* 1 second */
 		.interval = 50,	/* 50ms */
@@ -577,6 +574,8 @@
 	sc->sc_play_chan.priv_sc = sc;
 	sc->sc_rec_chan.priv_sc = sc;
 	sc->sc_udev = uaa->device;
+	sc->sc_mixer_iface_index = uaa->info.bIfaceIndex;
+	sc->sc_mixer_iface_no = uaa->info.bIfaceNum;
 
 	if (usb_test_quirk(uaa, UQ_AUDIO_SWAP_LR))
 		sc->sc_uq_audio_swap_lr = 1;
@@ -600,9 +599,6 @@
 
 	uaudio_mixer_fill_info(sc, uaa->device, id);
 
-	sc->sc_mixer_iface_index = uaa->info.bIfaceIndex;
-	sc->sc_mixer_iface_no = uaa->info.bIfaceNum;
-
 	DPRINTF("audio rev %d.%02x\n",
 	    sc->sc_audio_rev >> 8,
 	    sc->sc_audio_rev & 0xff);
@@ -1119,34 +1115,11 @@
  * next audio transfer.
  */
 static void
-uaudio_setup_blockcount(struct uaudio_chan *ch, usb_frcount_t max_frames,
+uaudio_setup_blockcount(struct uaudio_chan *ch,
     uint32_t *total, uint32_t *blockcount)
 {
-	uint32_t temp;
-	uint32_t isiz;
-
-	/* allow dynamic sizing of play buffer */
-	isiz = ch->intr_size;
-
-	/* allow dynamic sizing of play buffer */
-	temp = isiz / ch->bytes_per_frame;
-
-	/* align units */
-	temp = UAUDIO_MINFRAMES_ALIGN(temp);
-
-	/* range check - min */
-	if (temp == 0)
-		temp = UAUDIO_MINFRAMES;
-
-	/* range check - max */
-	if (temp > max_frames)
-		temp = max_frames;
-
-	/* store blockcount */
-	*blockcount = temp;
-
-	/* compute the total length */
-	*total = temp * ch->bytes_per_frame;
+	*total = ch->intr_size;
+	*blockcount = ch->intr_frames;
 }
 
 static void
@@ -1162,8 +1135,12 @@
 
 	usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL);
 
-	uaudio_setup_blockcount(ch, usbd_xfer_max_frames(xfer),
-		&total, &blockcount);
+	uaudio_setup_blockcount(ch, &total, &blockcount);
+
+	if (ch->end == ch->start) {
+		DPRINTF("no buffer!\n");
+		return;
+	}
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
@@ -1187,10 +1164,6 @@
 		for (n = 0; n != blockcount; n++)
 			usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame);
 
-		if (ch->end == ch->start) {
-			DPRINTF("no buffer!\n");
-			break;
-		}
 		DPRINTFN(6, "transfer %d bytes\n", total);
 
 		offset = 0;
@@ -1235,17 +1208,23 @@
 	uint32_t blockcount;
 	uint32_t offset0;
 	uint32_t offset1;
+	uint32_t mfl;
 	int len;
-	int actlen, nframes;
+	int actlen;
+	int nframes;
 
 	usbd_xfer_status(xfer, &actlen, NULL, NULL, &nframes);
+	mfl = usbd_xfer_max_framelen(xfer);
 
-	uaudio_setup_blockcount(ch, usbd_xfer_max_frames(xfer),
-		&total, &blockcount);
+	uaudio_setup_blockcount(ch, &total, &blockcount);
+
+	if (ch->end == ch->start) {
+		DPRINTF("no buffer!\n");
+		return;
+	}
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
-tr_transferred:
 		if (actlen < total) {
 			DPRINTF("short transfer, "
 			    "%d of %d bytes\n", actlen, total);
@@ -1254,11 +1233,11 @@
 		}
 
 		offset0 = 0;
+		pc = usbd_xfer_get_frame(xfer, 0);
 
 		for (n = 0; n != nframes; n++) {
 
 			offset1 = offset0;
-			pc = usbd_xfer_get_frame(xfer, 0);
 			len = usbd_xfer_frame_len(xfer, n);
 
 			while (len > 0) {
@@ -1279,36 +1258,26 @@
 				}
 			}
 
-			offset0 += ch->bytes_per_frame;
+			offset0 += mfl;
 		}
 
 		chn_intr(ch->pcm_ch);
 
 	case USB_ST_SETUP:
-		if (ch->bytes_per_frame > usbd_xfer_max_framelen(xfer)) {
-			DPRINTF("bytes per transfer, %d, "
-			    "exceeds maximum, %d!\n",
-			    ch->bytes_per_frame,
-			    usbd_xfer_max_framelen(xfer));
-			return;
-		}
+tr_setup:
 		usbd_xfer_set_frames(xfer, blockcount);
 		for (n = 0; n < blockcount; n++) {
-			usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame);
+			usbd_xfer_set_frame_len(xfer, n, mfl);
 		}
 
-		if (ch->end == ch->start) {
-			DPRINTF("no buffer!\n");
-			return;
-		}
 		usbd_transfer_submit(xfer);
-		return;
+		break;
 
 	default:			/* Error */
 		if (error == USB_ERR_CANCELLED) {
-			return;
+			break;
 		}
-		goto tr_transferred;
+		goto tr_setup;
 	}
 }
 
@@ -1319,38 +1288,26 @@
 	struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ?
 	    &sc->sc_play_chan : &sc->sc_rec_chan);
 	uint32_t buf_size;
+	uint32_t frames;
 	uint8_t endpoint;
+	uint8_t blocks;
 	uint8_t iface_index;
 	uint8_t alt_index;
+	uint8_t fps_shift;
 	usb_error_t err;
 
+	if (usbd_get_isoc_fps(sc->sc_udev) < 8000) {
+		/* FULL speed USB */
+		frames = 8;
+	} else {
+		/* HIGH speed USB */
+		frames = UAUDIO_NFRAMES;
+	}
+
 	/* compute required buffer size */
-	buf_size = (ch->bytes_per_frame * UAUDIO_MINFRAMES);
 
-	/* setup interrupt interval */
-	ch->intr_size = buf_size;
+	buf_size = (ch->bytes_per_frame * frames);
 
-	/* double buffering */
-	buf_size *= 2;
-
-	ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO);
-	if (ch->buf == NULL) {
-		goto error;
-	}
-	if (sndbuf_setup(b, ch->buf, buf_size) != 0) {
-		goto error;
-	}
-	ch->start = ch->buf;
-	ch->end = ch->buf + buf_size;
-	ch->cur = ch->buf;
-	ch->pcm_ch = c;
-	ch->pcm_mtx = c->lock;
-	ch->pcm_buf = b;
-
-	if (ch->pcm_mtx == NULL) {
-		DPRINTF("ERROR: PCM channels does not have a mutex!\n");
-		goto error;
-	}
 	/* setup play/record format */
 
 	ch->pcm_cap.fmtlist = ch->pcm_format;
@@ -1370,7 +1327,6 @@
 
 	ch->pcm_cap.fmtlist[1] = 0;
 
-
 	/* set alternate interface corresponding to the mode */
 
 	endpoint = ch->p_ed1->bEndpointAddress;
@@ -1407,6 +1363,43 @@
 		DPRINTF("could not allocate USB transfers!\n");
 		goto error;
 	}
+
+	fps_shift = usbd_xfer_get_fps_shift(ch->xfer[0]);
+
+	/* setup frame sizes */
+	ch->intr_size = buf_size;
+	ch->intr_frames = (frames >> fps_shift);
+	ch->bytes_per_frame <<= fps_shift;
+
+	if (ch->intr_frames == 0) {
+		DPRINTF("frame shift is too high!\n");
+		goto error;
+	}
+
+	/* setup double buffering */
+	buf_size *= 2;
+	blocks = 2;
+
+	ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO);
+	if (ch->buf == NULL)
+		goto error;
+	if (sndbuf_setup(b, ch->buf, buf_size) != 0)
+		goto error;
+	if (sndbuf_resize(b, blocks, ch->intr_size)) 
+		goto error;
+
+	ch->start = ch->buf;
+	ch->end = ch->buf + buf_size;
+	ch->cur = ch->buf;
+	ch->pcm_ch = c;
+	ch->pcm_mtx = c->lock;
+	ch->pcm_buf = b;
+
+	if (ch->pcm_mtx == NULL) {
+		DPRINTF("ERROR: PCM channels does not have a mutex!\n");
+		goto error;
+	}
+
 	return (ch);
 
 error:
@@ -1431,30 +1424,13 @@
 int
 uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize)
 {
-	uaudio_chan_set_param_fragments(ch, blocksize, 0 - 1);
-
-	return (ch->block_size);
+	return (ch->intr_size);
 }
 
 int
 uaudio_chan_set_param_fragments(struct uaudio_chan *ch, uint32_t blocksize,
     uint32_t blockcount)
 {
-	/* we only support one size */
-	blocksize = ch->intr_size;
-	blockcount = 2;
-
-	if ((sndbuf_getblksz(ch->pcm_buf) != blocksize) ||
-	    (sndbuf_getblkcnt(ch->pcm_buf) != blockcount)) {
-		DPRINTFN(1, "resizing to %u x "
-		    "%u bytes\n", blockcount, blocksize);
-		if (sndbuf_resize(ch->pcm_buf, blockcount, blocksize)) {
-			DPRINTFN(0, "failed to resize sound buffer, count=%u, "
-			    "size=%u\n", blockcount, blocksize);
-		}
-	}
-	ch->block_size = sndbuf_getblksz(ch->pcm_buf);
-
 	return (1);
 }
 
@@ -1591,12 +1567,12 @@
 		DPRINTF("adding %d\n", mc->ctl);
 	}
 
-	mc->delta = 0;
 	if (mc->type == MIX_ON_OFF) {
 		mc->minval = 0;
 		mc->maxval = 1;
+		mc->mod = 1;
 	} else if (mc->type == MIX_SELECTOR) {
-
+		mc->mod = 1;
 	} else {
 
 		/* determine min and max values */
@@ -1607,21 +1583,30 @@
 
 		mc->maxval = uaudio_mixer_get(sc->sc_udev, GET_MAX, mc);
 
-		mc->maxval = 1 + uaudio_mixer_signext(mc->type, mc->maxval);
+		mc->maxval = uaudio_mixer_signext(mc->type, mc->maxval);
+
+		/* check if max and min was swapped */
+
+		if (mc->maxval < mc->minval) {
+			res = mc->maxval;
+			mc->maxval = mc->minval;
+			mc->minval = res;
+		}
 
+		/* compute value range */
 		mc->mul = mc->maxval - mc->minval;
-		if (mc->mul == 0) {
+		if (mc->mul == 0)
 			mc->mul = 1;
-		}
+
+		/* compute value alignment */
 		res = uaudio_mixer_get(sc->sc_udev, GET_RES, mc);
-		if (res > 0) {
-			mc->delta = ((res * 255) + (mc->mul / 2)) / mc->mul;
-		}
+		if (res == 0)
+			res = 1;
+		mc->mod = mc->mul / res;
+		if (mc->mod == 0)
+			mc->mod = 1;
 	}
 
-	if (mc->maxval < mc->minval) {
-		mc->maxval = mc->minval;
-	}
 	uaudio_mixer_add_ctl_sub(sc, mc);
 
 #if USB_DEBUG
@@ -3108,7 +3093,21 @@
 			val = mc->minval;
 		}
 	} else {
-		val = (((val + (mc->delta / 2)) * mc->mul) / 255) + mc->minval;
+
+		/* compute actual volume */
+		val = (val * mc->mul) / 255;
+
+		/* align volume level */
+		val = val - (val % mc->mod);
+
+		/* add lower offset */
+		val = val + mc->minval;
+
+		/* make sure we don't write a value out of range */
+		if (val > mc->maxval)
+			val = mc->maxval;
+		else if (val < mc->minval)
+			val = mc->minval;
 	}
 
 	DPRINTFN(6, "type=0x%03x val=%d min=%d max=%d val=%d\n",
From rene at FreeBSD.org  Sat Nov  7 21:12:54 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sat Nov  7 21:14:19 2009
Subject: PERFORCE change 170327 for review
Message-ID: <200911072112.nA7LCrc7070697@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170327

Change 170327 by rene@rene_self on 2009/11/07 21:12:31

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#36 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#31 integrate
.. //depot/projects/docproj_nl/share/sgml/mirrors.xml#10 integrate
.. //depot/projects/docproj_nl/www/en/internal/i18n.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/platforms/arm.sgml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#13 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#13 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#8 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#36 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -1447,9 +1447,12 @@
           disabled by default), can be enabled by adding
           gdm_enable="YES" to
           /etc/rc.conf.  Once you have rebooted,
-          GNOME will start automatically
-          once you log in — no further configuration is
-          necessary.
+          GDM will start automatically.
+
+	Additionally, to enable all GNOME
+	  services when GDM starts, add 
+	  gnome_enable="YES" to 
+	  /etc/rc.conf.
 
         GNOME may also be started
 	  from the command-line by properly configuring a file named

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#31 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.63 2009/08/24 18:50:35 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.65 2009/11/05 12:35:43 remko Exp $
     
   
 
@@ -3016,4 +3016,40 @@
       Source project it sells products for.
     
   
+
+  
+    Mejo Jose
+    http://www.kannayath.com
+    
+      Open source technology consultant based in Dubai, UAE.  More
+      information on the website -
+      www.kannayath.com
+    
+  
+
+  
+    Interfuture Systems Ltd
+    http://www.interfuture.co.uk
+    
+      Interfuture is an UK company offering a full range of UNIX
+      consultancy, from desktop installation and support through to
+      mission-critical server support and troubleshooting. One of our
+      specialist areas and preferred operating systems is FreeBSD.
+      Visit our website for more information:
+      http://www.interfuture.co.uk/specialists/unix.php
+      or call +44 203 002 2111.
+    
+  
+
+  
+    Sense of Security Pty Ltd
+    http://www.senseofsecurity.com.au/
+    
+      Sense of Security is an Australian provider of Free BSD and Unix
+      consulting services. We have a strong focus on building secure
+      networks and systems, including firewalls, VPNs, web servers, etc.
+      We are also experts at conducting security review, audit,
+      penetration testing, and assessment services.
+    
+  
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#13 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.50 2009/11/02 13:02:38 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.52 2009/11/05 12:39:39 remko Exp $
     
   
 
@@ -1027,4 +1027,44 @@
       Canada.
     
   
+
+  
+    Argentina.com
+    http://www.argentina.com
+    
+      Argentina.com is an Argentina
+      based Hosting and e-mail provider with FreeBSD infrastructure and
+      Globalcrossing connectivity.  We offer FreeBSD-stable dedicated
+      servers with great connectivity, Shared hosting on Plesk for FreeBSD,
+      and Corporate FreeBSD based email hosting.
+    
+  
+
+  
+    SkilTech, Inc.
+    http://www.skiltech.com
+    
+      SkilTech Web Design and Hosting, based in Elkton, MD, has been
+      offering FreeBSD based hosting since 1998. Both shared and dedicated
+      web hosting solutions are available, and unlike many larger firms,
+      we can work with our customers to address their individual hosting
+      needs.
+    
+  
+
+  
+    Ermis | Domeinruimte
+    http://www.ermis.nl
+    
+      Ermis | Domeinruimte has been hosting websites since 2004 on FreeBSD
+      servers, but also offer anti-spam services, backup MX, handle domain
+      name registrations and offer IT services to our corporate clients.
+      We strive to bring the best service for the lowest price.  Since we
+      are based in Rotterdam (the Netherlands) all our services are
+      available primarily in Dutch, where possible but also offer services
+      in English for our international clients.  We colocated our
+      infrastructure in a climate neutral datacenter and our servers'
+      energy consumption is remarkably low but retain performance.
+    
+  
 

==== //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 
 
-
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.software.xml,v 1.11 2009/02/26 20:48:10 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.software.xml,v 1.12 2009/11/05 12:30:58 remko Exp $
     
   
 
@@ -1997,4 +1997,20 @@
 	href='http://www.advsofteng.com/download.html'>http://www.advsofteng.com/download.html.
     
   
+
+  
+    Lingua-Systems Software GmbH
+    http://www.lingua-systems.com
+    
+      Lingua-Systems is dedicated to providing high-quality, Unix-based
+      software solutions for natural language processing that fulfill
+      the principles of simplicity and efficiency and are developed with
+      passion founded on solid research.  All our
+      products,
+      including the
+      "lid" language identifier,
+      are available for FreeBSD.  For more information, visit our website:
+      http://www.lingua-systems.com/.
+    
+  
 

==== //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#8 (text+ko) ====

@@ -5,7 +5,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/usergroups.xml,v 1.81 2009/10/02 00:40:43 delphij Exp $
+      $FreeBSD: www/share/sgml/usergroups.xml,v 1.82 2009/11/05 12:24:41 remko Exp $
     
   
 
@@ -596,7 +596,7 @@
 
   
     The Berkeley Unix User Group
-    http://www.weak.org/buug
+    http://www.buug.org
     The Berkeley Unix User Group is a general Unix Users
       Group for anyone in the San Fransico Bay Area.  We meet on a
       weekly basis in downtown Berkeley.  Visit the web site or send a
From rene at FreeBSD.org  Sat Nov  7 21:23:05 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sat Nov  7 21:23:11 2009
Subject: PERFORCE change 170328 for review
Message-ID: <200911072123.nA7LN35p071412@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170328

Change 170328 by rene@rene_self on 2009/11/07 21:22:22

	MFen handbook/x11 1.195 -> 1.196	

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#19 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#19 (text+ko) ====

@@ -3,7 +3,7 @@
 
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.22 2009/10/02 18:10:14 rene Exp $
      %SOURCE%	en_US.ISO8859-1/books/handbook/x11/chapter.sgml
-     %SRCID%	1.195
+     %SRCID%	1.196
 -->
 
 
@@ -1548,9 +1548,12 @@
 	  maar staat standaard uitgeschakeld.  Dit programma kan
 	  ingeschakeld worden door gdm_enable="YES"
 	  toe te voegen aan /etc/rc.conf.  Na
-	  herstarten start GNOME
-	  automatisch bij het aanmelden.  Er zijn geen verdere
-	  instellingen nodig.
+	  herstarten start GDM automatisch.
+
+	Verder kan gnome_enable="YES" aan
+	  /etc/rc.conf worden toegevoegd om alle diensten
+	  van GNOME aan te zetten wanneer
+	  GDM start.
 
 	GNOME kan ook gestart worden
 	  vanaf de commandoregel door het bestand
From rene at FreeBSD.org  Sun Nov  8 00:11:54 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sun Nov  8 00:12:08 2009
Subject: PERFORCE change 170336 for review
Message-ID: <200911080011.nA80BrOc086885@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170336

Change 170336 by rene@rene_self on 2009/11/08 00:11:08

	[website]
	MFen where.sgml 1.100 -> 1.101

Affected files ...

.. //depot/projects/docproj_nl/www/nl/where.sgml#11 edit

Differences ...

==== //depot/projects/docproj_nl/www/nl/where.sgml#11 (text+ko) ====

@@ -6,7 +6,7 @@
 ]>
 
 
   &header;
@@ -39,6 +39,8 @@
 	href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/mirrors.html">CD-ROM
 	en DVD verkopers.
    
 
+    
+
     
    &os; downloaden
    
 
     
    
 
 
 
 
     
 
 
 
 
 
 
 
 
 
   
    
From hselasky at FreeBSD.org  Sun Nov  8 10:43:26 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sun Nov  8 10:43:33 2009
Subject: PERFORCE change 170347 for review
Message-ID: <200911081043.nA8AhPvZ073291@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170347

Change 170347 by hselasky@hselasky_laptop001 on 2009/11/08 10:43:19

	
	LibUSB:
	 - try to sync the libusb v1.0 API with v1.0.4 from sourceforge. Mostly
	 add missing functions.

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb.h#10 edit
.. //depot/projects/usb/src/lib/libusb/libusb10.c#13 edit
.. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#10 edit
.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#10 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb.h#10 (text+ko) ====

@@ -271,9 +271,11 @@
 	uint16_t wLength;
 }	libusb_control_setup;
 
+#define	LIBUSB_CONTROL_SETUP_SIZE	8	/* bytes */
+
 typedef struct libusb_iso_packet_descriptor {
-	unsigned int length;
-	unsigned int actual_length;
+	uint32_t length;
+	uint32_t actual_length;
 	enum libusb_transfer_status status;
 }	libusb_iso_packet_descriptor __aligned(sizeof(void *));
 
@@ -282,9 +284,9 @@
 typedef struct libusb_transfer {
 	libusb_device_handle *dev_handle;
 	uint8_t	flags;
-	unsigned int endpoint;
+	uint32_t endpoint;
 	uint8_t type;
-	unsigned int timeout;
+	uint32_t timeout;
 	enum libusb_transfer_status status;
 	int	length;
 	int	actual_length;
@@ -320,7 +322,7 @@
 int	libusb_set_configuration(libusb_device_handle * devh, int configuration);
 int	libusb_claim_interface(libusb_device_handle * devh, int interface_number);
 int	libusb_release_interface(libusb_device_handle * devh, int interface_number);
-int	libusb_reset_device(libusb_device_handle * dev);
+int	libusb_reset_device(libusb_device_handle * devh);
 int 	libusb_kernel_driver_active(libusb_device_handle * devh, int interface);
 int 	libusb_detach_kernel_driver(libusb_device_handle * devh, int interface);
 int 	libusb_attach_kernel_driver(libusb_device_handle * devh, int interface);
@@ -333,7 +335,8 @@
 int	libusb_get_config_descriptor(libusb_device * dev, uint8_t config_index, struct libusb_config_descriptor **config);
 int	libusb_get_config_descriptor_by_value(libusb_device * dev, uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
 void	libusb_free_config_descriptor(struct libusb_config_descriptor *config);
-int	libusb_get_string_descriptor_ascii(libusb_device_handle * dev, uint8_t desc_index, uint8_t *data, int length);
+int	libusb_get_string_descriptor_ascii(libusb_device_handle * devh, uint8_t desc_index, uint8_t *data, int length);
+int	libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length);
 
 /* Asynchronous device I/O */
 
@@ -341,7 +344,16 @@
 void	libusb_free_transfer(struct libusb_transfer *transfer);
 int	libusb_submit_transfer(struct libusb_transfer *transfer);
 int	libusb_cancel_transfer(struct libusb_transfer *transfer);
-uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, unsigned int packet);
+uint8_t *libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index);
+uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index);
+void	libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length);
+uint8_t *libusb_control_transfer_get_data(struct libusb_transfer *transfer);
+struct libusb_control_setup *libusb_control_transfer_get_setup(struct libusb_transfer *transfer);
+void	libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength);
+void	libusb_fill_control_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t *buf, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
+void	libusb_fill_bulk_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
+void	libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
+void	libusb_fill_iso_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, int npacket, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
 
 /* Polling and timing */
 
@@ -362,9 +374,14 @@
 
 /* Synchronous device I/O */
 
-int	libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, unsigned int timeout);
-int	libusb_bulk_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout);
-int	libusb_interrupt_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout);
+int	libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, uint32_t timeout);
+int	libusb_bulk_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout);
+int	libusb_interrupt_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout);
+
+/* Byte-order */
+
+uint16_t libusb_cpu_to_le16(uint16_t x);
+uint16_t libusb_le16_to_cpu(uint16_t x);
 
 #if 0
 {					/* indent fix */

==== //depot/projects/usb/src/lib/libusb/libusb10.c#13 (text+ko) ====

@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
@@ -1197,7 +1198,7 @@
 	struct libusb20_transfer *pxfer1;
 	struct libusb_super_transfer *sxfer;
 	struct libusb_device *dev;
-	unsigned int endpoint;
+	uint32_t endpoint;
 	int err;
 
 	if (uxfer == NULL)
@@ -1254,7 +1255,7 @@
 	struct libusb20_transfer *pxfer1;
 	struct libusb_super_transfer *sxfer;
 	struct libusb_device *dev;
-	unsigned int endpoint;
+	uint32_t endpoint;
 
 	if (uxfer == NULL)
 		return (LIBUSB_ERROR_INVALID_PARAM);
@@ -1314,3 +1315,16 @@
 {
 	/* TODO */
 }
+
+uint16_t
+libusb_cpu_to_le16(uint16_t x)
+{
+	return (htole16(x));
+}
+
+uint16_t
+libusb_le16_to_cpu(uint16_t x)
+{
+	return (le16toh(x));
+}
+

==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#10 (text+ko) ====

@@ -307,3 +307,12 @@
 
 	return (LIBUSB_ERROR_OTHER);
 }
+
+int
+libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, 
+    uint8_t desc_index, uint8_t *data, int length)
+{
+	return (libusb_control_transfer(devh, LIBUSB_ENDPOINT_IN,
+	    LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data,
+	    length, 1000));
+}

==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#10 (text+ko) ====

@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
@@ -573,3 +574,160 @@
 	DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_interrupt_transfer leave");
 	return (ret);
 }
+
+uint8_t *
+libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index)
+{
+	uint8_t *ptr;
+	uint32_t n;
+
+	if (transfer->num_iso_packets < 0)
+		return (NULL);
+
+	if (index >= (uint32_t)transfer->num_iso_packets)
+		return (NULL);
+
+	ptr = transfer->buffer;
+	if (ptr == NULL)
+		return (NULL);
+
+	for (n = 0; n != index; n++) {
+		ptr += transfer->iso_packet_desc[n].length;
+	}
+	return (ptr);
+}
+
+uint8_t *
+libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index)
+{
+	uint8_t *ptr;
+
+	if (transfer->num_iso_packets < 0)
+		return (NULL);
+
+	if (index >= (uint32_t)transfer->num_iso_packets)
+		return (NULL);
+
+	ptr = transfer->buffer;
+	if (ptr == NULL)
+		return (NULL);
+
+	ptr += transfer->iso_packet_desc[0].length * index;
+
+	return (ptr);
+}
+
+void
+libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length)
+{
+	int n;
+
+	if (transfer->num_iso_packets < 0)
+		return;
+
+	for (n = 0; n != transfer->num_iso_packets; n++)
+		transfer->iso_packet_desc[n].length = length;
+}
+
+uint8_t *
+libusb_control_transfer_get_data(struct libusb_transfer *transfer)
+{
+	if (transfer->buffer == NULL)
+		return (NULL);
+
+	return (transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE);
+}
+
+struct libusb_control_setup *
+libusb_control_transfer_get_setup(struct libusb_transfer *transfer)
+{
+	return ((struct libusb_control_setup *)transfer->buffer);
+}
+
+void
+libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType,
+    uint8_t bRequest, uint16_t wValue,
+    uint16_t wIndex, uint16_t wLength)
+{
+	struct libusb_control_setup *req = (struct libusb_control_setup *)buf;
+
+	/* The alignment is OK for all fields below. */
+	req->bmRequestType = bmRequestType;
+	req->bRequest = bRequest;
+	req->wValue = htole16(wValue);
+	req->wIndex = htole16(wIndex);
+	req->wLength = htole16(wLength);
+}
+
+void
+libusb_fill_control_transfer(struct libusb_transfer *transfer, 
+    libusb_device_handle *devh, uint8_t *buf,
+    libusb_transfer_cb_fn callback, void *user_data,
+    uint32_t timeout)
+{
+	struct libusb_control_setup *setup = (struct libusb_control_setup *)buf;
+
+	transfer->dev_handle = devh;
+	transfer->endpoint = 0;
+	transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	if (setup != NULL)
+		transfer->length = LIBUSB_CONTROL_SETUP_SIZE
+			+ le16toh(setup->wLength);
+	else
+		transfer->length = 0;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+
+}
+
+void
+libusb_fill_bulk_transfer(struct libusb_transfer *transfer, 
+    libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, 
+    int length, libusb_transfer_cb_fn callback, void *user_data,
+    uint32_t timeout)
+{
+	transfer->dev_handle = devh;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_BULK;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	transfer->length = length;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+void
+libusb_fill_interrupt_transfer(struct libusb_transfer *transfer,
+    libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf,
+    int length, libusb_transfer_cb_fn callback, void *user_data,
+    uint32_t timeout)
+{
+	transfer->dev_handle = devh;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	transfer->length = length;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+void
+libusb_fill_iso_transfer(struct libusb_transfer *transfer, 
+    libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf,
+    int length, int npacket, libusb_transfer_cb_fn callback,
+    void *user_data, uint32_t timeout)
+{
+	transfer->dev_handle = devh;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	transfer->length = length;
+	transfer->num_iso_packets = npacket;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
From hselasky at FreeBSD.org  Sun Nov  8 10:55:39 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sun Nov  8 10:55:45 2009
Subject: PERFORCE change 170348 for review
Message-ID: <200911081055.nA8Atcns074144@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170348

Change 170348 by hselasky@hselasky_laptop001 on 2009/11/08 10:54:42

	
	LibUSB v1.0 - fix a possible device leak.

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb10.c#14 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb10.c#14 (text+ko) ====

@@ -186,8 +186,6 @@
 	/* create libusb v1.0 compliant devices */
 	i = 0;
 	while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) {
-		/* get device into libUSB v1.0 list */
-		libusb20_be_dequeue_device(usb_backend, pdev);
 
 		dev = malloc(sizeof(*dev));
 		if (dev == NULL) {
@@ -200,6 +198,10 @@
 			libusb20_be_free(usb_backend);
 			return (LIBUSB_ERROR_NO_MEM);
 		}
+
+		/* get device into libUSB v1.0 list */
+		libusb20_be_dequeue_device(usb_backend, pdev);
+
 		memset(dev, 0, sizeof(*dev));
 
 		/* init transfer queues */
From hselasky at FreeBSD.org  Sun Nov  8 13:28:13 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sun Nov  8 13:28:20 2009
Subject: PERFORCE change 170355 for review
Message-ID: <200911081328.nA8DSCu2098390@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170355

Change 170355 by hselasky@hselasky_laptop001 on 2009/11/08 13:27:55

	
	USB controller:
		 - adjust debug output
		 - suggested by Alexander Nedotsukov

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#41 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#41 (text+ko) ====

@@ -1498,7 +1498,8 @@
 {
 	ehci_softc_t *sc = arg;
 
-	DPRINTFN(3, "ehci_intrq_timeout\n");
+	DPRINTFN(3, "\n");
+
 	ehci_interrupt_poll(sc);
 }
 
From mav at FreeBSD.org  Sun Nov  8 14:02:48 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Sun Nov  8 14:02:55 2009
Subject: PERFORCE change 170357 for review
Message-ID: <200911081402.nA8E2ltw001124@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170357

Change 170357 by mav@mav_mavbook on 2009/11/08 14:02:33

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#2 integrate
.. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dighost.c#4 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#7 integrate
.. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_i386.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libstand/udp.c#2 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#3 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/chpmon.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/eltsub.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/eltsub.h#1 branch
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getencstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getnobj.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getobjmap.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getobjstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/inienc.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/sesd.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/setencstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/setobjstat.c#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/ata.4#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/hptrr.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#6 integrate
.. //depot/projects/scottl-camlock/src/share/misc/iso3166#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/gdb_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#41 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_hfsc.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_isa.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pccard.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_anreg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/patm/if_patm_attach.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/vga_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stge.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vgevar.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vnops.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ichwd/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_sppp.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mman.h#6 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#4 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $");
 
 #include 
 
@@ -51,6 +51,13 @@
 
 int yylex(void);
 
+struct varname
+{
+	struct varname *next;
+	char name[1];
+};
+static struct varname *varnames;
+
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
 	result = (*buf = *arith_buf++) ? 1 : YY_NULL;
@@ -80,11 +87,14 @@
 			 * If variable doesn't exist, we should initialize
 			 * it to zero.
 			 */
-			char *temp;
+			struct varname *temp;
 			if (lookupvar(yytext) == NULL)
 				setvarsafe(yytext, "0", 0);
-			temp = (char *)ckmalloc(strlen(yytext) + 1);
-			yylval.s_value = strcpy(temp, yytext);
+			temp = ckmalloc(sizeof(struct varname) +
+			    strlen(yytext));
+			temp->next = varnames;
+			varnames = temp;
+			yylval.s_value = strcpy(temp->name, yytext);
 
 			return ARITH_VAR;
 		}
@@ -130,5 +140,15 @@
 void
 arith_lex_reset(void)
 {
+	struct varname *name, *next;
+
 	YY_NEW_FILE;
+
+	name = varnames;
+	while (name != NULL) {
+		next = name->next;
+		ckfree(name);
+		name = next;
+	}
+	varnames = NULL;
 }

==== //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dighost.c#4 (text+ko) ====

@@ -2604,10 +2604,12 @@
 
 	if (sevent->result == ISC_R_CANCELED) {
 		debug("in cancel handler");
-		isc_socket_detach(&query->sock);
-		sockcount--;
-		INSIST(sockcount >= 0);
-		debug("sockcount=%d", sockcount);
+		if (query->sock != NULL) {
+			isc_socket_detach(&query->sock);
+			sockcount--;
+			INSIST(sockcount >= 0);
+			debug("sockcount=%d", sockcount);
+		}
 		query->waiting_connect = ISC_FALSE;
 		isc_event_free(&event);
 		l = query->lookup;

==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#7 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.280 2009/11/07 22:13:29 dougb Exp $
 %
 =======================================================================
 ||								     ||
@@ -69,6 +69,17 @@
 
 		-- CommUNIXque 1:1, ASCAR Business Systems
 %
+			   1/2
+	12 + 144 + 20 + 3*4                    2
+	----------------------  +  5 * 11  =  9  +  0
+		  7
+
+A dozen, a gross and a score,
+Plus three times the square root of four,
+	Divided by seven,
+	Plus five times eleven,
+Equals nine squared plus zero, no more!
+%
 			-- Gifts for Children --
 
 This is easy.  You never have to figure out what to get for children,
@@ -674,17 +685,6 @@
 %
 	... with liberty and justice for all who can afford it.
 %
-			   1/2
-	12 + 144 + 20 + 3*4                    2
-	----------------------  +  5 * 11  =  9  +  0
-		  7
-
-A dozen, a gross and a score,
-Plus three times the square root of four,
-	Divided by seven,
-	Plus five times eleven,
-Equals nine squared plus zero, no more!
-%
 	7,140	pounds on the Sun
 	   97	pounds on Mercury or Mars
 	  255	pounds on Earth
@@ -2516,12 +2516,6 @@
 yourself for far less money.  This article can help you.
 		-- Dave Barry, "The Taming of the Screw"
 %
-	I'd say that VCS is more like the anal sex of the software
-world: Everybody talks about it, some people do it, some people enjoy
-it, but typically only vague implications about the best techniques
-are ever voiced in public.
-              -- Warner Losh, on Version Control Systems
-%
 	"I'll tell you what I know, then," he decided.  "The pin I'm wearing
 means I'm a member of the IA.  That's Inamorati Anonymous.  An inamorato is
 somebody in love.  That's the worst addiction of all."
@@ -25228,7 +25222,8 @@
 		-- Sylvestre Matuschka, "the Hungarian Train Wreck Freak",
 		   escaped prison 1937, not heard from since
 %
-Iam
+I
+am
 not
 very
 happy
@@ -33070,6 +33065,10 @@
 %
 May a Misguided Platypus lay its Eggs in your Jockey Shorts
 %
+May all your Emus lay soft boiled eggs, and may all your
+Kangaroos be born with iPods already fitted.
+		-- Aussie New Years wish, found on hasselbladinfo.com
+%
 May all your PUSHes be POPped.
 %
 May Euell Gibbons eat your only copy of the manual!
@@ -59769,6 +59768,17 @@
 and now you're telling me just to be myself?
 		-- The Return of the Secaucus Seven
 %
+You've decked the halls with a dozen miles' length of electric lights. 
+Your front lawn is a gleaming testament of incandescent wonder. The neighbors 
+wear sunglasses 24/7,  and orbiting satellites have officially picked up 
+and pinpointed your house as the brightest spot on earth.
+        
+You've finally put together the Christmas wonderland of your dreams... now 
+if only you could get a good picture of it.
+        
+Photographing holiday lights is no easy task. 
+		-- from an email sent by photojojo.com
+%
 You've got to have a gimmick if your band sucks.
 		-- Gary Giddens
 %
@@ -59809,18 +59819,3 @@
 Zymurgy's Law of Volunteer Labor:
 	People are always available for work in the past tense.
 %
-You've decked the halls with a dozen miles' length of electric lights. 
-Your front lawn is a gleaming testament of incandescent wonder. The neighbors 
-wear sunglasses 24/7,  and orbiting satellites have officially picked up 
-and pinpointed your house as the brightest spot on earth.
-        
-You've finally put together the Christmas wonderland of your dreams... now 
-if only you could get a good picture of it.
-        
-Photographing holiday lights is no easy task. 
-		-- from an email sent by photojojo.com
-%
-May all your Emus lay soft boiled eggs, and may all your
-Kangaroos be born with iPods already fitted.
-		-- Aussie New Years wish, found on hasselbladinfo.com
-%

==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#6 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.32 2009/07/16 20:29:36 dougb Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.33 2009/11/07 21:28:21 dougb Exp $
 %
 						PLAYGIRL, Inc.
 						Philadelphia, Pa.  19369
@@ -1153,6 +1153,12 @@
 	"Gabriel's trumpet will produce you from the ass of a pig."
 		-- Al Swearingen, E. B. Farnum, _Deadwood_
 %
+	I'd say that VCS is more like the anal sex of the software
+world: Everybody talks about it, some people do it, some people enjoy
+it, but typically only vague implications about the best techniques
+are ever voiced in public.
+              -- Warner Losh, on Version Control Systems
+%
 	"I'll tell ya, Jeb," Wilbur said to his friend, "the tractor
 business ain't doin' too well.  I ain't sold one all month.
 	"You think you've got problems?" Jeb replied.  "The other day, I went

==== //depot/projects/scottl-camlock/src/lib/libc/nls/uk_UA.UTF-8.msg#2 (text+ko) ====

@@ -1,249 +1,259 @@
-$ $FreeBSD: src/lib/libc/nls/uk_UA.UTF-8.msg,v 1.1 2009/03/20 23:55:01 gabor Exp $
-$
-$ Message catalog for uk_UA.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ дозволена
-$ ENOENT
-2 Ðемає такого файлу або каталогу
-$ ESRCH
-3 Ðемає такого процеÑу
-$ EINTR
-4 Перервано виклик функції
-$ EIO
-5 Помилка вводу-виводу
-$ ENXIO
-6 Ðемає такого приÑтрою або адреÑи
-$ E2BIG
-7 Перелік аргументів надто довгий
-$ ENOEXEC
-8 Помилка формату виконуваного файлу
-$ EBADF
-9 Ðевірний деÑкриптор файлу
-$ ECHILD
-10 Ðемає дочірнього процеÑу
-$ EDEADLK
-11 Уникнуто взаємне Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑурÑів
-$ ENOMEM
-12 Ðе доÑтатньо пам'ÑÑ‚Ñ–
-$ EACCES
-13 Відмова у доÑтупі
-$ EFAULT
-14 Ðевірна адреÑа
-$ ENOTBLK
-15 Потрібен блочний приÑтрій
-$ EBUSY
-16 РеÑÑƒÑ€Ñ Ð·Ð°Ð¹Ð½Ñтий
-$ EEXIST
-17 Файл вже Ñ–Ñнує
-$ EXDEV
-18 ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð° межі приÑтрою
-$ ENODEV
-19 Ðемає такого приÑтрою
-$ ENOTDIR
-20 Це не каталог
-$ EISDIR
-21 Це каталог
-$ EINVAL
-22 Ðедозволений аргумент
-$ ENFILE
-23 Забагато відкритих файлів у ÑиÑтемі
-$ EMFILE
-24 Забагато відкритих файлів
-$ ENOTTY
-25 Це не термінал
-$ ETXTBSY
-26 ТекÑтовий файл зайнÑтий
-$ EFBIG
-27 Файл надто великий
-$ ENOSPC
-28 Ðе залишилоÑÑŒ міÑÑ†Ñ Ð½Ð° приÑтрої
-$ ESPIPE
-29 Ðедозволене позиціонуваннÑ
-$ EROFS
-30 Файлова ÑиÑтема лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ
-$ EMLINK
-31 Забагато поÑилань
-$ EPIPE
-32 Канал зруйновано
-$ EDOM
-33 Помилка облаÑÑ‚Ñ– визначеннÑ
-$ ERANGE
-34 Результат надто великий
-$ EAGAIN, EWOULDBLOCK
-35 РеÑÑƒÑ€Ñ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñово не доÑтупний
-$ EINPROGRESS
-36 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ñƒ процеÑÑ– виконаннÑ
-$ EALREADY
-37 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ð¶Ðµ виконуєтьÑÑ
-$ ENOTSOCK
-38 Це не Ñокет
-$ EDESTADDRREQ
-39 Ðеобхідна адреÑа призначеннÑ
-$ EMSGSIZE
-40 ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге
-$ EPROTOTYPE
-41 Помилковий тип протоколу Ð´Ð»Ñ Ñокету
-$ ENOPROTOOPT
-42 Ðемає такого протоколу
-$ EPROTONOSUPPORT
-43 Протокол не підтримуєтьÑÑ
-$ ESOCKTNOSUPPORT
-44 Цей тип Ñокету не підтримуєтьÑÑ
-$ EOPNOTSUPP
-45 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ підтримуєтьÑÑ
-$ EPFNOSUPPORT
-46 Родина протоколів не підтримуєтьÑÑ
-$ EAFNOSUPPORT
-47 Родина Ð°Ð´Ñ€ÐµÑ Ð½Ðµ підтримуєтьÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¾Ð¼
-$ EADDRINUSE
-48 ÐдреÑа вже викориÑтовуєтьÑÑ
-$ EADDRNOTAVAIL
-49 ÐдреÑа недоÑÑжна
-$ ENETDOWN
-50 Мережа не працює
-$ ENETUNREACH
-51 Мережа недоÑÑжна
-$ ENETRESET
-52 З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð¿Ð¸Ð½ÐµÐ½Ð¾ мережею
-$ ECONNABORTED
-53 З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð¿Ð¸Ð½ÐµÐ½Ð¾
-$ ECONNRESET
-54 З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð¿Ð¸Ð½ÐµÐ½Ð¾ протилежною Ñтороною
-$ ENOBUFS
-55 Ðемає вільних буферів
-$ EISCONN
-56 Сокет вже під'єднано
-$ ENOTCONN
-57 Сокет не під'єднано
-$ ESHUTDOWN
-58 Ðе можу відіÑлати піÑÐ»Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñокету протилежною Ñтороною
-$ ETOOMANYREFS
-59 Забагато поÑилань: не можу з'єднати
-$ ETIMEDOUT
-60 Вийшов ліміт чаÑу Ð´Ð»Ñ Ð·'єднаннÑ
-$ ECONNREFUSED
-61 Відмова у з'єднанні
-$ ELOOP
-62 Забагато рівнів Ñимволічних поÑилань
-$ ENAMETOOLONG
-63 Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ надто довге
-$ EHOSTDOWN
-64 ХоÑÑ‚ не працює
-$ EHOSTUNREACH
-65 ХоÑÑ‚ недоÑÑжний
-$ ENOTEMPTY
-66 Каталог не порожній
-$ EPROCLIM
-67 Забагато процеÑів
-$ EUSERS
-68 Забагато кориÑтувачів
-$ EDQUOT
-69 Перевищена диÑкова квота
-$ ESTALE
-70 ЗаÑтарілий деÑкриптор файлу NFS
-$ EREMOTE
-71 Віддалений об'єкт
-$ EBADRPC
-72 Погана Ñтруктура RPC
-$ ERPCMISMATCH
-73 Ðевірна верÑÑ–Ñ RPC
-$ EPROGUNAVAIL
-74 Програма RPC недоÑÑжна
-$ EPROGMISMATCH
-75 Ðевірна верÑÑ–Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸
-$ EPROCUNAVAIL
-76 Погана процедура Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸
-$ ENOLCK
-77 Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ доÑтупне
-$ ENOSYS
-78 Функцію не реалізовано
-$ EFTYPE
-79 Ðепридатний тип чи формат файлу
-$ EAUTH
-80 Помилка аутентифікації
-$ ENEEDAUTH
-81 Потрібна аутентифікаціÑ
-$ EIDRM
-82 Ідентифікатор вилучено
-$ ENOMSG
-83 Ðемає Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ð¶Ð°Ð½Ð¾Ð³Ð¾ типу
-$ EOVERFLOW
-84 Завелике Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ типу даних
-$ ECANCELED
-85 Операцію ÑкаÑовано
-$ EILSEQ
-86 Ðедозволена поÑлідовніÑÑ‚ÑŒ байтів
-$ ENOATTR
-87 Ðтрибут не знайдено
-$ EDOOFUS
-88 Помилка програмуваннÑ
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 ВідключеннÑ
-$ SIGINT
-2 ПерериваннÑ
-$ SIGQUIT
-3 Вихід
-$ SIGILL
-4 ÐеприпуÑтима інÑтрукціÑ
-$ SIGTRAP
-5 ПаÑтка траÑуваннÑ
-$ SIGABRT
-6 Ðварійне завершеннÑ
-$ SIGEMT
-7 ÐŸÐµÑ€ÐµÑ…Ð¾Ð¿Ð»ÐµÐ½Ð½Ñ ÐµÐ¼ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ð¾Ñ— інÑтрукції
-$ SIGFPE
-8 Помилка роботи з плаваючою крапкою
-$ SIGKILL
-9 Вбито
-$ SIGBUS
-10 Помилка шини
-$ SIGSEGV
-11 ÐŸÐ¾Ñ€ÑƒÑˆÐµÐ½Ð½Ñ Ñегментації
-$ SIGSYS
-12 Поганий ÑиÑтемний виклик
-$ SIGPIPE
-13 Канал зруйновано
-$ SIGALRM
-14 Таймер вичерпано
-$ SIGTERM
-15 ЗавершеннÑ
-$ SIGURG
-16 Ðевідкладний Ñтан на Ñокеті
-$ SIGSTOP
-17 Призупинено (Ñигнал)
-$ SIGTSTP
-18 Призупинено
-$ SIGCONT
-19 ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸
-$ SIGCHLD
-20 Зміна ÑтатуÑу дочірнього процеÑу
-$ SIGTTIN
-21 Зупинено (ввід з терміналу)
-$ SIGTTOU
-22 Зупинено (вивід на термінал)
-$ SIGIO
-23 Ввід-вивід можливий
-$ SIGXCPU
-24 Перевищено ліміт процеÑорного чаÑу
-$ SIGXFSZ
-25 Перевищено ліміт макÑимального розміру файла
-$ SIGVTALRM
-26 Віртуальний таймер вичерпано
-$ SIGPROF
-27 Таймер Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾
-$ SIGWINCH
-28 Розмір вікна змінено
-$ SIGINFO
-29 Запит інформації
-$ SIGUSR1
-30 Сигнал кориÑтувача 1
-$ SIGUSR2
-31 Сигнал кориÑтувача 2
+$ $FreeBSD: src/lib/libc/nls/uk_UA.UTF-8.msg,v 1.3 2009/11/08 11:55:03 gabor Exp $
+$
+$ Message catalog for uk_UA.UTF-8 locale
+$
+$ strerror() support catalog
+$
+$set 1
+$ EPERM
+1 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ дозволена
+$ ENOENT
+2 Ðемає такого файлу або каталогу
+$ ESRCH
+3 Ðемає такого процеÑу
+$ EINTR
+4 Перервано виклик функції
+$ EIO
+5 Помилка вводу-виводу
+$ ENXIO
+6 Ðемає такого приÑтрою або адреÑи
+$ E2BIG
+7 Перелік аргументів надто довгий
+$ ENOEXEC
+8 Помилка формату виконуваного файлу
+$ EBADF
+9 Ðевірний деÑкриптор файлу
+$ ECHILD
+10 Ðемає дочірнього процеÑу
+$ EDEADLK
+11 Уникнуто взаємне Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÑурÑів
+$ ENOMEM
+12 Ðе доÑтатньо пам'ÑÑ‚Ñ–
+$ EACCES
+13 Відмова у доÑтупі
+$ EFAULT
+14 Ðевірна адреÑа
+$ ENOTBLK
+15 Потрібен блочний приÑтрій
+$ EBUSY
+16 РеÑÑƒÑ€Ñ Ð·Ð°Ð¹Ð½Ñтий
+$ EEXIST
+17 Файл вже Ñ–Ñнує
+$ EXDEV
+18 ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð° межі приÑтрою
+$ ENODEV
+19 Ðемає такого приÑтрою
+$ ENOTDIR
+20 Це не каталог
+$ EISDIR
+21 Це каталог
+$ EINVAL
+22 Ðедозволений аргумент
+$ ENFILE
+23 Забагато відкритих файлів у ÑиÑтемі
+$ EMFILE
+24 Забагато відкритих файлів
+$ ENOTTY
+25 Це не термінал
+$ ETXTBSY
+26 ТекÑтовий файл зайнÑтий
+$ EFBIG
+27 Файл надто великий
+$ ENOSPC
+28 Ðе залишилоÑÑŒ міÑÑ†Ñ Ð½Ð° приÑтрої
+$ ESPIPE
+29 Ðедозволене позиціонуваннÑ
+$ EROFS
+30 Файлова ÑиÑтема лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ
+$ EMLINK
+31 Забагато поÑилань
+$ EPIPE
+32 Канал зруйновано
+$ EDOM
+33 Помилка облаÑÑ‚Ñ– визначеннÑ
+$ ERANGE
+34 Результат надто великий
+$ EAGAIN, EWOULDBLOCK
+35 РеÑÑƒÑ€Ñ Ñ‚Ð¸Ð¼Ñ‡Ð°Ñово не доÑтупний
+$ EINPROGRESS
+36 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ñƒ процеÑÑ– виконаннÑ
+$ EALREADY
+37 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð²Ð¶Ðµ виконуєтьÑÑ
+$ ENOTSOCK
+38 Це не Ñокет
+$ EDESTADDRREQ
+39 Ðеобхідна адреÑа призначеннÑ
+$ EMSGSIZE
+40 ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´Ñ‚Ð¾ довге
+$ EPROTOTYPE
+41 Помилковий тип протоколу Ð´Ð»Ñ Ñокету
+$ ENOPROTOOPT
+42 Ðемає такого протоколу
+$ EPROTONOSUPPORT
+43 Протокол не підтримуєтьÑÑ
+$ ESOCKTNOSUPPORT
+44 Цей тип Ñокету не підтримуєтьÑÑ
+$ EOPNOTSUPP
+45 ÐžÐ¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ підтримуєтьÑÑ
+$ EPFNOSUPPORT
+46 Родина протоколів не підтримуєтьÑÑ
+$ EAFNOSUPPORT
+47 Родина Ð°Ð´Ñ€ÐµÑ Ð½Ðµ підтримуєтьÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¾Ð¼
+$ EADDRINUSE
+48 ÐдреÑа вже викориÑтовуєтьÑÑ
+$ EADDRNOTAVAIL
+49 ÐдреÑа недоÑÑжна
+$ ENETDOWN
+50 Мережа не працює
+$ ENETUNREACH
+51 Мережа недоÑÑжна
+$ ENETRESET
+52 З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð¿Ð¸Ð½ÐµÐ½Ð¾ мережею
+$ ECONNABORTED
+53 З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð¿Ð¸Ð½ÐµÐ½Ð¾
+$ ECONNRESET
+54 З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð¿Ð¸Ð½ÐµÐ½Ð¾ протилежною Ñтороною
+$ ENOBUFS
+55 Ðемає вільних буферів
+$ EISCONN
+56 Сокет вже під'єднано
+$ ENOTCONN
+57 Сокет не під'єднано
+$ ESHUTDOWN
+58 Ðе можу відіÑлати піÑÐ»Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñокету протилежною Ñтороною
+$ ETOOMANYREFS
+59 Забагато поÑилань: не можу з'єднати
+$ ETIMEDOUT
+60 Вийшов ліміт чаÑу Ð´Ð»Ñ Ð·'єднаннÑ
+$ ECONNREFUSED
+61 Відмова у з'єднанні
+$ ELOOP
+62 Забагато рівнів Ñимволічних поÑилань
+$ ENAMETOOLONG
+63 Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ надто довге
+$ EHOSTDOWN
+64 ХоÑÑ‚ не працює
+$ EHOSTUNREACH
+65 ХоÑÑ‚ недоÑÑжний
+$ ENOTEMPTY
+66 Каталог не порожній
+$ EPROCLIM
+67 Забагато процеÑів
+$ EUSERS
+68 Забагато кориÑтувачів
+$ EDQUOT
+69 Перевищена диÑкова квота
+$ ESTALE
+70 ЗаÑтарілий деÑкриптор файлу NFS
+$ EREMOTE
+71 Віддалений об'єкт
+$ EBADRPC
+72 Погана Ñтруктура RPC
+$ ERPCMISMATCH
+73 Ðевірна верÑÑ–Ñ RPC
+$ EPROGUNAVAIL
+74 Програма RPC недоÑÑжна
+$ EPROGMISMATCH
+75 Ðевірна верÑÑ–Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸
+$ EPROCUNAVAIL
+76 Погана процедура Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸
+$ ENOLCK
+77 Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ðµ доÑтупне
+$ ENOSYS
+78 Функцію не реалізовано
+$ EFTYPE
+79 Ðепридатний тип чи формат файлу
+$ EAUTH
+80 Помилка аутентифікації
+$ ENEEDAUTH
+81 Потрібна аутентифікаціÑ
+$ EIDRM
+82 Ідентифікатор вилучено
+$ ENOMSG
+83 Ðемає Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð±Ð°Ð¶Ð°Ð½Ð¾Ð³Ð¾ типу
+$ EOVERFLOW
+84 Завелике Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ типу даних
+$ ECANCELED
+85 Операцію ÑкаÑовано
+$ EILSEQ
+86 Ðедозволена поÑлідовніÑÑ‚ÑŒ байтів
+$ ENOATTR
+87 Ðтрибут не знайдено
+$ EDOOFUS
+88 Помилка програмуваннÑ
+$ EBADMSG
+89 Поганий формат повідомленнÑ
+$ EMULTIHOP XXX
+90 Спроба мултіхопу
+$ ENOLINK
+91 Мережовий канал розірвано
+$ EPROTO
+92 Помилка протоколу
+$ ENOTCAPABLE
+93 МожливоÑÑ‚Ñ– недоÑтатні
+$
+$ strsignal() support catalog
+$
+$set 2
+$ SIGHUP
+1 ВідключеннÑ
+$ SIGINT
+2 ПерериваннÑ
+$ SIGQUIT
+3 Вихід
+$ SIGILL
+4 ÐеприпуÑтима інÑтрукціÑ
+$ SIGTRAP
+5 ПаÑтка траÑуваннÑ
+$ SIGABRT
+6 Ðварійне завершеннÑ
+$ SIGEMT
+7 ÐŸÐµÑ€ÐµÑ…Ð¾Ð¿Ð»ÐµÐ½Ð½Ñ ÐµÐ¼ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ð¾Ñ— інÑтрукції
+$ SIGFPE
+8 Помилка роботи з плаваючою крапкою
+$ SIGKILL
+9 Вбито
+$ SIGBUS
+10 Помилка шини
+$ SIGSEGV
+11 ÐŸÐ¾Ñ€ÑƒÑˆÐµÐ½Ð½Ñ Ñегментації
+$ SIGSYS
+12 Поганий ÑиÑтемний виклик
+$ SIGPIPE
+13 Канал зруйновано
+$ SIGALRM
+14 Таймер вичерпано
+$ SIGTERM
+15 ЗавершеннÑ
+$ SIGURG
+16 Ðевідкладний Ñтан на Ñокеті
+$ SIGSTOP
+17 Призупинено (Ñигнал)
+$ SIGTSTP
+18 Призупинено
+$ SIGCONT
+19 ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸
+$ SIGCHLD
+20 Зміна ÑтатуÑу дочірнього процеÑу
+$ SIGTTIN
+21 Зупинено (ввід з терміналу)
+$ SIGTTOU
+22 Зупинено (вивід на термінал)
+$ SIGIO
+23 Ввід-вивід можливий
+$ SIGXCPU
+24 Перевищено ліміт процеÑорного чаÑу
+$ SIGXFSZ
+25 Перевищено ліміт макÑимального розміру файла
+$ SIGVTALRM
+26 Віртуальний таймер вичерпано
+$ SIGPROF
+27 Таймер Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð¾
+$ SIGWINCH
+28 Розмір вікна змінено
+$ SIGINFO
+29 Запит інформації
+$ SIGUSR1
+30 Сигнал кориÑтувача 1
+$ SIGUSR2
+31 Сигнал кориÑтувача 2

==== //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#5 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.59 2009/07/26 06:38:56 alc Exp $
+.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.60 2009/11/06 07:17:31 ed Exp $
 .\"
-.Dd July 26, 2009
+.Dd November 6, 2009
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -108,6 +108,10 @@
 argument is ignored.
 .\".It Dv MAP_FILE
 .\"Mapped from a regular file or character-special device memory.
+.It Dv MAP_ANONYMOUS
+This flag is identical to
+.Dv MAP_ANON
+and is provided for compatibility.
 .It Dv MAP_FIXED
 Do not permit the system to select a different address than the one
 specified.

==== //depot/projects/scottl-camlock/src/lib/libkvm/kvm_i386.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.22 2009/06/14 12:42:06 ed Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.23 2009/11/06 13:10:12 jhb Exp $");
 
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
@@ -295,9 +295,9 @@
 #define	PG_FRAME4M	(~PAGE4M_MASK)
 		pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK);
 		s = _kvm_pa2off(kd, pde_pa, &ofs);
-		if (s < sizeof pde) {
-			_kvm_syserr(kd, kd->program,
-			    "_kvm_vatop: pde_pa not found");
+		if (s == 0) {
+			_kvm_err(kd, kd->program,
+			    "_kvm_vatop: 4MB page address not in dump");
 			goto invalid;
 		}
 		*pa = ofs;
@@ -391,9 +391,9 @@
 #define	PG_FRAME2M	(~PAGE2M_MASK)
 		pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK);
 		s = _kvm_pa2off(kd, pde_pa, &ofs);
-		if (s < sizeof pde) {
-			_kvm_syserr(kd, kd->program,
-			    "_kvm_vatop_pae: pde_pa not found");
+		if (s == 0) {
+			_kvm_err(kd, kd->program,
+			    "_kvm_vatop: 2MB page address not in dump");
 			goto invalid;
 		}
 		*pa = ofs;

==== //depot/projects/scottl-camlock/src/lib/libstand/udp.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.6 2007/01/09 01:02:04 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.7 2009/11/05 06:08:04 marcel Exp $");
 
 #include 
 #include 
@@ -90,7 +90,7 @@
 	ip->ip_hl = sizeof(*ip) >> 2;		/* half-char */
 	ip->ip_len = htons(len);
 	ip->ip_p = IPPROTO_UDP;			/* char */
-	ip->ip_ttl = IP_TTL;			/* char */
+	ip->ip_ttl = IPDEFTTL;			/* char */
 	ip->ip_src = d->myip;
 	ip->ip_dst = d->destip;
 	ip->ip_sum = in_cksum(ip, sizeof(*ip));	 /* short, but special */

==== //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.24 2009/04/06 11:08:33 luigi Exp $
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.25 2009/11/08 08:59:40 luigi Exp $
 #
 # Line starting with #PicoBSD contains PicoBSD build parameters
 #marker         def_sz  init    MFS_inodes      floppy_inodes
@@ -11,11 +11,14 @@
 # values accessible through getenv()
 # env		"PICOBSD.env"
 
-cpu		I486_CPU
+#cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
 ident		PICOBSD
 
+options		SMP
+device	apic
+
 options		SCHED_4BSD		# mandatory to have one scheduler
 #options	MATH_EMULATE		#Support for x87 emulation
 options 	INET			#InterNETworking

==== //depot/projects/scottl-camlock/src/share/examples/ses/srcs/chpmon.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.1 2000/02/29 05:44:16 mjacob Exp $ */
+/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.2 2009/11/04 23:36:23 delphij Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -47,9 +47,7 @@
 #define	BADSTAT	\
 	(SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL)
 int
-main(a, v)
-	int a;
-	char **v;
+main(int a, char **v)
 {
 	int fd, delay, dev;
 	ses_encstat stat, *carray;

==== //depot/projects/scottl-camlock/src/share/examples/ses/srcs/eltsub.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/share/examples/ses/srcs/eltsub.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
+/* $FreeBSD: src/share/examples/ses/srcs/eltsub.c,v 1.2 2009/11/04 23:36:23 delphij Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -38,9 +38,10 @@
 #include 
 #include SESINC
 
+#include "eltsub.h"
+
 char *
-geteltnm(type)
-	int type;
+geteltnm(int type)
 {
 	static char rbuf[132];
 
@@ -116,8 +117,7 @@
 }
 
 static char *
-scode2ascii(code)
-	u_char code;
+scode2ascii(u_char code)
 {
 	static char rbuf[32];
 	switch (code & 0xf) {
@@ -154,9 +154,7 @@
 
 
 char *
-stat2ascii(eletype, cstat)
-	int eletype;
-	u_char *cstat;
+stat2ascii(int eletype __unused, u_char *cstat)
 {
 	static char ebuf[256], *scode;
 

==== //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getencstat.c#2 (text+ko) ====


>>> TRUNCATED FOR MAIL (1000 lines) <<<
From mav at FreeBSD.org  Sun Nov  8 14:37:23 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Sun Nov  8 14:37:30 2009
Subject: PERFORCE change 170361 for review
Message-ID: <200911081437.nA8EbMvb004932@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170361

Change 170361 by mav@mav_mavbook on 2009/11/08 14:36:52

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#40 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#35 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#17 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#40 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1560 2009/10/29 09:51:13 ru Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1561 2009/11/08 14:33:19 mav Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1715,8 +1715,11 @@
 #
 # ATA_STATIC_ID:	controller numbering is static ie depends on location
 #			else the device numbers are dynamically allocated.
+# ATA_REQUEST_TIMEOUT:	the number of seconds to wait for an ATA request
+#			before timing out.
 
 options 	ATA_STATIC_ID
+#options 	ATA_REQUEST_TIMEOUT=10
 
 #
 # Standard floppy disk controllers and floppy tapes, supports

==== //depot/projects/scottl-camlock/src/sys/conf/options#35 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.693 2009/10/21 12:47:09 stas Exp $
+# $FreeBSD: src/sys/conf/options,v 1.694 2009/11/08 14:33:19 mav Exp $
 #
 #        On the handling of kernel options
 #
@@ -350,6 +350,7 @@
 # Options used in the 'ata' ATA/ATAPI driver
 ATA_STATIC_ID		opt_ata.h
 ATA_NOPCI		opt_ata.h
+ATA_REQUEST_TIMEOUT	opt_ata.h
 ATA_CAM			opt_ata.h
 
 # Net stuff.

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#23 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.148 2009/10/31 13:24:14 mav Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.149 2009/11/08 14:33:19 mav Exp $
  */
 
 #if 0
@@ -345,6 +345,10 @@
 #define ATA_OP_FINISHED                 1
 #define ATA_MAX_28BIT_LBA               268435455UL
 
+#ifndef	ATA_REQUEST_TIMEOUT
+#define	ATA_REQUEST_TIMEOUT		10
+#endif
+
 /* structure used for composite atomic operations */
 #define MAX_COMPOSITES          32              /* u_int32_t bits */
 struct ata_composite {

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#19 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.218 2009/10/26 11:20:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.219 2009/11/08 14:33:19 mav Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -230,7 +230,7 @@
     }
     request->dev = dev;
     request->flags = ATA_R_CONTROL;
-    request->timeout = 10;
+    request->timeout = ATA_REQUEST_TIMEOUT;
     request->retries = 1;
     request->callback = ad_power_callback;
     request->u.ata.command = ATA_STANDBY_IMMEDIATE;
@@ -262,10 +262,10 @@
     if (atadev->spindown_state) {
 	device_printf(dev, "request while spun down, starting.\n");
 	atadev->spindown_state = 0;
-	request->timeout = 31;
+	request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31);
     }
     else {
-	request->timeout = 10;
+	request->timeout = ATA_REQUEST_TIMEOUT;
     }
     request->retries = 2;
     request->data = bp->bio_data;
@@ -468,7 +468,7 @@
     request->u.ata.count = 0;
     request->u.ata.feature = 0;
     request->flags = ATA_R_CONTROL | ATA_R_QUIET;
-    request->timeout = 10;
+    request->timeout = ATA_REQUEST_TIMEOUT;
     request->retries = 0;
     ata_queue_request(request);
     if (request->status & ATA_S_ERROR)
@@ -487,7 +487,7 @@
     request->u.ata.count = 1;
     request->u.ata.feature = 0;
     request->flags = ATA_R_CONTROL;
-    request->timeout = 10;
+    request->timeout = ATA_REQUEST_TIMEOUT;
     request->retries = 0;
     ata_queue_request(request);
     if (request->status & ATA_S_ERROR)

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#24 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.88 2009/10/31 13:24:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.89 2009/11/08 14:33:19 mav Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -141,9 +141,9 @@
 	if (atadev->spindown_state) {
 	    device_printf(dev, "request while spun down, starting.\n");
 	    atadev->spindown_state = 0;
-	    request->timeout = 31;
+	    request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31);
 	} else {
-	    request->timeout = 10;
+	    request->timeout = ATA_REQUEST_TIMEOUT;
 	}
 	request->retries = 0;
 	ata_queue_request(request);
@@ -397,7 +397,7 @@
 	    request->bytecount = sizeof(struct atapi_sense);
 	    request->donecount = 0;
 	    request->transfersize = sizeof(struct atapi_sense);
-	    request->timeout = 10;
+	    request->timeout = ATA_REQUEST_TIMEOUT;
 	    request->flags &= (ATA_R_ATAPI | ATA_R_QUIET | ATA_R_DEBUG);
 	    request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE);
 	    ATA_DEBUG_RQ(request, "autoissue request sense");

==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#15 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.136 2009/10/26 11:20:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.137 2009/11/08 14:33:19 mav Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -273,7 +273,7 @@
 	request->u.ata.lba = 0;
 	request->u.ata.count = 0;
 	request->u.ata.feature = 0;
-	request->timeout = 10;
+	request->timeout = ATA_REQUEST_TIMEOUT;
 	request->retries = 0;
 	request->flags |= ATA_R_ORDERED | ATA_R_DIRECT;
 	ata_queue_request(request);
@@ -4371,7 +4371,7 @@
 	return NULL;
     }
     request->dev = dev;
-    request->timeout = 10;
+    request->timeout = ATA_REQUEST_TIMEOUT;
     request->retries = 2;
     request->callback = ata_raid_done;
     request->driver = rdp;
@@ -4445,7 +4445,7 @@
 
     /* setup request */
     request->dev = dev;
-    request->timeout = 10;
+    request->timeout = ATA_REQUEST_TIMEOUT;
     request->retries = 0;
     request->data = data;
     request->bytecount = bcount;

==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#17 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.209 2009/10/27 17:12:59 jh Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.210 2009/11/08 14:33:19 mav Exp $");
 
 #include "opt_ata.h"
 #include 
@@ -700,7 +700,7 @@
 	request->dev = dev;
 	bcopy(ccb, request->u.atapi.ccb, 16);
 	request->flags = ATA_R_ATAPI;
-	request->timeout = 10;
+	request->timeout = ATA_REQUEST_TIMEOUT;
 	ata_queue_request(request);
 	if (!request->error &&
 	    (request->u.atapi.sense.key == 2 ||
From rene at FreeBSD.org  Sun Nov  8 16:18:04 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sun Nov  8 16:18:10 2009
Subject: PERFORCE change 170365 for review
Message-ID: <200911081618.nA8GI3aU014140@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170365

Change 170365 by rene@rene_self on 2009/11/08 16:17:07

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#20 integrate
.. //depot/projects/docproj_nl/www/nl/where.sgml#12 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#22 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#6 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -768,20 +768,20 @@
     
 
     
-      VMWare on MacOS
+      VMware on MacOS
 
-      VMWare Fusion for &mac; is a
+      VMware Fusion for &mac; is a
 	commercial software product available for &intel; based &apple;
 	&mac; computers running &macos; 10.4.9 or higher.  FreeBSD is a
 	fully supported guest operating system.  Once
-	VMWare Fusion has been installed on
+	VMware Fusion has been installed on
 	&macos; X, the user must configure a virtual machine and then
 	install the desired guest operating system.
 
 	
-	  Installing FreeBSD on VMWare/&macos; X
+	  Installing FreeBSD on VMware/&macos; X
 
-	  The first step is to start VMWare Fusion, the Virtual
+	  The first step is to start VMware Fusion, the Virtual
 	    Machine Library will load.  Click "New" to create the VM:
 
 	  
@@ -906,10 +906,10 @@
         
 
 	
-	  Configuring FreeBSD on &macos; X/VMWare
+	  Configuring FreeBSD on &macos; X/VMware
 
 	  After FreeBSD has been successfully installed on &macos;
-	    X with VMWare, there are a number
+	    X with VMware, there are a number
 	    of configuration steps that can be taken to optimize the system
 	    for virtualized operation.
 
@@ -919,14 +919,14 @@
 
 	      The most important step is to reduce the
 	         tunable to reduce the CPU utilization
-		of FreeBSD under the VMWare
+		of FreeBSD under the VMware
 		environment.  This is accomplished by adding the following
 		line to /boot/loader.conf:
 
 	  	kern.hz=100
 
 	      Without this setting, an idle FreeBSD
-	        VMWare guest
+	        VMware guest
 		OS will use roughly 15% of the CPU of a single
 		processor &imac;.  After this change the usage will be
 		closer to a mere 5%.
@@ -936,7 +936,7 @@
 	      Create a new kernel configuration file
 
 	      You can remove all of the FireWire, and USB device
-	        drivers.  VMWare provides a
+	        drivers.  VMware provides a
 		virtual network adapter used by the &man.em.4; driver,
 		so all other network devices except for &man.em.4; can
 		be removed from the kernel.

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#20 (text+ko) ====

@@ -1,7 +1,7 @@
 

==== //depot/projects/docproj_nl/www/nl/where.sgml#12 (text+ko) ====

@@ -1,5 +1,5 @@
 
+
 
 
 

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#22 (text+ko) ====

@@ -10,7 +10,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/events.xml,v 1.77 2009/10/21 07:40:38 brueffer Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.78 2009/11/08 14:27:01 brueffer Exp $
     
   
 
@@ -113,7 +113,7 @@
 
   
     BSDCan 2010
-    http://www.bsdcan.org/
+    http://www.bsdcan.org/2010/
     
       2010
       5
From rene at FreeBSD.org  Sun Nov  8 16:23:09 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sun Nov  8 16:23:44 2009
Subject: PERFORCE change 170366 for review
Message-ID: <200911081623.nA8GN94j014515@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170366

Change 170366 by rene@rene_self on 2009/11/08 16:22:25

	MFen handbook/virtualization 1.20 -> 1.21

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#13 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#13 (text+ko) ====

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.6 2009/09/02 18:39:54 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
-     %SRCID%	1.20
+     %SRCID%	1.21
 -->
 
 
@@ -795,21 +795,21 @@
     
 
     
-      VMWare op &macos;
+      VMware op &macos;
 
-      VMWare Fusion voor &mac; is een
+      VMware Fusion voor &mac; is een
 	comercieel softwareprodukt beschikbaar voor op &intel;
 	gebaseeerde &mac;-computers die &macos; 10.4.9 of nieuwer
 	draaien.  &os; is een volledig ondersteund
-	gast-besturingssysteem.  Nadat VMWare Fusion
+	gast-besturingssysteem.  Nadat VMware Fusion
 	 is geïnstalleerd op &macos; X dient de
 	gebruiker een virtuele machine in te stellen en daarna het
 	gewenste gast-besturingssysteem te installeren.
 
       
-	&os; installeren op VMWare/&macos; X
+	&os; installeren op VMware/&macos; X
 
-	De eerste stap is om VMWare Fusion te laden, de Virtual
+	De eerste stap is om VMware Fusion te laden, de Virtual
 	  Machine Library zal geladen worden.  Klik op "New" om de
 	  VM aan te maken:
 
@@ -938,10 +938,10 @@
       
 
       
-	&os; instellen op &macos; X/VMWare
+	&os; instellen op &macos; X/VMware
 
 	Nadat &os; succesvol is geïnstalleerd op &macos; X
-	  met VMWare, zijn er een aantal
+	  met VMware, zijn er een aantal
 	  instellingen die gewijzigd kunnen worden op het systeem te
 	  optimaliseren voor virtueel gebruik.
 
@@ -951,7 +951,7 @@
 
 	    De belangrijkste stap is het verlagen van de
 	      tunable  om het CPU-gebruik van
-	      &os; in de omgeving van VMWare
+	      &os; in de omgeving van VMware
 	      te verminderen.  Dit kan bereikt worden door de volgende
 	      regel aan /boot/loader.conf toe te
 	      voegen:
@@ -959,7 +959,7 @@
 	    kern.hz=100
 
 	    Zonder deze instelling gebruikt &os; als 
-	      VMWare gast-besturingssysteem ongeveer 15%
+	      VMware gast-besturingssysteem ongeveer 15%
 	      van de CPU van een enkele &imac;-processor.  Na deze
 	      verandering zal het gebruik dichter bij 5% liggen.
 	  
@@ -969,7 +969,7 @@
 	    
 
 	    Alle stuurprogramma's voor FireWire en USB kunnen
-	      verwijderd worden.  VMWare
+	      verwijderd worden.  VMware
 	      biedt een virtuele netwerkadapter dat door het
 	      stuurpogramma &man.em.4; gebruikt wordt, dus alle
 	      netwerkapparaten behalve &man.em.4; kunnen uit de kernel
From truncs at FreeBSD.org  Sun Nov  8 16:32:19 2009
From: truncs at FreeBSD.org (Aditya Sarawgi)
Date: Sun Nov  8 16:32:26 2009
Subject: PERFORCE change 170367 for review
Message-ID: <200911081632.nA8GWIoT015190@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170367

Change 170367 by truncs@aditya on 2009/11/08 16:32:10

	- Fix typos
	- Use correct #endif comments

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#5 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#3 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#4 edit
.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#6 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#5 (text+ko) ====

@@ -51,7 +51,7 @@
 #include 
 
 /*
- * Bmap converts a the logical block number of a file to its physical block
+ * Bmap converts the logical block number of a file to its physical block
  * number on the disk. The conversion is done by using the logical block
  * number to index into the array of block pointers described by the dinode.
  */

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#3 (text+ko) ====

@@ -74,5 +74,5 @@
 	u_int32_t	e2di_linux_reserved3; /* 124 */
 };
 
-#endif /* _SYS_GNU_EXT2FS_EXT2_DINODE_H_ */
+#endif /* _FS_EXT2FS_EXT2_DINODE_H_ */
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#3 (text+ko) ====

@@ -77,5 +77,5 @@
 #define EXT2_DIR_ROUND 			(EXT2_DIR_PAD - 1)
 #define EXT2_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT2_DIR_ROUND) & \
 					 ~EXT2_DIR_ROUND)
-#endif /* !_SYS_GNU_EXT2FS_EXT2_DIR_H_ */
+#endif /* !_FS_EXT2FS_EXT2_DIR_H_ */
 

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#4 (text+ko) ====

@@ -90,4 +90,4 @@
 extern struct vop_vector ext2_vnodeops;
 extern struct vop_vector ext2_fifoops;
 
-#endif /* !_SYS_GNU_EXT2FS_EXT2_EXTERN_H_ */
+#endif /* !_FS_EXT2FS_EXT2_EXTERN_H_ */

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#6 (text+ko) ====

@@ -167,4 +167,4 @@
 };
 #endif /* _KERNEL */
 
-#endif /* !_SYS_GNU_EXT2FS_INODE_H_ */
+#endif /* !_FS_EXT2FS_INODE_H_ */
From pgj at FreeBSD.org  Sun Nov  8 19:11:59 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  8 19:12:06 2009
Subject: PERFORCE change 170372 for review
Message-ID: <200911081911.nA8JBx7S039810@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170372

Change 170372 by pgj@beehive on 2009/11/08 19:11:37

	IFC

Affected files ...

.. //depot/projects/docproj_hu/www/en/internal/i18n.sgml#3 integrate
.. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#12 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#22 integrate

Differences ...

==== //depot/projects/docproj_hu/www/en/internal/i18n.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 ]>
@@ -11,31 +11,31 @@
   
    Policy
    
 
   
    When listing countries or other geographic areas in
-  documentation, menus, mirror/FTP lists, or other contexts, it is
-  important to introduce such lists as "Countries or Regions" so that
-  an implied sovereignty claim is neither made nor denied to those
-  regions which have their own top level domains.
    
+    documentation, menus, mirror/FTP lists, or other contexts, it is
+    important to introduce such lists as "Countries or Regions" so that
+    an implied sovereignty claim is neither made nor denied to those
+    regions which have their own top level domains.
    
 
   
    The ISO 3166 country codes do not necessarily refer to
-  nation-states (e.g. Hong Kong) and should not be treated as such.
-  Likewise the "official" ISO 3166 short english names for those
-  countries and regions which have top level domains are in some cases
-  controversial, and not all of them are commonly used in the software
-  industry.
    
+    nation-states (e.g. Hong Kong) and should not be treated as such.
+    Likewise the "official" ISO 3166 short English names for those
+    countries and regions which have top level domains are in some cases
+    controversial, and not all of them are commonly used in the software
+    industry.
    
 
   
    We follow the guidelines used by IBM, Microsoft, Google, and
-  other prominent software companies in their documentation in that
-  Taiwan should never be included with a distinction referring to the
-  Republic of China, People's Republic of China, or a national flag.
-  Interpretation of the word "Taiwan" is in the eye of the beholder,
-  and The FreeBSD Project does not endorse any particular position.
    
+    other prominent software companies in their documentation in that
+    Taiwan should never be included with a distinction referring to the
+    Republic of China, People's Republic of China, or a national flag.
+    Interpretation of the word "Taiwan" is in the eye of the beholder,
+    and The FreeBSD Project does not endorse any particular position.
    
 
   
    Reference:
    
-
      
-
    1. IBM
-Localization guidelines
      2. 
-
    
+
+  
      
+    
    1. IBM
+      Localization guidelines
      2. 
+  
    
 
   &footer;
 

==== //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#12 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
-
+
 
 
 

==== //depot/projects/docproj_hu/www/share/sgml/events.xml#22 (text+ko) ====

@@ -10,7 +10,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/events.xml,v 1.77 2009/10/21 07:40:38 brueffer Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.78 2009/11/08 14:27:01 brueffer Exp $
     
   
 
@@ -113,7 +113,7 @@
 
   
     BSDCan 2010
-    http://www.bsdcan.org/
+    http://www.bsdcan.org/2010/
     
       2010
       5
From pgj at FreeBSD.org  Sun Nov  8 19:28:16 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov  8 19:28:35 2009
Subject: PERFORCE change 170373 for review
Message-ID: <200911081928.nA8JSFvt040923@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170373

Change 170373 by pgj@beehive on 2009/11/08 19:27:24

	MFen (doc):
		1.467      -> 1.468      hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml
		1.195      -> 1.196      hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#34 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#18 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#34 (text+ko) ====

@@ -7,7 +7,7 @@
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml
-     %SRCID%	1.467
+     %SRCID%	1.468
 -->
 
 
@@ -3078,6 +3078,16 @@
       
 
       
+	RELENG_8_0
+
+	
+	  A FreeBSD-8.0 kiadás ága, ahová
+	    csak a biztonsági frissítések és
+	    a kritikus hibajavítások kerülnek.
+	
+      
+
+      
 	RELENG_7
 
 	

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#18 (text+ko) ====

@@ -7,7 +7,7 @@
 
 
 
@@ -2055,9 +2055,14 @@
 	  /etc/rc.conf állományba
 	  beírjuk a gdm_enable="YES" sort.
 	  Újraindítás után a
-	  GNOME automatikusan elindul
-	  bejelentkezéskor — nincs szükség
-	  további beállításra.    
+	  GDM automatikusan elindul.    
+
+	Ha a GDM mellett az összes
+	  GNOME szolgáltatást
+	  is el akarjuk indítani, vegyük fel a
+	  gnome_enable="YES" sort az
+	  /etc/rc.conf
+	  állományba.
 
 	A GNOME-ot parancssorból
 	  is elindíthatjuk, ha hozzá megfelelõen
From jona at FreeBSD.org  Mon Nov  9 16:43:33 2009
From: jona at FreeBSD.org (Jonathan Anderson)
Date: Mon Nov  9 16:43:40 2009
Subject: PERFORCE change 170404 for review
Message-ID: <200911091643.nA9GhWXE006565@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170404

Change 170404 by jona@jona-capsicum-kent on 2009/11/09 16:42:44

	cap_main and _capstart for both i386 and amd64

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#3 (text+ko) ====

@@ -31,6 +31,7 @@
 #endif /* lint */
 
 #include 
+#include 
 
 #include "libc_private.h"
 #include "crtbrand.c"
@@ -95,6 +96,45 @@
 }
 
 
+
+/* The Capsicum entry function. */
+void
+_capstart(char **ap, void (*cleanup)(void))
+{
+	int argc;
+	char **argv;
+	char **env;
+	const char *s;
+
+	argc = *(long *)(void *)ap;
+	argv = ap + 1;
+	env = ap + 2 + argc;
+	environ = env;
+	if (argc > 0 && argv[0] != NULL) {
+		__progname = argv[0];
+		for (s = __progname; *s != '\0'; s++)
+			if (*s == '/')
+				__progname = s + 1;
+	}
+
+	if (&_DYNAMIC != NULL)
+		atexit(cleanup);
+	else
+		_init_tls();
+
+#ifdef GCRT
+	atexit(_mcleanup);
+#endif
+	atexit(_fini);
+#ifdef GCRT
+/*	monstartup(&eprol, &etext);*/
+/*__asm__("eprol:");*/             /* JA hope and pray... */
+#endif
+	_init();
+	exit( cap_main(argc, argv, env) );
+}
+
+
 /* The Capsicum entry function. */
 void
 _capstart(char **ap, void (*cleanup)(void))

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#4 (text+ko) ====

@@ -52,10 +52,25 @@
     __FreeBSD_version
 };
 
+
+
 int cap_main(int argc, char **argv, char **env)
 {
 	const char warning[] =
-		"ERROR: attempting to run a regular binary in capability mode.\n\nIf you wish to run a binary in a sandbox, you must provide a cap_main() function which takes the same arguments as main().\n";
+		"ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n";
+
+	write(2, warning, sizeof(warning));
+}
+
+
+int cap_main(int argc, char **argv, char **env)
+{
+	const char warning[] =
+		"ERROR: attempting to run a regular binary in capability mode."
+		"\n\n"
+		"If you wish to run a binary in a sandbox, you must provide a "
+		"cap_main() function which takes the same arguments as main()."
+		"\n";
 
 	write(2, warning, sizeof(warning));
 	return 1;

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#3 (text+ko) ====

@@ -148,6 +148,51 @@
 #endif
 	atexit(_fini);
 #ifdef GCRT
+	monstartup(&eprol, &etext);
+__asm__("eprol:");
+#endif
+	_init();
+	exit( cap_main(argc, argv, env) );
+}
+
+
+
+
+/* The Capsicum entry function. */
+void
+_capstart(char *ap, ...)
+{
+	fptr cleanup;
+	int argc;
+	char **argv;
+	char **env;
+	const char *s;
+
+#ifdef __GNUC__
+	__asm__("and $0xfffffff0,%esp");
+#endif
+	cleanup = get_rtld_cleanup();
+	argv = ≈
+	argc = *(long *)(void *)(argv - 1);
+	env = argv + argc + 1;
+	environ = env;
+	if (argc > 0 && argv[0] != NULL) {
+		__progname = argv[0];
+		for (s = __progname; *s != '\0'; s++)
+			if (*s == '/')
+				__progname = s + 1;
+	}
+
+	if (&_DYNAMIC != NULL)
+		atexit(cleanup);
+	else
+		_init_tls();
+
+#ifdef GCRT
+	atexit(_mcleanup);
+#endif
+	atexit(_fini);
+#ifdef GCRT
 /*	monstartup(&eprol, &etext);
 __asm__("eprol:");*/        /* XXX: does this interfere with profiling? */
 #endif
From jona at FreeBSD.org  Mon Nov  9 16:47:38 2009
From: jona at FreeBSD.org (Jonathan Anderson)
Date: Mon Nov  9 16:47:49 2009
Subject: PERFORCE change 170405 for review
Message-ID: <200911091647.nA9Glbu3017189@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170405

Change 170405 by jona@jona-capsicum-kent on 2009/11/09 16:47:10

	Removed the multiple definitions which snuck in here

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#4 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#5 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#4 (text+ko) ====

@@ -134,42 +134,4 @@
 	exit( cap_main(argc, argv, env) );
 }
 
-
-/* The Capsicum entry function. */
-void
-_capstart(char **ap, void (*cleanup)(void))
-{
-	int argc;
-	char **argv;
-	char **env;
-	const char *s;
-
-	argc = *(long *)(void *)ap;
-	argv = ap + 1;
-	env = ap + 2 + argc;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
-
-	if (&_DYNAMIC != NULL)
-		atexit(cleanup);
-	else
-		_init_tls();
-
-#ifdef GCRT
-	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
-/*	monstartup(&eprol, &etext);
-__asm__("eprol:");*/        /* XXX: does this interfere with profiling? */
-#endif
-	_init();
-	exit( cap_main(argc, argv, env) );
-}
-
 __asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#5 (text+ko) ====

@@ -62,17 +62,3 @@
 	write(2, warning, sizeof(warning));
 }
 
-
-int cap_main(int argc, char **argv, char **env)
-{
-	const char warning[] =
-		"ERROR: attempting to run a regular binary in capability mode."
-		"\n\n"
-		"If you wish to run a binary in a sandbox, you must provide a "
-		"cap_main() function which takes the same arguments as main()."
-		"\n";
-
-	write(2, warning, sizeof(warning));
-	return 1;
-}
-

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#4 (text+ko) ====

@@ -155,49 +155,4 @@
 	exit( cap_main(argc, argv, env) );
 }
 
-
-
-
-/* The Capsicum entry function. */
-void
-_capstart(char *ap, ...)
-{
-	fptr cleanup;
-	int argc;
-	char **argv;
-	char **env;
-	const char *s;
-
-#ifdef __GNUC__
-	__asm__("and $0xfffffff0,%esp");
-#endif
-	cleanup = get_rtld_cleanup();
-	argv = ≈
-	argc = *(long *)(void *)(argv - 1);
-	env = argv + argc + 1;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
-
-	if (&_DYNAMIC != NULL)
-		atexit(cleanup);
-	else
-		_init_tls();
-
-#ifdef GCRT
-	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
-/*	monstartup(&eprol, &etext);
-__asm__("eprol:");*/        /* XXX: does this interfere with profiling? */
-#endif
-	_init();
-	exit( cap_main(argc, argv, env) );
-}
-
 __asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\"");
From hselasky at FreeBSD.org  Mon Nov  9 16:48:38 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Mon Nov  9 16:48:45 2009
Subject: PERFORCE change 170406 for review
Message-ID: <200911091648.nA9Gmc3B017251@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170406

Change 170406 by hselasky@hselasky_laptop001 on 2009/11/09 16:47:48

	
	USB CORE:
	 - Improve High Speed slot allocation mechanism.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#42 (text+ko) ====

@@ -2356,19 +2356,21 @@
 
 	/* Allocate a microframe slot first: */
 
-	slot = usb_intr_schedule_adjust
-	    (xfer->xroot->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX);
+	slot = usb_intr_schedule_adjust(xfer->xroot->udev,
+	    xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, 0x01);
 
 	if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
 		xfer->usb_uframe = slot;
-		xfer->usb_smask = (1 << slot) & 0xFF;
-		xfer->usb_cmask = 0;
+		xfer->usb_smask = (0x01 << slot) & 0xFF;
+		xfer->usb_cmask = 0x00;
 	} else {
 		xfer->usb_uframe = slot;
-		xfer->usb_smask = (1 << slot) & 0x3F;
-		xfer->usb_cmask = (-(4 << slot)) & 0xFE;
+		xfer->usb_smask = (0x01 << slot) & 0x3F;
+		xfer->usb_cmask = (-(0x04 << slot)) & 0xFE;
 	}
 
+	DPRINTFN(11, "slot=%d\n", slot);
+
 	/*
 	 * Find the best QH position corresponding to the given interval:
 	 */
@@ -2403,8 +2405,10 @@
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
 
+	/* Free microframe slot: */
+
 	usb_intr_schedule_adjust(xfer->xroot->udev,
-	    -(xfer->max_frame_size), xfer->usb_uframe);
+	    -xfer->max_frame_size, xfer->usb_uframe, 0x01);
 
 	sc->sc_intr_stat[xfer->qh_pos]--;
 
@@ -2731,28 +2735,34 @@
 	uint32_t temp;
 	uint8_t ds;
 	uint8_t slot;
-
-	slot = usb_intr_schedule_adjust(xfer->xroot->udev, xfer->max_frame_size,
-	    USB_HS_MICRO_FRAMES_MAX);
-
-	xfer->usb_uframe = slot;
-	xfer->usb_cmask = 0;
+	uint8_t mask;
 
 	switch (usbd_xfer_get_fps_shift(xfer)) {
 	case 0:
-		xfer->usb_smask = 0xFF;
+		mask = 0xFF;
 		break;
 	case 1:
-		xfer->usb_smask = 0x55 << (slot & 1);
+		mask = 0x55;
 		break;
 	case 2:
-		xfer->usb_smask = 0x11 << (slot & 3);
+		mask = 0x11;
 		break;
 	default:
-		xfer->usb_smask = 0x01 << (slot & 7);
+		mask = 0x01;
 		break;
 	}
 
+	/* Allocate a microframe multi-slot first: */
+
+	slot = usb_intr_schedule_adjust(xfer->xroot->udev,
+	    xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask);
+
+	xfer->usb_uframe = slot;
+	xfer->usb_cmask = 0;
+	xfer->usb_smask = mask << slot;
+
+	DPRINTFN(11, "slot=%d, mask=0x%02x\n", slot, mask);
+
 	/* initialize all TD's */
 
 	for (ds = 0; ds != 2; ds++) {
@@ -2796,8 +2806,11 @@
 ehci_device_isoc_hs_close(struct usb_xfer *xfer)
 {
 
+	/* Free microframe multi-slot: */
+
 	usb_intr_schedule_adjust(xfer->xroot->udev,
-	    -(xfer->max_frame_size), xfer->usb_uframe);
+	    -xfer->max_frame_size, xfer->usb_uframe,
+	    xfer->usb_smask >> xfer->usb_uframe);
 
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
 }

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#36 (text+ko) ====

@@ -1108,21 +1108,38 @@
  *   The best Transaction Translation slot for an interrupt endpoint.
  *------------------------------------------------------------------------*/
 static uint8_t
-usb_intr_find_best_slot(usb_size_t *ptr, uint8_t start, uint8_t end)
+usb_intr_find_best_slot(usb_size_t *ptr, uint8_t start,
+    uint8_t end, uint8_t mask)
 {
-	usb_size_t max = 0 - 1;
+	usb_size_t min = 0 - 1;
+	usb_size_t sum;
 	uint8_t x;
 	uint8_t y;
+	uint8_t z;
 
 	y = 0;
 
 	/* find the last slot with lesser used bandwidth */
 
 	for (x = start; x < end; x++) {
-		if (max >= ptr[x]) {
-			max = ptr[x];
+
+		sum = 0;
+
+		/* compute sum of bandwidth */
+		for (z = x; z < end; z++) {
+			if (mask & (1U << (z - x)))
+				sum += ptr[z];
+		}
+
+		/* check if the current multi-slot is more optimal */
+		if (min >= sum) {
+			min = sum;
 			y = x;
 		}
+
+		/* check if the mask is about to be shifted out */
+		if (mask & (1U << (end - 1 - x)))
+			break;
 	}
 	return (y);
 }
@@ -1134,17 +1151,19 @@
  * having index "slot" by "len" bytes. "len" can be negative.  If the
  * "slot" argument is greater or equal to "USB_HS_MICRO_FRAMES_MAX"
  * the "slot" argument will be replaced by the slot having least used
- * bandwidth.
+ * bandwidth. The "mask" argument is used for multi-slot allocations.
  *
  * Returns:
- *   The slot on which the bandwidth update was done.
+ *    The slot in which the bandwidth update was done: 0..7
  *------------------------------------------------------------------------*/
 uint8_t
-usb_intr_schedule_adjust(struct usb_device *udev, int16_t len, uint8_t slot)
+usb_intr_schedule_adjust(struct usb_device *udev, int16_t len,
+    uint8_t slot, uint8_t mask)
 {
 	struct usb_bus *bus = udev->bus;
 	struct usb_hub *hub;
 	enum usb_dev_speed speed;
+	uint8_t x;
 
 	USB_BUS_LOCK_ASSERT(bus, MA_OWNED);
 
@@ -1166,17 +1185,25 @@
 		hub = udev->parent_hs_hub->hub;
 		if (slot >= USB_HS_MICRO_FRAMES_MAX) {
 			slot = usb_intr_find_best_slot(hub->uframe_usage,
-			    USB_FS_ISOC_UFRAME_MAX, 6);
+			    USB_FS_ISOC_UFRAME_MAX, 6, mask);
+		}
+		for (x = slot; x < 8; x++) {
+			if (mask & (1U << (x - slot))) {
+				hub->uframe_usage[x] += len;
+				bus->uframe_usage[x] += len;
+			}
 		}
-		hub->uframe_usage[slot] += len;
-		bus->uframe_usage[slot] += len;
 		break;
 	default:
 		if (slot >= USB_HS_MICRO_FRAMES_MAX) {
 			slot = usb_intr_find_best_slot(bus->uframe_usage, 0,
-			    USB_HS_MICRO_FRAMES_MAX);
+			    USB_HS_MICRO_FRAMES_MAX, mask);
+		}
+		for (x = slot; x < 8; x++) {
+			if (mask & (1U << (x - slot))) {
+				bus->uframe_usage[x] += len;
+			}
 		}
-		bus->uframe_usage[slot] += len;
 		break;
 	}
 	return (slot);

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#14 (text+ko) ====

@@ -67,7 +67,7 @@
 /* function prototypes */
 
 uint8_t	usb_intr_schedule_adjust(struct usb_device *udev, int16_t len,
-	    uint8_t slot);
+	    uint8_t slot, uint8_t mask);
 void	usbd_fs_isoc_schedule_init_all(struct usb_fs_isoc_schedule *fss);
 void	usb_bus_port_set_device(struct usb_bus *bus, struct usb_port *up,
 	    struct usb_device *udev, uint8_t device_index);
From mav at FreeBSD.org  Mon Nov  9 18:31:21 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Mon Nov  9 18:31:27 2009
Subject: PERFORCE change 170409 for review
Message-ID: <200911091831.nA9IVLRQ026699@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170409

Change 170409 by mav@mav_mavtest on 2009/11/09 18:30:51

	Organize device IDs and add some more of them.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#16 edit
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#4 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#16 (text+ko) ====

@@ -89,24 +89,37 @@
 
 MALLOC_DEFINE(M_SIIS, "SIIS driver", "SIIS driver data buffers");
 
+static struct {
+	uint32_t	id;
+	const char	*name;
+	int		ports;
+} siis_ids[] = {
+	{0x31241095,	"SiI3124",	4},
+	{0x31248086,	"SiI3124",	4},
+	{0x31321095,	"SiI3132",	2},
+	{0x02421095,	"SiI3132",	2},
+	{0x02441095,	"SiI3132",	2},
+	{0x31311095,	"SiI3131",	1},
+	{0x35311095,	"SiI3531",	1},
+	{0,		NULL,		0}
+};
+
 static int
 siis_probe(device_t dev)
 {
+	char buf[64];
+	int i;
 	uint32_t devid = pci_get_devid(dev);
 
-	if (devid == SIIS_SII3124) {
-		device_set_desc_copy(dev, "SiI3124 SATA2 controller");
-	} else if (devid == SIIS_SII3132 ||
-		   devid == SIIS_SII3132_1 ||
-		   devid == SIIS_SII3132_2) {
-		device_set_desc_copy(dev, "SiI3132 SATA2 controller");
-	} else if (devid == SIIS_SII3531) {
-		device_set_desc_copy(dev, "SiI3531 SATA2 controller");
-	} else {
-		return (ENXIO);
+	for (i = 0; siis_ids[i].id != 0; i++) {
+		if (siis_ids[i].id == devid) {
+			snprintf(buf, sizeof(buf), "%s SATA2 controller",
+			    siis_ids[i].name);
+			device_set_desc_copy(dev, buf);
+			return (BUS_PROBE_VENDOR);
+		}
 	}
-
-	return (BUS_PROBE_VENDOR);
+	return (ENXIO);
 }
 
 static int
@@ -115,8 +128,12 @@
 	struct siis_controller *ctlr = device_get_softc(dev);
 	uint32_t devid = pci_get_devid(dev);
 	device_t child;
-	int	error, unit;
+	int	error, i, unit;
 
+	for (i = 0; siis_ids[i].id != 0; i++) {
+		if (siis_ids[i].id == devid)
+			break;
+	}
 	ctlr->dev = dev;
 	/* Global memory */
 	ctlr->r_grid = PCIR_BAR(0);
@@ -146,8 +163,7 @@
 	/* Reset controller */
 	siis_resume(dev);
 	/* Number of HW channels */
-	ctlr->channels = (devid == SIIS_SII3124) ? 4 :
-	    (devid == SIIS_SII3531 ? 1 : 2);
+	ctlr->channels = siis_ids[i].ports;
 	/* Setup interrupts. */
 	if (siis_setup_interrupt(dev)) {
 		bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem);

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#4 (text+ko) ====

@@ -137,12 +137,6 @@
 
 #define ATA_SACTIVE                     16
 
-#define SIIS_SII3124		0x31241095
-#define SIIS_SII3132		0x31321095
-#define SIIS_SII3132_1		0x02421095
-#define SIIS_SII3132_2		0x02441095
-#define SIIS_SII3531		0x35311095
-
 /*
  * Global registers
  */
From mav at FreeBSD.org  Mon Nov  9 19:41:31 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Mon Nov  9 19:41:38 2009
Subject: PERFORCE change 170410 for review
Message-ID: <200911091941.nA9JfVwn032661@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170410

Change 170410 by mav@mav_mavtest on 2009/11/09 19:40:38

	Some BIOSes do not allow to choose SATA controller mode.
	Some users are not aware of SATA controller modes.
	Force AHCI for known chipsets.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#75 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#75 (text+ko) ====

@@ -96,23 +96,170 @@
 
 MALLOC_DEFINE(M_AHCI, "AHCI driver", "AHCI driver data buffers");
 
-/*
- * AHCI v1.x compliant SATA chipset support functions
- */
+static struct {
+	uint32_t	id;
+	const char	*name;
+	int		flags;
+} ahci_ids[] = {
+	{0x43801002, "ATI IXP600",	0},
+	{0x43901002, "ATI IXP700",	0},
+	{0x43911002, "ATI IXP700",	0},
+	{0x43921002, "ATI IXP700",	0},
+	{0x43931002, "ATI IXP700",	0},
+	{0x43941002, "ATI IXP800",	0},
+	{0x43951002, "ATI IXP800",	0},
+	{0x26518086, "Intel ICH6",	0},
+	{0x26528086, "Intel ICH6",	0},
+	{0x26538086, "Intel ICH6M",	0},
+	{0x26808086, "Intel ESB2",	0},
+	{0x26818086, "Intel ESB2",	0},
+	{0x26828086, "Intel ESB2",	0},
+	{0x26838086, "Intel ESB2",	0},
+	{0x27c08086, "Intel ICH7",	0},
+	{0x27c18086, "Intel ICH7",	0},
+	{0x27c38086, "Intel ICH7",	0},
+	{0x27c48086, "Intel ICH7M",	0},
+	{0x27c58086, "Intel ICH7M",	0},
+	{0x27c68086, "Intel ICH7M",	0},
+	{0x27c68086, "Intel ICH7M",	0},
+	{0x28208086, "Intel ICH8",	0},
+	{0x28218086, "Intel ICH8",	0},
+	{0x28228086, "Intel ICH8",	0},
+	{0x28248086, "Intel ICH8",	0},
+	{0x28258086, "Intel ICH8",	0},
+	{0x28288086, "Intel ICH8M",	0},
+	{0x28298086, "Intel ICH8M",	0},
+	{0x282a8086, "Intel ICH8M",	0},
+	{0x29208086, "Intel ICH9",	0},
+	{0x29218086, "Intel ICH9",	0},
+	{0x29228086, "Intel ICH9",	0},
+	{0x29238086, "Intel ICH9",	0},
+	{0x29248086, "Intel ICH9",	0},
+	{0x29258086, "Intel ICH9",	0},
+	{0x29268086, "Intel ICH9",	0},
+	{0x29278086, "Intel ICH9",	0},
+	{0x29298086, "Intel ICH9M",	0},
+	{0x292a8086, "Intel ICH9M",	0},
+	{0x292b8086, "Intel ICH9M",	0},
+	{0x292c8086, "Intel ICH9M",	0},
+	{0x292f8086, "Intel ICH9M",	0},
+	{0x294d8086, "Intel ICH9",	0},
+	{0x294e8086, "Intel ICH9M",	0},
+	{0x3a008086, "Intel ICH10",	0},
+	{0x3a028086, "Intel ICH10",	0},
+	{0x3a058086, "Intel ICH10",	0},
+	{0x3a068086, "Intel ICH10",	0},
+	{0x3a208086, "Intel ICH10",	0},
+	{0x3a228086, "Intel ICH10",	0},
+	{0x3a258086, "Intel ICH10",	0},
+	{0x3a268086, "Intel ICH10",	0},
+	{0x3b228086, "Intel PCH",	0},
+	{0x3b238086, "Intel PCH",	0},
+	{0x3b248086, "Intel PCH",	0},
+	{0x3b258086, "Intel PCH",	0},
+	{0x3b298086, "Intel PCH",	0},
+	{0x3b2b8086, "Intel PCH",	0},
+	{0x3b2c8086, "Intel PCH",	0},
+	{0x3b2f8086, "Intel PCH",	0},
+	{0x044c10de, "NVIDIA MCP65",	0},
+	{0x044d10de, "NVIDIA MCP65",	0},
+	{0x044e10de, "NVIDIA MCP65",	0},
+	{0x044f10de, "NVIDIA MCP65",	0},
+	{0x045c10de, "NVIDIA MCP65",	0},
+	{0x045d10de, "NVIDIA MCP65",	0},
+	{0x045e10de, "NVIDIA MCP65",	0},
+	{0x045f10de, "NVIDIA MCP65",	0},
+	{0x055010de, "NVIDIA MCP67",	0},
+	{0x055110de, "NVIDIA MCP67",	0},
+	{0x055210de, "NVIDIA MCP67",	0},
+	{0x055310de, "NVIDIA MCP67",	0},
+	{0x055410de, "NVIDIA MCP67",	0},
+	{0x055510de, "NVIDIA MCP67",	0},
+	{0x055610de, "NVIDIA MCP67",	0},
+	{0x055710de, "NVIDIA MCP67",	0},
+	{0x055810de, "NVIDIA MCP67",	0},
+	{0x055910de, "NVIDIA MCP67",	0},
+	{0x055A10de, "NVIDIA MCP67",	0},
+	{0x055B10de, "NVIDIA MCP67",	0},
+	{0x058410de, "NVIDIA MCP67",	0},
+	{0x07f010de, "NVIDIA MCP73",	0},
+	{0x07f110de, "NVIDIA MCP73",	0},
+	{0x07f210de, "NVIDIA MCP73",	0},
+	{0x07f310de, "NVIDIA MCP73",	0},
+	{0x07f410de, "NVIDIA MCP73",	0},
+	{0x07f510de, "NVIDIA MCP73",	0},
+	{0x07f610de, "NVIDIA MCP73",	0},
+	{0x07f710de, "NVIDIA MCP73",	0},
+	{0x07f810de, "NVIDIA MCP73",	0},
+	{0x07f910de, "NVIDIA MCP73",	0},
+	{0x07fa10de, "NVIDIA MCP73",	0},
+	{0x07fb10de, "NVIDIA MCP73",	0},
+	{0x0ad010de, "NVIDIA MCP77",	0},
+	{0x0ad110de, "NVIDIA MCP77",	0},
+	{0x0ad210de, "NVIDIA MCP77",	0},
+	{0x0ad310de, "NVIDIA MCP77",	0},
+	{0x0ad410de, "NVIDIA MCP77",	0},
+	{0x0ad510de, "NVIDIA MCP77",	0},
+	{0x0ad610de, "NVIDIA MCP77",	0},
+	{0x0ad710de, "NVIDIA MCP77",	0},
+	{0x0ad810de, "NVIDIA MCP77",	0},
+	{0x0ad910de, "NVIDIA MCP77",	0},
+	{0x0ada10de, "NVIDIA MCP77",	0},
+	{0x0adb10de, "NVIDIA MCP77",	0},
+	{0x0ab410de, "NVIDIA MCP79",	0},
+	{0x0ab510de, "NVIDIA MCP79",	0},
+	{0x0ab610de, "NVIDIA MCP79",	0},
+	{0x0ab710de, "NVIDIA MCP79",	0},
+	{0x0ab810de, "NVIDIA MCP79",	0},
+	{0x0ab910de, "NVIDIA MCP79",	0},
+	{0x0aba10de, "NVIDIA MCP79",	0},
+	{0x0abb10de, "NVIDIA MCP79",	0},
+	{0x0abc10de, "NVIDIA MCP79",	0},
+	{0x0abd10de, "NVIDIA MCP79",	0},
+	{0x0abe10de, "NVIDIA MCP79",	0},
+	{0x0abf10de, "NVIDIA MCP79",	0},
+	{0x0d8410de, "NVIDIA MCP89",	0},
+	{0x0d8510de, "NVIDIA MCP89",	0},
+	{0x0d8610de, "NVIDIA MCP89",	0},
+	{0x0d8710de, "NVIDIA MCP89",	0},
+	{0x0d8810de, "NVIDIA MCP89",	0},
+	{0x0d8910de, "NVIDIA MCP89",	0},
+	{0x0d8a10de, "NVIDIA MCP89",	0},
+	{0x0d8b10de, "NVIDIA MCP89",	0},
+	{0x0d8c10de, "NVIDIA MCP89",	0},
+	{0x0d8d10de, "NVIDIA MCP89",	0},
+	{0x0d8e10de, "NVIDIA MCP89",	0},
+	{0x0d8f10de, "NVIDIA MCP89",	0},
+	{0x33491106, "VIA VT8251",	0},
+	{0x62871106, "VIA VT8251",	0},
+	{0x11841039, "SiS 966",		0},
+	{0x11851039, "SiS 968",		0},
+	{0x01861039, "SiS 968",		0},
+	{0,	     NULL,		0}
+};
+
 static int
 ahci_probe(device_t dev)
 {
+	char buf[64];
+	int i;
+	uint32_t devid = pci_get_devid(dev);
 
-	/* is this a possible AHCI candidate ? */
+	/* Is this a known AHCI chip? */
+	for (i = 0; ahci_ids[i].id != 0; i++) {
+		if (ahci_ids[i].id == devid) {
+			snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
+			    ahci_ids[i].name);
+			device_set_desc_copy(dev, buf);
+			return (BUS_PROBE_VENDOR);
+		}
+	}
+	/* Is this a possible AHCI candidate? */
 	if (pci_get_class(dev) != PCIC_STORAGE ||
-	    pci_get_subclass(dev) != PCIS_STORAGE_SATA)
+	    pci_get_subclass(dev) != PCIS_STORAGE_SATA ||
+	    pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0)
 		return (ENXIO);
-
-	/* is this PCI device flagged as an AHCI compliant chip ? */
-	if (pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0)
-		return (ENXIO);
-
-	device_set_desc_copy(dev, "AHCI controller");
+	device_set_desc_copy(dev, "AHCI SATA controller");
 	return (BUS_PROBE_VENDOR);
 }
 
From mav at FreeBSD.org  Mon Nov  9 23:21:13 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Mon Nov  9 23:21:19 2009
Subject: PERFORCE change 170423 for review
Message-ID: <200911092321.nA9NLCtk062882@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170423

Change 170423 by mav@mav_mavbook on 2009/11/09 23:20:51

	Do not attach Intel chips configured to legacy mode.
	They do not support AHCI,

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#76 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#76 (text+ko) ====

@@ -108,35 +108,24 @@
 	{0x43931002, "ATI IXP700",	0},
 	{0x43941002, "ATI IXP800",	0},
 	{0x43951002, "ATI IXP800",	0},
-	{0x26518086, "Intel ICH6",	0},
 	{0x26528086, "Intel ICH6",	0},
 	{0x26538086, "Intel ICH6M",	0},
-	{0x26808086, "Intel ESB2",	0},
 	{0x26818086, "Intel ESB2",	0},
 	{0x26828086, "Intel ESB2",	0},
 	{0x26838086, "Intel ESB2",	0},
-	{0x27c08086, "Intel ICH7",	0},
 	{0x27c18086, "Intel ICH7",	0},
 	{0x27c38086, "Intel ICH7",	0},
-	{0x27c48086, "Intel ICH7M",	0},
 	{0x27c58086, "Intel ICH7M",	0},
 	{0x27c68086, "Intel ICH7M",	0},
-	{0x27c68086, "Intel ICH7M",	0},
-	{0x28208086, "Intel ICH8",	0},
 	{0x28218086, "Intel ICH8",	0},
 	{0x28228086, "Intel ICH8",	0},
 	{0x28248086, "Intel ICH8",	0},
-	{0x28258086, "Intel ICH8",	0},
-	{0x28288086, "Intel ICH8M",	0},
 	{0x28298086, "Intel ICH8M",	0},
 	{0x282a8086, "Intel ICH8M",	0},
-	{0x29208086, "Intel ICH9",	0},
-	{0x29218086, "Intel ICH9",	0},
 	{0x29228086, "Intel ICH9",	0},
 	{0x29238086, "Intel ICH9",	0},
 	{0x29248086, "Intel ICH9",	0},
 	{0x29258086, "Intel ICH9",	0},
-	{0x29268086, "Intel ICH9",	0},
 	{0x29278086, "Intel ICH9",	0},
 	{0x29298086, "Intel ICH9M",	0},
 	{0x292a8086, "Intel ICH9M",	0},
@@ -145,14 +134,9 @@
 	{0x292f8086, "Intel ICH9M",	0},
 	{0x294d8086, "Intel ICH9",	0},
 	{0x294e8086, "Intel ICH9M",	0},
-	{0x3a008086, "Intel ICH10",	0},
-	{0x3a028086, "Intel ICH10",	0},
 	{0x3a058086, "Intel ICH10",	0},
-	{0x3a068086, "Intel ICH10",	0},
-	{0x3a208086, "Intel ICH10",	0},
 	{0x3a228086, "Intel ICH10",	0},
 	{0x3a258086, "Intel ICH10",	0},
-	{0x3a268086, "Intel ICH10",	0},
 	{0x3b228086, "Intel PCH",	0},
 	{0x3b238086, "Intel PCH",	0},
 	{0x3b248086, "Intel PCH",	0},
From mav at FreeBSD.org  Tue Nov 10 12:40:32 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 12:40:38 2009
Subject: PERFORCE change 170437 for review
Message-ID: <200911101240.nAACeVn1065626@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170437

Change 170437 by mav@mav_mavbook on 2009/11/10 12:39:55

	Move xpt_schedule_dev_sendq() from header to source file.
	Move delayed queue shrinking to more logical place - when queue freed.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#122 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#13 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#122 (text+ko) ====

@@ -299,12 +299,6 @@
 	int retval;
 
 	if (dev->ccbq.devq_openings > 0) {
-		if ((dev->flags & CAM_DEV_RESIZE_QUEUE_NEEDED) != 0) {
-			cam_ccbq_resize(&dev->ccbq,
-					dev->ccbq.dev_openings
-					+ dev->ccbq.dev_active);
-			dev->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED;
-		}
 		/*
 		 * The priority of a device waiting for CCB resources
 		 * is that of the the highest priority peripheral driver
@@ -321,6 +315,27 @@
 }
 
 static __inline int
+xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev)
+{
+	int	retval;
+
+	if (dev->ccbq.dev_openings > 0) {
+		/*
+		 * The priority of a device waiting for controller
+		 * resources is that of the the highest priority CCB
+		 * enqueued.
+		 */
+		retval =
+		    xpt_schedule_dev(&bus->sim->devq->send_queue,
+				     &dev->send_ccb_entry.pinfo,
+				     CAMQ_GET_HEAD(&dev->ccbq.queue)->priority);
+	} else {
+		retval = 0;
+	}
+	return (retval);
+}
+
+static __inline int
 periph_is_queued(struct cam_periph *periph)
 {
 	return (periph->pinfo.index != CAM_UNQUEUED_INDEX);
@@ -3747,6 +3762,11 @@
 	mtx_assert(sim->mtx, MA_OWNED);
 
 	cam_ccbq_release_opening(&device->ccbq);
+	if (device->flags & CAM_DEV_RESIZE_QUEUE_NEEDED) {
+		device->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED;
+		cam_ccbq_resize(&device->ccbq,
+		    device->ccbq.dev_openings + device->ccbq.dev_active);
+	}
 	if (sim->ccb_count > sim->max_ccbs) {
 		xpt_free_ccb(free_ccb);
 		sim->ccb_count--;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#13 (text+ko) ====

@@ -177,29 +177,6 @@
 					 u_int32_t new_priority);
 u_int32_t		xpt_dev_ccbq_resize(struct cam_path *path, int newopenings);
 
-
-
-static __inline int
-xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev)
-{
-	int	retval;
-
-	if (dev->ccbq.dev_openings > 0) {
-		/*
-		 * The priority of a device waiting for controller
-		 * resources is that of the the highest priority CCB
-		 * enqueued.
-		 */
-		retval =
-		    xpt_schedule_dev(&bus->sim->devq->send_queue,
-				     &dev->send_ccb_entry.pinfo,
-				     CAMQ_GET_HEAD(&dev->ccbq.queue)->priority);
-	} else {
-		retval = 0;
-	}
-	return (retval);
-}
-
 MALLOC_DECLARE(M_CAMXPT);
 
 #endif
From mav at FreeBSD.org  Tue Nov 10 13:16:08 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 13:16:14 2009
Subject: PERFORCE change 170438 for review
Message-ID: <200911101316.nAADG7lO079316@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170438

Change 170438 by mav@mav_mavbook on 2009/11/10 13:15:30

	Wrap duplicate code into xpt_stop_tags().

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#52 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#123 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#14 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#24 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#52 (text+ko) ====

@@ -1379,24 +1379,7 @@
 				device->tag_delay_count = CAM_TAG_DELAY_COUNT;
 				device->flags |= CAM_DEV_TAG_AFTER_COUNT;
 			} else {
-				struct ccb_relsim crs;
-
-				xpt_freeze_devq(cts->ccb_h.path, /*count*/1);
-		  		device->inq_flags &= ~SID_CmdQue;
-				xpt_dev_ccbq_resize(cts->ccb_h.path,
-						    sim->max_dev_openings);
-				device->flags &= ~CAM_DEV_TAG_AFTER_COUNT;
-				device->tag_delay_count = 0;
-
-				xpt_setup_ccb(&crs.ccb_h, cts->ccb_h.path,
-				    CAM_PRIORITY_NORMAL);
-				crs.ccb_h.func_code = XPT_REL_SIMQ;
-				crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY;
-				crs.openings
-				    = crs.release_timeout
-				    = crs.qfrozen_cnt
-				    = 0;
-				xpt_action((union ccb *)&crs);
+				xpt_stop_tags(cts->ccb_h.path);
 			}
 		}
 	}

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#123 (text+ko) ====

@@ -285,7 +285,6 @@
 static xpt_busfunc_t	xptsetasyncbusfunc;
 static cam_status	xptregister(struct cam_periph *periph,
 				    void *arg);
-static void	 xpt_start_tags(struct cam_path *path);
 static __inline int xpt_schedule_dev_allocq(struct cam_eb *bus,
 					    struct cam_ed *dev);
 static __inline int periph_is_queued(struct cam_periph *periph);
@@ -4593,7 +4592,7 @@
 	return (device);
 }
 
-static void
+void
 xpt_start_tags(struct cam_path *path)
 {
 	struct ccb_relsim crs;
@@ -4622,6 +4621,30 @@
 	xpt_action((union ccb *)&crs);
 }
 
+void
+xpt_stop_tags(struct cam_path *path)
+{
+	struct ccb_relsim crs;
+	struct cam_ed *device;
+	struct cam_sim *sim;
+
+	device = path->device;
+	sim = path->bus->sim;
+	device->flags &= ~CAM_DEV_TAG_AFTER_COUNT;
+	device->tag_delay_count = 0;
+	xpt_freeze_devq(path, /*count*/1);
+	device->inq_flags &= ~SID_CmdQue;
+	xpt_dev_ccbq_resize(path, sim->max_dev_openings);
+	xpt_setup_ccb(&crs.ccb_h, path, CAM_PRIORITY_NORMAL);
+	crs.ccb_h.func_code = XPT_REL_SIMQ;
+	crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY;
+	crs.openings
+	    = crs.release_timeout
+	    = crs.qfrozen_cnt
+	    = 0;
+	xpt_action((union ccb *)&crs);
+}
+
 static int busses_to_config;
 static int busses_to_reset;
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#14 (text+ko) ====

@@ -176,6 +176,8 @@
 int			xpt_schedule_dev(struct camq *queue, cam_pinfo *dev_pinfo,
 					 u_int32_t new_priority);
 u_int32_t		xpt_dev_ccbq_resize(struct cam_path *path, int newopenings);
+void			xpt_start_tags(struct cam_path *path);
+void			xpt_stop_tags(struct cam_path *path);
 
 MALLOC_DECLARE(M_CAMXPT);
 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#24 (text+ko) ====

@@ -2274,24 +2274,7 @@
 				device->tag_delay_count = CAM_TAG_DELAY_COUNT;
 				device->flags |= CAM_DEV_TAG_AFTER_COUNT;
 			} else {
-				struct ccb_relsim crs;
-
-				xpt_freeze_devq(cts->ccb_h.path, /*count*/1);
-		  		device->inq_flags &= ~SID_CmdQue;
-				xpt_dev_ccbq_resize(cts->ccb_h.path,
-						    sim->max_dev_openings);
-				device->flags &= ~CAM_DEV_TAG_AFTER_COUNT;
-				device->tag_delay_count = 0;
-
-				xpt_setup_ccb(&crs.ccb_h, cts->ccb_h.path,
-				    CAM_PRIORITY_NORMAL);
-				crs.ccb_h.func_code = XPT_REL_SIMQ;
-				crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY;
-				crs.openings
-				    = crs.release_timeout
-				    = crs.qfrozen_cnt
-				    = 0;
-				xpt_action((union ccb *)&crs);
+				xpt_stop_tags(cts->ccb_h.path);
 			}
 		}
 	}
From mav at FreeBSD.org  Tue Nov 10 15:39:32 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 15:39:38 2009
Subject: PERFORCE change 170441 for review
Message-ID: <200911101539.nAAFdVR3091747@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170441

Change 170441 by mav@mav_mavbook on 2009/11/10 15:38:37

	Give ATA XPT initial knowledge about command queueing. Now it sets
	device queue depth according to information from SIM and device.
	Limit queue depth for non-NCQ devices by 2 requests as compromise
	between request sorter effectiveness and minimal request latency.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#53 edit
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#77 edit
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#17 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#53 (text+ko) ====

@@ -66,7 +66,7 @@
 #include 	/* for xpt_print below */
 #include "opt_cam.h"
 
-struct scsi_quirk_entry {
+struct ata_quirk_entry {
 	struct scsi_inquiry_pattern inq_pat;
 	u_int8_t quirks;
 #define	CAM_QUIRK_NOLUNS	0x01
@@ -76,7 +76,6 @@
 	u_int mintags;
 	u_int maxtags;
 };
-#define SCSI_QUIRK(dev)	((struct scsi_quirk_entry *)((dev)->quirk))
 
 static periph_init_t probe_periph_init;
 
@@ -138,7 +137,7 @@
 	struct cam_periph *periph;
 } probe_softc;
 
-static struct scsi_quirk_entry scsi_quirk_table[] =
+static struct ata_quirk_entry ata_quirk_table[] =
 {
 	{
 		/* Default tagged queuing parameters for all devices */
@@ -150,8 +149,8 @@
 	},
 };
 
-static const int scsi_quirk_table_size =
-	sizeof(scsi_quirk_table) / sizeof(*scsi_quirk_table);
+static const int ata_quirk_table_size =
+	sizeof(ata_quirk_table) / sizeof(*ata_quirk_table);
 
 static cam_status	proberegister(struct cam_periph *periph,
 				      void *arg);
@@ -162,7 +161,7 @@
 //				     struct cam_ed *device);
 static void	 probedone(struct cam_periph *periph, union ccb *done_ccb);
 static void	 probecleanup(struct cam_periph *periph);
-static void	 scsi_find_quirk(struct cam_ed *device);
+static void	 ata_find_quirk(struct cam_ed *device);
 static void	 ata_scan_bus(struct cam_periph *periph, union ccb *ccb);
 static void	 ata_scan_lun(struct cam_periph *periph,
 			       struct cam_path *path, cam_flags flags,
@@ -172,10 +171,9 @@
 		 ata_alloc_device(struct cam_eb *bus, struct cam_et *target,
 				   lun_id_t lun_id);
 static void	 ata_device_transport(struct cam_path *path);
-static void	 scsi_set_transfer_settings(struct ccb_trans_settings *cts,
+static void	 ata_set_transfer_settings(struct ccb_trans_settings *cts,
 					    struct cam_ed *device,
 					    int async_update);
-static void	 scsi_toggle_tags(struct cam_path *path);
 static void	 ata_dev_async(u_int32_t async_code,
 				struct cam_eb *bus,
 				struct cam_et *target,
@@ -717,6 +715,14 @@
 
 			path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID;
 		}
+		if (ident_buf->satacapabilities & ATA_SUPPORT_NCQ) {
+			path->device->mintags = path->device->maxtags =
+			    ATA_QUEUE_LEN(ident_buf->queue) + 1;
+		}
+		ata_find_quirk(path->device);
+		if (path->device->mintags != 0) {
+			xpt_start_tags(path);
+		}
 		ata_device_transport(path);
 		PROBE_SET_ACTION(softc, PROBE_SETMODE);
 		xpt_release_ccb(done_ccb);
@@ -776,7 +782,6 @@
 			return;
 		}
 
-		scsi_find_quirk(path->device);
 		ata_device_transport(path);
 		if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) {
 			path->device->flags &= ~CAM_DEV_UNCONFIGURED;
@@ -853,24 +858,23 @@
 }
 
 static void
-scsi_find_quirk(struct cam_ed *device)
+ata_find_quirk(struct cam_ed *device)
 {
-	struct scsi_quirk_entry *quirk;
+	struct ata_quirk_entry *quirk;
 	caddr_t	match;
 
 	match = cam_quirkmatch((caddr_t)&device->inq_data,
-			       (caddr_t)scsi_quirk_table,
-			       sizeof(scsi_quirk_table) /
-			       sizeof(*scsi_quirk_table),
-			       sizeof(*scsi_quirk_table), scsi_inquiry_match);
+			       (caddr_t)ata_quirk_table,
+			       ata_quirk_table_size,
+			       sizeof(*ata_quirk_table), scsi_inquiry_match);
 
 	if (match == NULL)
 		panic("xpt_find_quirk: device didn't match wildcard entry!!");
 
-	quirk = (struct scsi_quirk_entry *)match;
+	quirk = (struct ata_quirk_entry *)match;
 	device->quirk = quirk;
-	device->mintags = quirk->mintags;
-	device->maxtags = quirk->maxtags;
+//	device->mintags = quirk->mintags;
+//	device->maxtags = quirk->maxtags;
 }
 
 typedef struct {
@@ -1101,7 +1105,7 @@
 ata_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
 	struct cam_path path;
-	struct scsi_quirk_entry *quirk;
+	struct ata_quirk_entry *quirk;
 	struct cam_ed *device;
 	struct cam_ed *cur_device;
 
@@ -1113,10 +1117,10 @@
 	 * Take the default quirk entry until we have inquiry
 	 * data and can determine a better quirk to use.
 	 */
-	quirk = &scsi_quirk_table[scsi_quirk_table_size - 1];
+	quirk = &ata_quirk_table[ata_quirk_table_size - 1];
 	device->quirk = (void *)quirk;
-	device->mintags = quirk->mintags;
-	device->maxtags = quirk->maxtags;
+	device->mintags = 0;
+	device->maxtags = 0;
 	bzero(&device->inq_data, sizeof(device->inq_data));
 	device->inq_flags = 0;
 	device->queue_flags = 0;
@@ -1199,7 +1203,7 @@
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SET_TRAN_SETTINGS:
 	{
-		scsi_set_transfer_settings(&start_ccb->cts,
+		ata_set_transfer_settings(&start_ccb->cts,
 					   start_ccb->ccb_h.path->device,
 					   /*async_update*/FALSE);
 		break;
@@ -1227,7 +1231,7 @@
 }
 
 static void
-scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
+ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
 			   int async_update)
 {
 	struct	ccb_pathinq cpi;
@@ -1387,39 +1391,6 @@
 		(*(sim->sim_action))(sim, (union ccb *)cts);
 }
 
-static void
-scsi_toggle_tags(struct cam_path *path)
-{
-	struct cam_ed *dev;
-
-	/*
-	 * Give controllers a chance to renegotiate
-	 * before starting tag operations.  We
-	 * "toggle" tagged queuing off then on
-	 * which causes the tag enable command delay
-	 * counter to come into effect.
-	 */
-	dev = path->device;
-	if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0
-	 || ((dev->inq_flags & SID_CmdQue) != 0
- 	  && (dev->inq_flags & (SID_Sync|SID_WBus16|SID_WBus32)) != 0)) {
-		struct ccb_trans_settings cts;
-
-		xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
-		cts.protocol = PROTO_SCSI;
-		cts.protocol_version = PROTO_VERSION_UNSPECIFIED;
-		cts.transport = XPORT_UNSPECIFIED;
-		cts.transport_version = XPORT_VERSION_UNSPECIFIED;
-		cts.proto_specific.scsi.flags = 0;
-		cts.proto_specific.scsi.valid = CTS_SCSI_VALID_TQ;
-		scsi_set_transfer_settings(&cts, path->device,
-					  /*async_update*/TRUE);
-		cts.proto_specific.scsi.flags = CTS_SCSI_FLAGS_TAG_ENB;
-		scsi_set_transfer_settings(&cts, path->device,
-					  /*async_update*/TRUE);
-	}
-}
-
 /*
  * Handle any per-device event notifications that require action by the XPT.
  */
@@ -1452,15 +1423,6 @@
 		status = CAM_REQ_CMP_ERR;
 
 	if (status == CAM_REQ_CMP) {
-
-		/*
-		 * Allow transfer negotiation to occur in a
-		 * tag free environment.
-		 */
-		if (async_code == AC_SENT_BDR
-		 || async_code == AC_BUS_RESET)
-			scsi_toggle_tags(&newpath);
-
 		if (async_code == AC_INQ_CHANGED) {
 			/*
 			 * We've sent a start unit command, or
@@ -1481,7 +1443,7 @@
 		struct ccb_trans_settings *settings;
 
 		settings = (struct ccb_trans_settings *)async_arg;
-		scsi_set_transfer_settings(settings, device,
+		ata_set_transfer_settings(settings, device,
 					  /*async_update*/TRUE);
 	}
 }

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#77 (text+ko) ====

@@ -733,7 +733,8 @@
 	}
 	/* Construct SIM entry */
 	ch->sim = cam_sim_alloc(ahciaction, ahcipoll, "ahcich", ch,
-	    device_get_unit(dev), &ch->mtx, ch->numslots, 0, devq);
+	    device_get_unit(dev), &ch->mtx,
+	    min(2, ch->numslots), ch->numslots, devq);
 	if (ch->sim == NULL) {
 		device_printf(dev, "unable to allocate sim\n");
 		error = ENOMEM;

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#17 (text+ko) ====

@@ -454,7 +454,7 @@
 	}
 	/* Construct SIM entry */
 	ch->sim = cam_sim_alloc(siisaction, siispoll, "siisch", ch,
-	    device_get_unit(dev), &ch->mtx, SIIS_MAX_SLOTS, 0, devq);
+	    device_get_unit(dev), &ch->mtx, 2, SIIS_MAX_SLOTS, devq);
 	if (ch->sim == NULL) {
 		device_printf(dev, "unable to allocate sim\n");
 		error = ENOMEM;
From mav at FreeBSD.org  Tue Nov 10 20:35:27 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 20:35:34 2009
Subject: PERFORCE change 170444 for review
Message-ID: <200911102035.nAAKZRcH028866@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170444

Change 170444 by mav@mav_mavbook on 2009/11/10 20:34:42

	Implement quirk matching for ATA.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#21 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#21 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#41 edit
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#54 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#12 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#21 (text+ko) ====

@@ -519,3 +519,38 @@
     return (mode);
 }
 
+int
+ata_identify_match(caddr_t identbuffer, caddr_t table_entry)
+{
+	struct scsi_inquiry_pattern *entry;
+	struct ata_params *ident;
+ 
+	entry = (struct scsi_inquiry_pattern *)table_entry;
+	ident = (struct ata_params *)identbuffer;
+
+	if ((cam_strmatch(ident->model, entry->product,
+			  sizeof(ident->model)) == 0)
+	 && (cam_strmatch(ident->revision, entry->revision,
+			  sizeof(ident->revision)) == 0)) {
+		return (0);
+	}
+        return (-1);
+}
+
+int
+ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry)
+{
+	struct scsi_static_inquiry_pattern *entry;
+	struct ata_params *ident;
+ 
+	entry = (struct scsi_static_inquiry_pattern *)table_entry;
+	ident = (struct ata_params *)identbuffer;
+
+	if ((cam_strmatch(ident->model, entry->product,
+			  sizeof(ident->model)) == 0)
+	 && (cam_strmatch(ident->revision, entry->revision,
+			  sizeof(ident->revision)) == 0)) {
+		return (0);
+	}
+        return (-1);
+}

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#21 (text+ko) ====

@@ -115,4 +115,7 @@
 int	ata_max_umode(struct ata_params *ap);
 int	ata_max_mode(struct ata_params *ap, int mode, int maxmode);
 
+int	ata_identify_match(caddr_t identbuffer, caddr_t table_entry);
+int	ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry);
+
 #endif

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#41 (text+ko) ====

@@ -122,9 +122,17 @@
 	ada_quirks quirks;
 };
 
-//static struct ada_quirk_entry ada_quirk_table[] =
-//{
-//};
+static struct ada_quirk_entry ada_quirk_table[] =
+{
+	{
+		/* Default */
+		{
+		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
+		  /*vendor*/"*", /*product*/"*", /*revision*/"*"
+		},
+		/*quirks*/0
+	},
+};
 
 static	disk_strategy_t	adastrategy;
 static	dumper_t	adadump;
@@ -627,12 +635,10 @@
 	/*
 	 * See if this device has any quirks.
 	 */
-//	match = cam_quirkmatch((caddr_t)&cgd->inq_data,
-//			       (caddr_t)ada_quirk_table,
-//			       sizeof(ada_quirk_table)/sizeof(*ada_quirk_table),
-//			       sizeof(*ada_quirk_table), scsi_inquiry_match);
-	match = NULL;
-
+	match = cam_quirkmatch((caddr_t)&cgd->ident_data,
+			       (caddr_t)ada_quirk_table,
+			       sizeof(ada_quirk_table)/sizeof(*ada_quirk_table),
+			       sizeof(*ada_quirk_table), ata_identify_match);
 	if (match != NULL)
 		softc->quirks = ((struct ada_quirk_entry *)match)->quirks;
 	else

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#54 (text+ko) ====

@@ -69,11 +69,7 @@
 struct ata_quirk_entry {
 	struct scsi_inquiry_pattern inq_pat;
 	u_int8_t quirks;
-#define	CAM_QUIRK_NOLUNS	0x01
-#define	CAM_QUIRK_NOSERIAL	0x02
-#define	CAM_QUIRK_HILUNS	0x04
-#define	CAM_QUIRK_NOHILUNS	0x08
-	u_int mintags;
+#define	CAM_QUIRK_MAXTAGS	0x01
 	u_int maxtags;
 };
 
@@ -145,7 +141,7 @@
 		  T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED,
 		  /*vendor*/"*", /*product*/"*", /*revision*/"*"
 		},
-		/*quirks*/0, /*mintags*/2, /*maxtags*/32
+		/*quirks*/0, /*maxtags*/0
 	},
 };
 
@@ -863,18 +859,18 @@
 	struct ata_quirk_entry *quirk;
 	caddr_t	match;
 
-	match = cam_quirkmatch((caddr_t)&device->inq_data,
+	match = cam_quirkmatch((caddr_t)&device->ident_data,
 			       (caddr_t)ata_quirk_table,
 			       ata_quirk_table_size,
-			       sizeof(*ata_quirk_table), scsi_inquiry_match);
+			       sizeof(*ata_quirk_table), ata_identify_match);
 
 	if (match == NULL)
 		panic("xpt_find_quirk: device didn't match wildcard entry!!");
 
 	quirk = (struct ata_quirk_entry *)match;
 	device->quirk = quirk;
-//	device->mintags = quirk->mintags;
-//	device->maxtags = quirk->maxtags;
+	if (quirk->quirks & CAM_QUIRK_MAXTAGS)
+		device->mintags = device->maxtags = quirk->maxtags;
 }
 
 typedef struct {

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#12 (text+ko) ====

From mav at FreeBSD.org  Tue Nov 10 20:57:50 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 20:57:56 2009
Subject: PERFORCE change 170446 for review
Message-ID: <200911102057.nAAKvnVA040679@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170446

Change 170446 by mav@mav_mavbook on 2009/11/10 20:57:01

	Addition to previous commit.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#13 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#13 (text+ko) ====

@@ -165,8 +165,12 @@
 		str++;
 		str_len--;
 	}
-	while (str_len > 0 && *str++ == ' ')
+	while (str_len > 0 && *str == ' ') {
+		str++;
 		str_len--;
+	}
+	if (str_len > 0 && *str == 0)
+		str_len = 0;
 
 	return (str_len);
 }
From mav at FreeBSD.org  Tue Nov 10 21:00:53 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 21:00:59 2009
Subject: PERFORCE change 170447 for review
Message-ID: <200911102100.nAAL0q5j040921@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170447

Change 170447 by mav@mav_mavbook on 2009/11/10 21:00:23

	Make ADA honor XPT mind about queueing support.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#42 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#30 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#124 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#42 (text+ko) ====

@@ -626,7 +626,7 @@
 	if (cgd->ident_data.support.command2 & ATA_SUPPORT_FLUSHCACHE)
 		softc->flags |= ADA_FLAG_CAN_FLUSHCACHE;
 	if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ &&
-	    cgd->ident_data.queue >= 31)
+	    cgd->inq_flags & SID_CmdQue)
 		softc->flags |= ADA_FLAG_CAN_NCQ;
 	softc->state = ADA_STATE_NORMAL;
 
@@ -706,11 +706,6 @@
 		dp->secsize, dp->heads,
 		dp->secs_per_track, dp->cylinders);
 	xpt_announce_periph(periph, announce_buf);
-	if (softc->flags & ADA_FLAG_CAN_NCQ) {
-		printf("%s%d: Native Command Queueing enabled\n",
-		       periph->periph_name, periph->unit_number);
-	}
-
 	/*
 	 * Add async callbacks for bus reset and
 	 * bus device reset calls.  I don't bother

==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#30 (text+ko) ====

@@ -307,7 +307,7 @@
 	struct scsi_inquiry_data inq_data;
 	struct ata_params ident_data;
 	u_int8_t  serial_num[252];
-	u_int8_t  reserved;
+	u_int8_t  inq_flags;
 	u_int8_t  serial_num_len;
 };
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#124 (text+ko) ====

@@ -2671,6 +2671,7 @@
 			cgd->protocol = dev->protocol;
 			cgd->inq_data = dev->inq_data;
 			cgd->ident_data = dev->ident_data;
+			cgd->inq_flags = dev->inq_flags;
 			cgd->ccb_h.status = CAM_REQ_CMP;
 			cgd->serial_num_len = dev->serial_num_len;
 			if ((dev->serial_num_len > 0)
From mav at FreeBSD.org  Tue Nov 10 21:18:10 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Tue Nov 10 21:18:30 2009
Subject: PERFORCE change 170448 for review
Message-ID: <200911102118.nAALIA0I043099@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170448

Change 170448 by mav@mav_mavbook on 2009/11/10 21:17:34

	Temporary disable tagged queuing if not all SIM-supported tags
	supported by device. We will need to tell which are.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#55 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#55 (text+ko) ====

@@ -716,6 +716,9 @@
 			    ATA_QUEUE_LEN(ident_buf->queue) + 1;
 		}
 		ata_find_quirk(path->device);
+		/* XXX: If not all tags allowed, we must to tell SIM which are. */
+		if (path->device->mintags < path->bus->sim->max_tagged_dev_openings)
+			path->device->mintags = path->device->maxtags = 0;
 		if (path->device->mintags != 0) {
 			xpt_start_tags(path);
 		}
From hselasky at FreeBSD.org  Tue Nov 10 21:44:37 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Tue Nov 10 21:44:44 2009
Subject: PERFORCE change 170449 for review
Message-ID: <200911102144.nAALiaG4045048@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170449

Change 170449 by hselasky@hselasky_laptop001 on 2009/11/10 21:43:38

	
	USB CORE:
		- improve and factor out USB High-Speed slot allocation mechanism.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#43 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#30 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#57 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#37 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#172 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdi.h#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#43 (text+ko) ====

@@ -2020,8 +2020,8 @@
 
 	qh_endphub =
 	    (EHCI_QH_SET_MULT(xfer->max_packet_count & 3) |
-	    EHCI_QH_SET_CMASK(xfer->usb_cmask) |
-	    EHCI_QH_SET_SMASK(xfer->usb_smask) |
+	    EHCI_QH_SET_CMASK(xfer->endpoint->usb_cmask) |
+	    EHCI_QH_SET_SMASK(xfer->endpoint->usb_smask) |
 	    EHCI_QH_SET_HUBA(xfer->xroot->udev->hs_hub_addr) |
 	    EHCI_QH_SET_PORT(xfer->xroot->udev->hs_port_no));
 
@@ -2166,7 +2166,7 @@
 
 		DPRINTFN(2, "status=0x%08x, len=%u\n", status, len);
 
-		if (xfer->usb_smask & (1 << td_no)) {
+		if (xfer->endpoint->usb_smask & (1 << td_no)) {
 
 			if (*plen >= len) {
 				/*
@@ -2352,25 +2352,9 @@
 	uint16_t best;
 	uint16_t bit;
 	uint16_t x;
-	uint8_t slot;
 
-	/* Allocate a microframe slot first: */
-
-	slot = usb_intr_schedule_adjust(xfer->xroot->udev,
-	    xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, 0x01);
-
-	if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) {
-		xfer->usb_uframe = slot;
-		xfer->usb_smask = (0x01 << slot) & 0xFF;
-		xfer->usb_cmask = 0x00;
-	} else {
-		xfer->usb_uframe = slot;
-		xfer->usb_smask = (0x01 << slot) & 0x3F;
-		xfer->usb_cmask = (-(0x04 << slot)) & 0xFE;
-	}
+	usb_hs_bandwidth_alloc(xfer);
 
-	DPRINTFN(11, "slot=%d\n", slot);
-
 	/*
 	 * Find the best QH position corresponding to the given interval:
 	 */
@@ -2405,14 +2389,12 @@
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
 
-	/* Free microframe slot: */
-
-	usb_intr_schedule_adjust(xfer->xroot->udev,
-	    -xfer->max_frame_size, xfer->usb_uframe, 0x01);
-
 	sc->sc_intr_stat[xfer->qh_pos]--;
 
 	ehci_device_done(xfer, USB_ERR_CANCELLED);
+
+	/* bandwidth must be freed after device done */
+	usb_hs_bandwidth_free(xfer);
 }
 
 static void
@@ -2734,35 +2716,9 @@
 	ehci_itd_t *td;
 	uint32_t temp;
 	uint8_t ds;
-	uint8_t slot;
-	uint8_t mask;
 
-	switch (usbd_xfer_get_fps_shift(xfer)) {
-	case 0:
-		mask = 0xFF;
-		break;
-	case 1:
-		mask = 0x55;
-		break;
-	case 2:
-		mask = 0x11;
-		break;
-	default:
-		mask = 0x01;
-		break;
-	}
-
-	/* Allocate a microframe multi-slot first: */
-
-	slot = usb_intr_schedule_adjust(xfer->xroot->udev,
-	    xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask);
+	usb_hs_bandwidth_alloc(xfer);
 
-	xfer->usb_uframe = slot;
-	xfer->usb_cmask = 0;
-	xfer->usb_smask = mask << slot;
-
-	DPRINTFN(11, "slot=%d, mask=0x%02x\n", slot, mask);
-
 	/* initialize all TD's */
 
 	for (ds = 0; ds != 2; ds++) {
@@ -2805,14 +2761,10 @@
 static void
 ehci_device_isoc_hs_close(struct usb_xfer *xfer)
 {
+	ehci_device_done(xfer, USB_ERR_CANCELLED);
 
-	/* Free microframe multi-slot: */
-
-	usb_intr_schedule_adjust(xfer->xroot->udev,
-	    -xfer->max_frame_size, xfer->usb_uframe,
-	    xfer->usb_smask >> xfer->usb_uframe);
-
-	ehci_device_done(xfer, USB_ERR_CANCELLED);
+	/* bandwidth must be freed after device done */
+	usb_hs_bandwidth_free(xfer);
 }
 
 static void
@@ -2922,7 +2874,7 @@
 			*plen = xfer->max_frame_size;
 		}
 
-		if (xfer->usb_smask & (1 << td_no)) {
+		if (xfer->endpoint->usb_smask & (1 << td_no)) {
 			status = (EHCI_ITD_SET_LEN(*plen) |
 			    EHCI_ITD_ACTIVE |
 			    EHCI_ITD_SET_PG(0));

==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#30 (text+ko) ====

@@ -161,9 +161,6 @@
 	uint8_t	address;		/* physical USB address */
 	uint8_t	endpointno;		/* physical USB endpoint */
 	uint8_t	max_packet_count;
-	uint8_t	usb_smask;
-	uint8_t	usb_cmask;
-	uint8_t	usb_uframe;
 	uint8_t	usb_state;
 	uint8_t fps_shift;		/* down shift of FPS, 0..3 */
 

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#57 (text+ko) ====

@@ -665,7 +665,7 @@
 			/* look for matching endpoints */
 			if ((iface_index == USB_IFACE_INDEX_ANY) ||
 			    (iface_index == ep->iface_index)) {
-				if (ep->refcount != 0) {
+				if (ep->refcount_alloc != 0) {
 					/*
 					 * This typically indicates a
 					 * more serious error.

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#37 (text+ko) ====

@@ -1145,7 +1145,7 @@
 }
 
 /*------------------------------------------------------------------------*
- *	usb_intr_schedule_adjust
+ *	usb_hs_bandwidth_adjust
  *
  * This function will update the bandwith usage for the microframe
  * having index "slot" by "len" bytes. "len" can be negative.  If the
@@ -1156,8 +1156,8 @@
  * Returns:
  *    The slot in which the bandwidth update was done: 0..7
  *------------------------------------------------------------------------*/
-uint8_t
-usb_intr_schedule_adjust(struct usb_device *udev, int16_t len,
+static uint8_t
+usb_hs_bandwidth_adjust(struct usb_device *udev, int16_t len,
     uint8_t slot, uint8_t mask)
 {
 	struct usb_bus *bus = udev->bus;
@@ -1210,6 +1210,132 @@
 }
 
 /*------------------------------------------------------------------------*
+ *	usb_hs_bandwidth_alloc
+ *
+ * This function is a wrapper function for "usb_hs_bandwidth_adjust()".
+ *------------------------------------------------------------------------*/
+void
+usb_hs_bandwidth_alloc(struct usb_xfer *xfer)
+{
+	struct usb_device *udev;
+	uint8_t slot;
+	uint8_t mask;
+	uint8_t speed;
+
+	udev = xfer->xroot->udev;
+
+	if (udev->flags.usb_mode != USB_MODE_HOST)
+		return;		/* not supported */
+
+	xfer->endpoint->refcount_bw++;
+	if (xfer->endpoint->refcount_bw != 1)
+		return;		/* already allocated */
+
+	speed = usbd_get_speed(udev);
+
+	switch (xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) {
+	case UE_INTERRUPT:
+		/* allocate a microframe slot */
+
+		mask = 0x01;
+		slot = usb_hs_bandwidth_adjust(udev,
+		    xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask);
+
+		xfer->endpoint->usb_uframe = slot;
+		xfer->endpoint->usb_smask = mask << slot;
+
+		if ((speed != USB_SPEED_FULL) &&
+		    (speed != USB_SPEED_LOW)) {
+			xfer->endpoint->usb_cmask = 0x00 ;
+		} else {
+			xfer->endpoint->usb_cmask = (-(0x04 << slot)) & 0xFE;
+		}
+		break;
+
+	case UE_ISOCHRONOUS:
+		switch (usbd_xfer_get_fps_shift(xfer)) {
+		case 0:
+			mask = 0xFF;
+			break;
+		case 1:
+			mask = 0x55;
+			break;
+		case 2:
+			mask = 0x11;
+			break;
+		default:
+			mask = 0x01;
+			break;
+		}
+
+		/* allocate a microframe multi-slot */
+
+		slot = usb_hs_bandwidth_adjust(udev,
+		    xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask);
+
+		xfer->endpoint->usb_uframe = slot;
+		xfer->endpoint->usb_cmask = 0;
+		xfer->endpoint->usb_smask = mask << slot;
+		break;
+
+	default:
+		xfer->endpoint->usb_uframe = 0;
+		xfer->endpoint->usb_cmask = 0;
+		xfer->endpoint->usb_smask = 0;
+		break;
+	}
+
+	DPRINTFN(11, "slot=%d, mask=0x%02x\n", 
+	    xfer->endpoint->usb_uframe, 
+	    xfer->endpoint->usb_smask >> xfer->endpoint->usb_uframe);
+}
+
+/*------------------------------------------------------------------------*
+ *	usb_hs_bandwidth_free
+ *
+ * This function is a wrapper function for "usb_hs_bandwidth_adjust()".
+ *------------------------------------------------------------------------*/
+void
+usb_hs_bandwidth_free(struct usb_xfer *xfer)
+{
+	struct usb_device *udev;
+	uint8_t slot;
+	uint8_t mask;
+
+	udev = xfer->xroot->udev;
+
+	if (udev->flags.usb_mode != USB_MODE_HOST)
+		return;		/* not supported */
+
+	xfer->endpoint->refcount_bw--;
+	if (xfer->endpoint->refcount_bw != 0)
+		return;		/* still allocated */
+
+	switch (xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) {
+	case UE_INTERRUPT:
+	case UE_ISOCHRONOUS:
+
+		slot = xfer->endpoint->usb_uframe;
+		mask = xfer->endpoint->usb_smask;
+
+		/* free microframe slot(s): */ 	  
+		usb_hs_bandwidth_adjust(udev,
+		    -xfer->max_frame_size, slot, mask >> slot);
+
+		DPRINTFN(11, "slot=%d, mask=0x%02x\n", 
+		    slot, mask >> slot);
+
+		xfer->endpoint->usb_uframe = 0;
+		xfer->endpoint->usb_cmask = 0;
+		xfer->endpoint->usb_smask = 0;
+		break;
+
+	default:
+		break;
+	}
+}
+
+/*------------------------------------------------------------------------*
  *	usbd_fs_isoc_schedule_init_sub
  *
  * This function initialises an USB FULL speed isochronous schedule

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#15 (text+ko) ====

@@ -66,8 +66,8 @@
 
 /* function prototypes */
 
-uint8_t	usb_intr_schedule_adjust(struct usb_device *udev, int16_t len,
-	    uint8_t slot, uint8_t mask);
+void	usb_hs_bandwidth_alloc(struct usb_xfer *xfer);
+void	usb_hs_bandwidth_free(struct usb_xfer *xfer);
 void	usbd_fs_isoc_schedule_init_all(struct usb_fs_isoc_schedule *fss);
 void	usb_bus_port_set_device(struct usb_bus *bus, struct usb_port *up,
 	    struct usb_device *udev, uint8_t device_index);

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#172 (text+ko) ====

@@ -942,10 +942,18 @@
 				 * configuration and alternate setting
 				 * when USB transfers are in use on
 				 * the given interface. Search the USB
-				 * code for "endpoint->refcount" if you
+				 * code for "endpoint->refcount_alloc" if you
 				 * want more information.
 				 */
-				xfer->endpoint->refcount++;
+				USB_BUS_LOCK(info->bus);
+				if (xfer->endpoint->refcount_alloc >= USB_EP_REF_MAX)
+					parm.err = USB_ERR_INVAL;
+
+				xfer->endpoint->refcount_alloc++;
+
+				if (xfer->endpoint->refcount_alloc == 0)
+					panic("usbd_transfer_setup(): Refcount wrapped to zero\n");
+				USB_BUS_UNLOCK(info->bus);
 
 				/*
 				 * Whenever we set ppxfer[] then we
@@ -960,6 +968,10 @@
 				 */
 				ppxfer[n] = xfer;
 			}
+
+			/* check for error */
+			if (parm.err)
+				goto done;
 		}
 
 		if (buf || parm.err) {
@@ -1179,7 +1191,9 @@
 		 * NOTE: default endpoint does not have an
 		 * interface, even if endpoint->iface_index == 0
 		 */
-		xfer->endpoint->refcount--;
+		USB_BUS_LOCK(info->bus);
+		xfer->endpoint->refcount_alloc--;
+		USB_BUS_UNLOCK(info->bus);
 
 		usb_callout_drain(&xfer->timeout_handle);
 

==== //depot/projects/usb/src/sys/dev/usb/usbdi.h#14 (text+ko) ====

@@ -130,13 +130,22 @@
 	struct usb_pipe_methods *methods;	/* set by HC driver */
 
 	uint16_t isoc_next;
-	uint16_t refcount;
 
 	uint8_t	toggle_next:1;		/* next data toggle value */
 	uint8_t	is_stalled:1;		/* set if endpoint is stalled */
 	uint8_t	is_synced:1;		/* set if we a synchronised */
 	uint8_t	unused:5;
 	uint8_t	iface_index;		/* not used by "default endpoint" */
+
+	uint8_t refcount_alloc;		/* allocation refcount */
+	uint8_t refcount_bw;		/* bandwidth refcount */
+#define	USB_EP_REF_MAX 0x3f
+
+	/* High-Speed resource allocation (valid if "refcount_bw" > 0) */
+
+	uint8_t	usb_smask;		/* USB start mask */
+	uint8_t	usb_cmask;		/* USB complete mask */
+	uint8_t	usb_uframe;		/* USB microframe */
 };
 
 /*
From mav at FreeBSD.org  Wed Nov 11 10:48:43 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov 11 10:48:50 2009
Subject: PERFORCE change 170471 for review
Message-ID: <200911111048.nABAmgbc046105@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170471

Change 170471 by mav@mav_mavbook on 2009/11/11 10:48:39

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/UPDATING#21 integrate
.. //depot/projects/scottl-camlock/src/contrib/ee/ee.c#4 integrate
.. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/fmtmsg.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/gai_strerror.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/C.msg#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_desc.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#9 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#29 integrate
.. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#3 integrate
.. //depot/projects/scottl-camlock/src/secure/lib/libssh/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#10 integrate
.. //depot/projects/scottl-camlock/src/share/zoneinfo/antarctica#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa_dma.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#41 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#53 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/an/if_anreg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ieee488/ibfoo.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/atp.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/isa_dma.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/ia64/ia64/vm_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/include/pcb.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#12 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/usb/atp/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/scterm-sck.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/vm_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/trap.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/booke/vm_machdep.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/rpc/clnt_vc.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcb.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/vm_machdep.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/trap.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/vm_machdep.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#28 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#5 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-flopen.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gzip/unbzip2.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/acpi.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/acpidump.h#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/biosmptable.c#2 delete
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/install.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/menus.c#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.8#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/vidcontrol.1#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/UPDATING#21 (text+ko) ====

@@ -22,6 +22,11 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20091109:
+	The layout of the structure ieee80211req_scan_result has changed.
+	Applications that require wireless scan results (e.g. ifconfig(8))
+	from net80211 need to be recompiled.
+
 20091025:
 	The iwn(4) driver has been updated to support the 5000 and 5150 series.
 	There's one kernel module for each firmware. Adding "device iwnfw"
@@ -1052,4 +1057,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.644 2009/11/03 21:06:19 thompsa Exp $
+$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $

==== //depot/projects/scottl-camlock/src/contrib/ee/ee.c#4 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.7 2009/09/04 07:42:13 ache Exp $");
+__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.8 2009/11/10 00:48:24 delphij Exp $");
 
 char *ee_copyright_message = 
 "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon ";
@@ -1989,7 +1989,7 @@
 	int number;
 	int i;
 	char *ptr;
-	char *direction = NULL;
+	char *direction = "d";
 	struct text *t_line;
 
 	ptr = cmd_str;

==== //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#5 (text) ====

@@ -9,7 +9,7 @@
  *
  * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
  *
- * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.9 2009/11/10 09:45:43 des Exp $
  */
 
 #define a2port					ssh_a2port
@@ -223,6 +223,8 @@
 #define get_u32					ssh_get_u32
 #define get_u64					ssh_get_u64
 #define getrrsetbyname				ssh_getrrsetbyname
+#define glob					ssh_glob
+#define globfree				ssh_globfree
 #define host_hash				ssh_host_hash
 #define hostfile_read_key			ssh_hostfile_read_key
 #define hpdelim					ssh_hpdelim

==== //depot/projects/scottl-camlock/src/lib/libc/gen/fmtmsg.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.6 2009/11/08 14:02:54 brueffer Exp $");
 
 #include 
 #include 
@@ -128,7 +128,7 @@
 		size += strlen(sevname);
 	if (text != MM_NULLTXT)
 		size += strlen(text);
-	if (text != MM_NULLACT)
+	if (act != MM_NULLACT)
 		size += strlen(act);
 	if (tag != MM_NULLTAG)
 		size += strlen(tag);

==== //depot/projects/scottl-camlock/src/lib/libc/net/gai_strerror.c#2 (text+ko) ====

@@ -28,9 +28,19 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/net/gai_strerror.c,v 1.2 2006/05/21 11:22:31 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/gai_strerror.c,v 1.3 2009/11/09 12:46:59 ume Exp $");
 
+#include "namespace.h"
 #include 
+#if defined(NLS)
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "reentrant.h"
+#endif
+#include "un-namespace.h"
 
 /* Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) are obsoleted, but left */
 /* for backward compatibility with userland code prior to 2553bis-02 */
@@ -52,9 +62,57 @@
 	"Argument buffer overflow"			/* EAI_OVERFLOW */
 };
 
+#if defined(NLS)
+static char		gai_buf[NL_TEXTMAX];
+static once_t		gai_init_once = ONCE_INITIALIZER;
+static thread_key_t	gai_key;
+static int		gai_keycreated = 0;
+
+static void
+gai_keycreate(void)
+{
+	gai_keycreated = (thr_keycreate(&gai_key, free) == 0);
+}
+#endif
+
 const char *
 gai_strerror(int ecode)
 {
+#if defined(NLS)
+	nl_catd catd;
+	char *buf;
+
+	if (thr_main() != 0)
+		buf = gai_buf;
+	else {
+		if (thr_once(&gai_init_once, gai_keycreate) != 0 ||
+		    !gai_keycreated)
+			goto thr_err;
+		if ((buf = thr_getspecific(gai_key)) == NULL) {
+			if ((buf = malloc(sizeof(gai_buf))) == NULL)
+				goto thr_err;
+			if (thr_setspecific(gai_key, buf) != 0) {
+				free(buf);
+				goto thr_err;
+			}
+		}
+	}
+
+	catd = catopen("libc", NL_CAT_LOCALE);
+	if (ecode > 0 && ecode < EAI_MAX)
+		strlcpy(buf, catgets(catd, 3, ecode, ai_errlist[ecode]),
+		    sizeof(gai_buf));
+	else if (ecode == 0)
+		strlcpy(buf, catgets(catd, 3, NL_MSGMAX - 1, "Success"),
+		    sizeof(gai_buf));
+	else
+		strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"),
+		    sizeof(gai_buf));
+	catclose(catd);
+	return buf;
+
+thr_err:
+#endif
 	if (ecode >= 0 && ecode < EAI_MAX)
 		return ai_errlist[ecode];
 	return "Unknown error";

==== //depot/projects/scottl-camlock/src/lib/libc/nls/C.msg#3 (text+ko) ====

@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.2 2009/10/13 17:57:06 rwatson Exp $
+$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.3 2009/11/09 12:46:59 ume Exp $
 $
 $ Message catalog for C locale (template)
 $
@@ -257,3 +257,39 @@
 30 User defined signal 1
 $ SIGUSR2
 31 User defined signal 2
+$
+$ gai_strerror() support catalog
+$
+$set 3
+$ 1 (obsolete)
+1 Address family for hostname not supported
+$ EAI_AGAIN
+2 Temporary failure in name resolution
+$ EAI_BADFLAGS
+3 Invalid value for ai_flags
+$ EAI_FAIL
+4 Non-recoverable failure in name resolution
+$ EAI_FAMILY
+5 ai_family not supported
+$ EAI_MEMORY
+6 Memory allocation failure
+$ 7 (obsolete)
+7 No address associated with hostname
+$ EAI_NONAME
+8 hostname nor servname provided, or not known
+$ EAI_SERVICE
+9 servname not supported for ai_socktype
+$ EAI_SOCKTYPE
+10 ai_socktype not supported
+$ EAI_SYSTEM
+11 System error returned in errno
+$ EAI_BADHINTS
+12 Invalid value for hints
+$ EAI_PROTOCOL
+13 Resolved protocol is unknown
+$ EAI_OVERFLOW
+14 Argument buffer overflow
+$ 0
+32766 Success
+$ NL_MSGMAX
+32767 Unknown error

==== //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.18 2009/09/27 13:16:38 gabor Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.20 2009/11/09 12:33:47 ume Exp $
 
 .PATH: ${.CURDIR}/nls
 
@@ -23,6 +23,8 @@
 NLS+=	gl_ES.ISO8859-1
 NLS+=	hu_HU.ISO8859-2
 NLS+=	it_IT.ISO8859-15
+NLS+=	ja_JP.UTF-8
+NLS+=	ja_JP.eucJP
 NLS+=	ko_KR.UTF-8
 NLS+=	ko_KR.eucKR
 NLS+=	mn_MN.UTF-8

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb.h,v 1.9 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb.h,v 1.10 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  *
@@ -271,9 +271,11 @@
 	uint16_t wLength;
 }	libusb_control_setup;
 
+#define	LIBUSB_CONTROL_SETUP_SIZE	8	/* bytes */
+
 typedef struct libusb_iso_packet_descriptor {
-	unsigned int length;
-	unsigned int actual_length;
+	uint32_t length;
+	uint32_t actual_length;
 	enum libusb_transfer_status status;
 }	libusb_iso_packet_descriptor __aligned(sizeof(void *));
 
@@ -282,9 +284,9 @@
 typedef struct libusb_transfer {
 	libusb_device_handle *dev_handle;
 	uint8_t	flags;
-	unsigned int endpoint;
+	uint32_t endpoint;
 	uint8_t type;
-	unsigned int timeout;
+	uint32_t timeout;
 	enum libusb_transfer_status status;
 	int	length;
 	int	actual_length;
@@ -320,7 +322,7 @@
 int	libusb_set_configuration(libusb_device_handle * devh, int configuration);
 int	libusb_claim_interface(libusb_device_handle * devh, int interface_number);
 int	libusb_release_interface(libusb_device_handle * devh, int interface_number);
-int	libusb_reset_device(libusb_device_handle * dev);
+int	libusb_reset_device(libusb_device_handle * devh);
 int 	libusb_kernel_driver_active(libusb_device_handle * devh, int interface);
 int 	libusb_detach_kernel_driver(libusb_device_handle * devh, int interface);
 int 	libusb_attach_kernel_driver(libusb_device_handle * devh, int interface);
@@ -333,7 +335,8 @@
 int	libusb_get_config_descriptor(libusb_device * dev, uint8_t config_index, struct libusb_config_descriptor **config);
 int	libusb_get_config_descriptor_by_value(libusb_device * dev, uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
 void	libusb_free_config_descriptor(struct libusb_config_descriptor *config);
-int	libusb_get_string_descriptor_ascii(libusb_device_handle * dev, uint8_t desc_index, uint8_t *data, int length);
+int	libusb_get_string_descriptor_ascii(libusb_device_handle * devh, uint8_t desc_index, uint8_t *data, int length);
+int	libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length);
 
 /* Asynchronous device I/O */
 
@@ -341,7 +344,16 @@
 void	libusb_free_transfer(struct libusb_transfer *transfer);
 int	libusb_submit_transfer(struct libusb_transfer *transfer);
 int	libusb_cancel_transfer(struct libusb_transfer *transfer);
-uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, unsigned int packet);
+uint8_t *libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index);
+uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index);
+void	libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length);
+uint8_t *libusb_control_transfer_get_data(struct libusb_transfer *transfer);
+struct libusb_control_setup *libusb_control_transfer_get_setup(struct libusb_transfer *transfer);
+void	libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength);
+void	libusb_fill_control_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t *buf, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
+void	libusb_fill_bulk_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
+void	libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
+void	libusb_fill_iso_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, int npacket, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
 
 /* Polling and timing */
 
@@ -362,9 +374,14 @@
 
 /* Synchronous device I/O */
 
-int	libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, unsigned int timeout);
-int	libusb_bulk_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout);
-int	libusb_interrupt_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout);
+int	libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, uint32_t timeout);
+int	libusb_bulk_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout);
+int	libusb_interrupt_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout);
+
+/* Byte-order */
+
+uint16_t libusb_cpu_to_le16(uint16_t x);
+uint16_t libusb_le16_to_cpu(uint16_t x);
 
 #if 0
 {					/* indent fix */

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  * Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
@@ -185,8 +186,6 @@
 	/* create libusb v1.0 compliant devices */
 	i = 0;
 	while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) {
-		/* get device into libUSB v1.0 list */
-		libusb20_be_dequeue_device(usb_backend, pdev);
 
 		dev = malloc(sizeof(*dev));
 		if (dev == NULL) {
@@ -199,6 +198,10 @@
 			libusb20_be_free(usb_backend);
 			return (LIBUSB_ERROR_NO_MEM);
 		}
+
+		/* get device into libUSB v1.0 list */
+		libusb20_be_dequeue_device(usb_backend, pdev);
+
 		memset(dev, 0, sizeof(*dev));
 
 		/* init transfer queues */
@@ -416,6 +419,8 @@
 	libusb10_remove_pollfd(ctx, &dev->dev_poll);
 
 	libusb20_dev_close(pdev);
+
+	/* unref will free the "pdev" when the refcount reaches zero */
 	libusb_unref_device(dev);
 
 	/* make sure our event loop detects the closed device */
@@ -1195,7 +1200,7 @@
 	struct libusb20_transfer *pxfer1;
 	struct libusb_super_transfer *sxfer;
 	struct libusb_device *dev;
-	unsigned int endpoint;
+	uint32_t endpoint;
 	int err;
 
 	if (uxfer == NULL)
@@ -1252,7 +1257,7 @@
 	struct libusb20_transfer *pxfer1;
 	struct libusb_super_transfer *sxfer;
 	struct libusb_device *dev;
-	unsigned int endpoint;
+	uint32_t endpoint;
 
 	if (uxfer == NULL)
 		return (LIBUSB_ERROR_INVALID_PARAM);
@@ -1312,3 +1317,16 @@
 {
 	/* TODO */
 }
+
+uint16_t
+libusb_cpu_to_le16(uint16_t x)
+{
+	return (htole16(x));
+}
+
+uint16_t
+libusb_le16_to_cpu(uint16_t x)
+{
+	return (le16toh(x));
+}
+

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  *
@@ -35,6 +35,8 @@
 #include "libusb.h"
 #include "libusb10.h"
 
+#define	N_ALIGN(n) (-((-(n)) & (-8UL)))
+
 /* USB descriptors */
 
 int
@@ -114,17 +116,17 @@
 
 	nalt = nif = pconf->num_interface;
 	nep = 0;
-	nextra = pconf->extra.len;
+	nextra = N_ALIGN(pconf->extra.len);
 
 	for (i = 0; i < nif; i++) {
 
 		pinf = pconf->interface + i;
-		nextra += pinf->extra.len;
+		nextra += N_ALIGN(pinf->extra.len);
 		nep += pinf->num_endpoints;
 		k = pinf->num_endpoints;
 		pend = pinf->endpoints;
 		while (k--) {
-			nextra += pend->extra.len;
+			nextra += N_ALIGN(pend->extra.len);
 			pend++;
 		}
 
@@ -132,12 +134,12 @@
 		nalt += pinf->num_altsetting;
 		pinf = pinf->altsetting;
 		while (j--) {
-			nextra += pinf->extra.len;
+			nextra += N_ALIGN(pinf->extra.len);
 			nep += pinf->num_endpoints;
 			k = pinf->num_endpoints;
 			pend = pinf->endpoints;
 			while (k--) {
-				nextra += pend->extra.len;
+				nextra += N_ALIGN(pend->extra.len);
 				pend++;
 			}
 			pinf++;
@@ -150,17 +152,18 @@
 	    (nalt * sizeof(libusb_interface_descriptor)) +
 	    (nep * sizeof(libusb_endpoint_descriptor));
 
+	nextra = N_ALIGN(nextra);
+
 	pconfd = malloc(nextra);
 
 	if (pconfd == NULL) {
 		free(pconf);
 		return (LIBUSB_ERROR_NO_MEM);
 	}
-	/* make sure memory is clean */
+	/* make sure memory is initialised */
 	memset(pconfd, 0, nextra);
 
-	pconfd->interface = (libusb_interface *) (pconfd +
-	    sizeof(libusb_config_descriptor));
+	pconfd->interface = (libusb_interface *) (pconfd + 1);
 
 	ifd = (libusb_interface_descriptor *) (pconfd->interface + nif);
 	endd = (libusb_endpoint_descriptor *) (ifd + nalt);
@@ -181,7 +184,7 @@
 		pconfd->extra_length = pconf->extra.len;
 		pconfd->extra = pextra;
 		memcpy(pextra, pconf->extra.ptr, pconfd->extra_length);
-		pextra += pconfd->extra_length;
+		pextra += N_ALIGN(pconfd->extra_length);
 	}
 	/* setup all interface and endpoint pointers */
 
@@ -221,7 +224,7 @@
 				ifd->extra_length = pinf->extra.len;
 				ifd->extra = pextra;
 				memcpy(pextra, pinf->extra.ptr, pinf->extra.len);
-				pextra += pinf->extra.len;
+				pextra += N_ALIGN(pinf->extra.len);
 			}
 			for (k = 0; k < pinf->num_endpoints; k++) {
 				pend = &pinf->endpoints[k];
@@ -238,7 +241,7 @@
 					endd->extra_length = pend->extra.len;
 					endd->extra = pextra;
 					memcpy(pextra, pend->extra.ptr, pend->extra.len);
-					pextra += pend->extra.len;
+					pextra += N_ALIGN(pend->extra.len);
 				}
 			}
 		}
@@ -304,3 +307,12 @@
 
 	return (LIBUSB_ERROR_OTHER);
 }
+
+int
+libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, 
+    uint8_t desc_index, uint8_t *data, int length)
+{
+	return (libusb_control_transfer(devh, LIBUSB_ENDPOINT_IN,
+	    LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data,
+	    length, 1000));
+}

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#4 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  *
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "libusb20.h"
 #include "libusb20_desc.h"
@@ -148,19 +149,19 @@
 		goto do_done;
 	}
 	for (i = 0; i != nfds; i++) {
-		if (fds[i].revents == 0)
-			continue;
 		if (ppdev[i] != NULL) {
 			dev = libusb_get_device(ppdev[i]);
 
-			err = libusb20_dev_process(ppdev[i]);
+			if (fds[i].revents == 0)
+				err = 0;	/* nothing to do */
+			else
+				err = libusb20_dev_process(ppdev[i]);
+
 			if (err) {
 				/* cancel all transfers - device is gone */
 				libusb10_cancel_all_transfer(dev);
-				/*
-				 * make sure we don't go into an infinite
-				 * loop
-				 */
+
+				/* remove USB device from polling loop */
 				libusb10_remove_pollfd(dev->ctx, &dev->dev_poll);
 			}
 			CTX_UNLOCK(ctx);
@@ -573,3 +574,160 @@
 	DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_interrupt_transfer leave");
 	return (ret);
 }
+
+uint8_t *
+libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index)
+{
+	uint8_t *ptr;
+	uint32_t n;
+
+	if (transfer->num_iso_packets < 0)
+		return (NULL);
+
+	if (index >= (uint32_t)transfer->num_iso_packets)
+		return (NULL);
+
+	ptr = transfer->buffer;
+	if (ptr == NULL)
+		return (NULL);
+
+	for (n = 0; n != index; n++) {
+		ptr += transfer->iso_packet_desc[n].length;
+	}
+	return (ptr);
+}
+
+uint8_t *
+libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index)
+{
+	uint8_t *ptr;
+
+	if (transfer->num_iso_packets < 0)
+		return (NULL);
+
+	if (index >= (uint32_t)transfer->num_iso_packets)
+		return (NULL);
+
+	ptr = transfer->buffer;
+	if (ptr == NULL)
+		return (NULL);
+
+	ptr += transfer->iso_packet_desc[0].length * index;
+
+	return (ptr);
+}
+
+void
+libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length)
+{
+	int n;
+
+	if (transfer->num_iso_packets < 0)
+		return;
+
+	for (n = 0; n != transfer->num_iso_packets; n++)
+		transfer->iso_packet_desc[n].length = length;
+}
+
+uint8_t *
+libusb_control_transfer_get_data(struct libusb_transfer *transfer)
+{
+	if (transfer->buffer == NULL)
+		return (NULL);
+
+	return (transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE);
+}
+
+struct libusb_control_setup *
+libusb_control_transfer_get_setup(struct libusb_transfer *transfer)
+{
+	return ((struct libusb_control_setup *)transfer->buffer);
+}
+
+void
+libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType,
+    uint8_t bRequest, uint16_t wValue,
+    uint16_t wIndex, uint16_t wLength)
+{
+	struct libusb_control_setup *req = (struct libusb_control_setup *)buf;
+
+	/* The alignment is OK for all fields below. */
+	req->bmRequestType = bmRequestType;
+	req->bRequest = bRequest;
+	req->wValue = htole16(wValue);
+	req->wIndex = htole16(wIndex);
+	req->wLength = htole16(wLength);
+}
+
+void
+libusb_fill_control_transfer(struct libusb_transfer *transfer, 
+    libusb_device_handle *devh, uint8_t *buf,
+    libusb_transfer_cb_fn callback, void *user_data,
+    uint32_t timeout)
+{
+	struct libusb_control_setup *setup = (struct libusb_control_setup *)buf;
+
+	transfer->dev_handle = devh;
+	transfer->endpoint = 0;
+	transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	if (setup != NULL)
+		transfer->length = LIBUSB_CONTROL_SETUP_SIZE
+			+ le16toh(setup->wLength);
+	else
+		transfer->length = 0;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+
+}
+
+void
+libusb_fill_bulk_transfer(struct libusb_transfer *transfer, 
+    libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, 
+    int length, libusb_transfer_cb_fn callback, void *user_data,
+    uint32_t timeout)
+{
+	transfer->dev_handle = devh;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_BULK;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	transfer->length = length;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+void
+libusb_fill_interrupt_transfer(struct libusb_transfer *transfer,
+    libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf,
+    int length, libusb_transfer_cb_fn callback, void *user_data,
+    uint32_t timeout)
+{
+	transfer->dev_handle = devh;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	transfer->length = length;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+
+void
+libusb_fill_iso_transfer(struct libusb_transfer *transfer, 
+    libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf,
+    int length, int npacket, libusb_transfer_cb_fn callback,
+    void *user_data, uint32_t timeout)
+{
+	transfer->dev_handle = devh;
+	transfer->endpoint = endpoint;
+	transfer->type = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS;
+	transfer->timeout = timeout;
+	transfer->buffer = buf;
+	transfer->length = length;
+	transfer->num_iso_packets = npacket;
+	transfer->user_data = user_data;
+	transfer->callback = callback;
+}
+

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.4 2009/06/12 16:07:06 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.5 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -630,6 +630,9 @@
 	struct LIBUSB20_CONTROL_SETUP_DECODED req;
 	int error;
 
+	/* make sure memory is initialised */
+	memset(ptr, 0, len);
+
 	if (len < 4) {
 		/* invalid length */
 		return (LIBUSB20_ERROR_INVALID_PARAM);
@@ -1093,7 +1096,8 @@
 	if (pbe->methods->exit_backend) {
 		pbe->methods->exit_backend(pbe);
 	}
-	return;
+	/* free backend */
+	free(pbe);
 }
 
 void
@@ -1101,7 +1105,6 @@
 {
 	pdev->beMethods = pbe->methods;	/* copy backend methods */
 	TAILQ_INSERT_TAIL(&(pbe->usb_devs), pdev, dev_entry);
-	return;
 }
 
 void
@@ -1109,5 +1112,4 @@
     struct libusb20_device *pdev)
 {
 	TAILQ_REMOVE(&(pbe->usb_devs), pdev, dev_entry);
-	return;
 }

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20_desc.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.2 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -118,6 +118,9 @@
 	if (lub_config == NULL) {
 		return (NULL);		/* out of memory */
 	}
+	/* make sure memory is initialised */
+	memset(lub_config, 0, size);
+
 	lub_interface = (void *)(lub_config + 1);
 	lub_alt_interface = (void *)(lub_interface + niface_no_alt);
 	lub_endpoint = (void *)(lub_interface + niface);

==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.5 2009/10/22 21:01:41 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.6 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *
@@ -449,6 +449,8 @@
 	uint16_t len;
 	int error;
 
+	/* make sure memory is initialised */
+	memset(&cdesc, 0, sizeof(cdesc));
 	memset(&gen_desc, 0, sizeof(gen_desc));
 
 	gen_desc.ugd_data = &cdesc;
@@ -468,6 +470,10 @@
 	if (!ptr) {
 		return (LIBUSB20_ERROR_NO_MEM);
 	}
+
+	/* make sure memory is initialised */
+	memset(ptr, 0, len);
+
 	gen_desc.ugd_data = ptr;
 	gen_desc.ugd_maxlen = len;
 

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#9 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.46 2009/09/04 18:21:40 mav Exp $
+.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.47 2009/11/09 11:39:51 mav Exp $
 .\"
-.Dd September 4, 2009
+.Dd November 9, 2009
 .Dt CAMCONTROL 8
 .Os
 .Sh NAME
@@ -165,6 +165,20 @@
 .Op Fl w
 .Op Fl y
 .Nm
+.Ic idle
+.Op device id
+.Op generic args
+.Op Fl t Ar time
+.Nm
+.Ic standby
+.Op device id
+.Op generic args
+.Op Fl t Ar time
+.Nm
+.Ic sleep
+.Op device id
+.Op generic args
+.Nm
 .Ic help
 .Sh DESCRIPTION
 The
@@ -821,6 +835,15 @@
 will not be asked about the timeout if a timeout is specified on the
 command line.
 .El
+.It Ic idle
+Put ATA device into IDLE state. Optional parameter specifies automatic
+idle timer value in seconds.
+.It Ic standby
+Put ATA device into STANDBY state. Optional parameter specifies automatic
+standby timer value in seconds.
+.It Ic sleep
+Put ATA device into SLEEP state. Note that the only way get device out of
+this state may be reset.
 .It Ic help
 Print out verbose usage information.
 .El

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#29 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.67 2009/11/04 15:24:32 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.69 2009/11/09 19:47:46 mav Exp $");
 
 #include 
 #include 
@@ -74,7 +74,10 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From mav at FreeBSD.org  Wed Nov 11 12:38:35 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov 11 12:38:42 2009
Subject: PERFORCE change 170478 for review
Message-ID: <200911111238.nABCcXe4056051@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170478

Change 170478 by mav@mav_mavbook on 2009/11/11 12:37:58

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#4 integrate
.. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#4 integrate
.. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#4 integrate
.. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#22 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#43 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#56 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#31 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#125 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#25 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#42 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#54 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#36 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#78 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#19 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#4 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isblank.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.25 2009/09/04 07:44:58 des Exp $
+.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.26 2009/11/11 11:31:02 roam Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISBLANK 3
@@ -50,9 +50,9 @@
 .It "\&``\et''\t`` ''"
 .El
 .Pp
-In the "C" locale
+In the "C" locale, a successful
 .Fn isblank
-successful test is limited to this characters only.
+test is limited to these characters only.
 The value of the argument must be representable as an
 .Vt "unsigned char"
 or the value of

==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#4 (text+ko) ====

@@ -1,22 +1,22 @@
-# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.15 2009/06/09 22:33:34 edwin Exp $
+# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.16 2009/11/11 11:24:02 ume Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
 # Short month names
 #
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1ŒŽ
+ 2ŒŽ
+ 3ŒŽ
+ 4ŒŽ
+ 5ŒŽ
+ 6ŒŽ
+ 7ŒŽ
+ 8ŒŽ
+ 9ŒŽ
+10ŒŽ
+11ŒŽ
+12ŒŽ
 #
 # Long month names (as in a date)
 #

==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#4 (text+ko) ====

@@ -1,21 +1,21 @@
-# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.4 2009/08/30 10:47:00 ume Exp $
+# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.5 2009/11/11 11:24:02 ume Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
 # Short month names
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1月
+ 2月
+ 3月
+ 4月
+ 5月
+ 6月
+ 7月
+ 8月
+ 9月
+10月
+11月
+12月
 #
 # Long month names (as in a date)
 #

==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#4 (text+ko) ====

@@ -1,21 +1,21 @@
-# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.13 2009/06/09 22:33:34 edwin Exp $
+# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.14 2009/11/11 11:24:02 ume Exp $
 #
 # WARNING: spaces may be essential at the end of lines
 # WARNING: empty lines are essential too
 #
 # Short month names
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
-10
-11
-12
+ 1·î
+ 2·î
+ 3·î
+ 4·î
+ 5·î
+ 6·î
+ 7·î
+ 8·î
+ 9·î
+10·î
+11·î
+12·î
 #
 # Long month names (as in a date)
 #

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#22 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.6 2009/11/04 16:16:50 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.7 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#22 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.5 2009/11/04 16:37:13 mav Exp $
+ * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.6 2009/11/11 11:10:36 mav Exp $
  */
 
 #ifndef	CAM_ATA_ALL_H

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#43 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.10 2009/11/04 15:40:19 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.11 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#56 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.12 2009/11/04 15:24:32 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.13 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#14 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.14 2009/11/03 11:19:05 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.15 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 #ifdef _KERNEL

==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#31 (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.39 2009/10/31 10:43:38 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.40 2009/11/11 11:10:36 mav Exp $
  */
 
 #ifndef _CAM_CAM_CCB_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#125 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.233 2009/11/04 15:40:19 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.234 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#15 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.4 2009/11/01 11:31:06 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.5 2009/11/11 11:10:36 mav Exp $
  */
 
 #ifndef _CAM_CAM_XPT_INTERNAL_H

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#25 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.6 2009/11/01 11:31:06 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.7 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#42 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1562 2009/11/10 22:07:37 jhb Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1563 2009/11/11 11:07:30 ru Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -706,6 +706,7 @@
 options 	NETGRAPH_TEE
 options 	NETGRAPH_UI
 options 	NETGRAPH_VJC
+options 	NETGRAPH_VLAN
 
 # NgATM - Netgraph ATM
 options 	NGATM_ATM

==== //depot/projects/scottl-camlock/src/sys/conf/files#54 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1481 2009/11/09 15:59:09 rpaulo Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1482 2009/11/11 11:07:30 ru Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -2399,6 +2399,7 @@
 netgraph/ng_tee.c		optional netgraph_tee
 netgraph/ng_tty.c		optional netgraph_tty
 netgraph/ng_vjc.c		optional netgraph_vjc
+netgraph/ng_vlan.c		optional netgraph_vlan
 netinet/accf_data.c		optional accept_filter_data inet
 netinet/accf_dns.c		optional accept_filter_dns inet
 netinet/accf_http.c		optional accept_filter_http inet

==== //depot/projects/scottl-camlock/src/sys/conf/options#36 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.694 2009/11/08 14:33:19 mav Exp $
+# $FreeBSD: src/sys/conf/options,v 1.695 2009/11/11 11:07:30 ru Exp $
 #
 #        On the handling of kernel options
 #
@@ -498,6 +498,7 @@
 NETGRAPH_TTY		opt_netgraph.h
 NETGRAPH_UI		opt_netgraph.h
 NETGRAPH_VJC		opt_netgraph.h
+NETGRAPH_VLAN		opt_netgraph.h
 
 # NgATM options
 NGATM_ATM		opt_netgraph.h

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#78 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.11 2009/11/03 11:47:07 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.13 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#19 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.9 2009/11/10 09:46:52 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.10 2009/11/11 11:10:36 mav Exp $");
 
 #include 
 #include 
From pgj at FreeBSD.org  Wed Nov 11 16:19:15 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Wed Nov 11 16:19:39 2009
Subject: PERFORCE change 170487 for review
Message-ID: <200911111619.nABGJEKm086517@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170487

Change 170487 by pgj@beehive on 2009/11/11 16:18:36

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#35 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#19 integrate
.. //depot/projects/docproj_hu/doc/share/pgpkeys/roam.key#2 integrate
.. //depot/projects/docproj_hu/www/en/internal/doceng.sgml#2 integrate
.. //depot/projects/docproj_hu/www/en/internal/machines.sgml#4 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#17 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#4 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#73 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#35 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
 
+
 
 
 uid                  Peter Pentchev 
 uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
 sub   1024g/7074473C 2002-02-01
+
+pub   4096R/2527DF13 2009-10-16
+      Key fingerprint = 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+sub   4096R/D0B337AA 2009-10-16
 ]]>
 >> TRUNCATED FOR MAIL (1000 lines) <<<
From pgj at FreeBSD.org  Wed Nov 11 16:33:29 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Wed Nov 11 16:33:35 2009
Subject: PERFORCE change 170488 for review
Message-ID: <200911111633.nABGXTmE087574@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170488

Change 170488 by pgj@beehive on 2009/11/11 16:32:38

	MFen (www):
		1.77       -> 1.78       hu/share/sgml/events.xml
		1.275      -> 1.276      hu/share/sgml/news.xml

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#21 edit
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#60 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#21 (text+ko) ====

@@ -11,7 +11,7 @@
 
 
 
@@ -143,7 +143,7 @@
 
   
     BSDCan 2010
-    http://www.bsdcan.org/
+    http://www.bsdcan.org/2010/
     
       2010
       5

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#60 (text+ko) ====

@@ -5,7 +5,7 @@
 
 
 
@@ -287,6 +287,16 @@
 	    teljesítésében!
    
 	    
       
+
+      
+	3
+
+	
+	  
    Új bugmeisterek:
+	    Gavin Atkinson,
+	    Volker Werth
    
+	    
+          
     
 
     
From rene at FreeBSD.org  Wed Nov 11 18:32:30 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Nov 11 18:32:38 2009
Subject: PERFORCE change 170496 for review
Message-ID: <200911111832.nABIWTWW008609@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170496

Change 170496 by rene@rene_self on 2009/11/11 18:32:20

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#14 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/roam.key#2 integrate
.. //depot/projects/docproj_nl/www/en/internal/doceng.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/internal/machines.sgml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#14 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#55 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
   
@@ -77,10 +77,10 @@
 
     
       
-        &man.chroot.2; (command)
+        &man.chroot.8; (command)
         
-	  A system call of &os;, which changes the root directory of a
-	    process and all its descendants.
+	  Utility, which uses &man.chroot.2; &os; system call to change
+	    the root directory of a process and all its descendants.
 	
       
 

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#14 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 
 uid                  Peter Pentchev 
 uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
 sub   1024g/7074473C 2002-02-01
+
+pub   4096R/2527DF13 2009-10-16
+      Key fingerprint = 2EE7 A7A5 17FC 124C F115  C354 651E EFB0 2527 DF13
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+uid                  Peter Pentchev 
+sub   4096R/D0B337AA 2009-10-16
 ]]>
 >> TRUNCATED FOR MAIL (1000 lines) <<<
From rene at FreeBSD.org  Wed Nov 11 18:44:42 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Wed Nov 11 18:44:48 2009
Subject: PERFORCE change 170498 for review
Message-ID: <200911111844.nABIifE3009503@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170498

Change 170498 by rene@rene_self on 2009/11/11 18:44:20

	MFen handbook/jails 1.18 -> 1.19	

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#15 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#15 (text+ko) ====

@@ -4,7 +4,7 @@
     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.4 2009/06/10 06:34:09 rene Exp $
 
     %SOURCE%	en_US.ISO8859-1/books/handbook/jails/chapter.sgml
-    %SRCID%	1.18
+    %SRCID%	1.19
 -->
 
   
@@ -89,10 +89,11 @@
 
     
       
-	&man.chroot.2; (commando)
+	&man.chroot.8; (commando)
 	
-	  Een systeem aanroep van &os;, welke de root
-	    directory van een proces en al zijn kinderen wijzigt.
+	  Hulpmiddel dat de systeemaanroep &man.chroot.2; van &os;
+	    gebruikt om de rootmap van een proces en alle afstammelingen te
+	    veranderen.
 	
       
 
From mav at FreeBSD.org  Wed Nov 11 19:45:44 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov 11 19:45:49 2009
Subject: PERFORCE change 170503 for review
Message-ID: <200911111945.nABJjhEc014970@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170503

Change 170503 by mav@mav_mavbook on 2009/11/11 19:45:37

	Remove unused variable qfrozen_cnt.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#42 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#42 (text+ko) ====

@@ -985,7 +985,6 @@
 	int		sense;
 	struct scsi_start_stop_unit *scsi_cmd;
 	u_int32_t	relsim_flags, timeout;
-	u_int32_t	qfrozen_cnt;
 	int		xpt_done_ccb;
 
 	xpt_done_ccb = FALSE;
@@ -1002,11 +1001,11 @@
 	 * Unfreeze the queue once if it is already frozen..
 	 */
 	if (frozen != 0) {
-		qfrozen_cnt = cam_release_devq(done_ccb->ccb_h.path,
-					      /*relsim_flags*/0,
-					      /*openings*/0,
-					      /*timeout*/0,
-					      /*getcount_only*/0);
+		cam_release_devq(done_ccb->ccb_h.path,
+				 /*relsim_flags*/0,
+				 /*openings*/0,
+				 /*timeout*/0,
+				 /*getcount_only*/0);
 	}
 
 	switch (status) {
@@ -1186,11 +1185,11 @@
 	if (done_ccb->ccb_h.retry_count > 0)
 		done_ccb->ccb_h.retry_count--;
 
-	qfrozen_cnt = cam_release_devq(done_ccb->ccb_h.path,
-				      /*relsim_flags*/relsim_flags,
-				      /*openings*/0,
-				      /*timeout*/timeout,
-				      /*getcount_only*/0);
+	cam_release_devq(done_ccb->ccb_h.path,
+			 /*relsim_flags*/relsim_flags,
+			 /*openings*/0,
+			 /*timeout*/timeout,
+			 /*getcount_only*/0);
 	if (xpt_done_ccb == TRUE)
 		(*done_ccb->ccb_h.cbfcnp)(periph, done_ccb);
 }
From mav at FreeBSD.org  Wed Nov 11 19:59:58 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Wed Nov 11 20:00:04 2009
Subject: PERFORCE change 170504 for review
Message-ID: <200911111959.nABJxvMV015881@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170504

Change 170504 by mav@mav_mavbook on 2009/11/11 19:59:13

	Unify code a bit.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#126 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#126 (text+ko) ====

@@ -3273,16 +3273,13 @@
 
 	devq->send_queue.qfrozen_cnt++;
 	while ((devq->send_queue.entries > 0)
-	    && (devq->send_openings > 0)) {
+	    && (devq->send_openings > 0)
+	    && (devq->send_queue.qfrozen_cnt <= 1)) {
 		struct	cam_ed_qinfo *qinfo;
 		struct	cam_ed *device;
 		union ccb *work_ccb;
 		struct	cam_sim *sim;
 
-	    	if (devq->send_queue.qfrozen_cnt > 1) {
-			break;
-		}
-
 		qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->send_queue,
 							   CAMQ_HEAD);
 		device = qinfo->device;
From hselasky at FreeBSD.org  Wed Nov 11 20:05:04 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Wed Nov 11 20:05:15 2009
Subject: PERFORCE change 170505 for review
Message-ID: <200911112005.nABK535M017263@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170505

Change 170505 by hselasky@hselasky_laptop001 on 2009/11/11 20:04:37

	
	IFC @ 170502

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb.h#11 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10.c#15 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#11 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#11 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20.c#9 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_desc.c#5 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#11 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#7 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#18 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#25 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#33 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/trap.c#19 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/usb/src/sys/arm/arm/db_trace.c#4 integrate
.. //depot/projects/usb/src/sys/arm/arm/gdb_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/arm/arm/machdep.c#11 integrate
.. //depot/projects/usb/src/sys/arm/arm/trap.c#9 integrate
.. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#12 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#5 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#9 integrate
.. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#5 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_all.c#4 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_all.h#3 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#7 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#6 integrate
.. //depot/projects/usb/src/sys/cam/cam.c#5 integrate
.. //depot/projects/usb/src/sys/cam/cam.h#5 integrate
.. //depot/projects/usb/src/sys/cam/cam_ccb.h#9 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.c#14 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.h#6 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#25 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt_internal.h#4 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#17 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_xpt.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#10 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_ipc.c#6 integrate
.. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#15 integrate
.. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#9 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#5 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#18 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#13 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_pe.c#4 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#18 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#49 integrate
.. //depot/projects/usb/src/sys/conf/files#85 integrate
.. //depot/projects/usb/src/sys/conf/files.ia64#14 integrate
.. //depot/projects/usb/src/sys/conf/options#42 integrate
.. //depot/projects/usb/src/sys/contrib/altq/altq/altq_hfsc.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#24 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#14 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#7 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#10 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#13 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.h#4 integrate
.. //depot/projects/usb/src/sys/dev/an/if_an.c#8 integrate
.. //depot/projects/usb/src/sys/dev/an/if_an_isa.c#3 integrate
.. //depot/projects/usb/src/sys/dev/an/if_an_pccard.c#3 integrate
.. //depot/projects/usb/src/sys/dev/an/if_an_pci.c#4 integrate
.. //depot/projects/usb/src/sys/dev/an/if_anreg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#11 integrate
.. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.h#5 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.h#16 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#17 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#23 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#16 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#13 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#33 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bge.c#23 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#12 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#24 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#15 integrate
.. //depot/projects/usb/src/sys/dev/fb/vesa.c#5 integrate
.. //depot/projects/usb/src/sys/dev/fb/vgareg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/fdc/fdc.c#11 integrate
.. //depot/projects/usb/src/sys/dev/hatm/if_hatm.c#3 integrate
.. //depot/projects/usb/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ieee488/ibfoo.c#3 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#34 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#22 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#14 integrate
.. //depot/projects/usb/src/sys/dev/mii/brgphy.c#11 integrate
.. //depot/projects/usb/src/sys/dev/mii/miidevs#15 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_msk.c#17 integrate
.. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#12 integrate
.. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#12 integrate
.. //depot/projects/usb/src/sys/dev/patm/if_patm_attach.c#3 integrate
.. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/re/if_re.c#23 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.c#6 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/usb/src/sys/dev/sk/if_sk.c#11 integrate
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#59 integrate
.. //depot/projects/usb/src/sys/dev/stge/if_stge.c#9 integrate
.. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#9 integrate
.. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#10 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#18 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.h#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#44 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#12 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/atp.c#1 branch
.. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#37 integrate
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#25 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#38 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#53 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#25 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_core.h#31 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#173 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi.h#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#11 integrate
.. //depot/projects/usb/src/sys/dev/vge/if_vge.c#11 integrate
.. //depot/projects/usb/src/sys/dev/vge/if_vgevar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#15 integrate
.. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#16 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#12 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#15 integrate
.. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vnops.c#11 integrate
.. //depot/projects/usb/src/sys/i386/i386/identcpu.c#16 integrate
.. //depot/projects/usb/src/sys/i386/i386/initcpu.c#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/pmap.c#29 integrate
.. //depot/projects/usb/src/sys/i386/i386/trap.c#16 integrate
.. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#15 integrate
.. //depot/projects/usb/src/sys/i386/isa/isa_dma.c#2 integrate
.. //depot/projects/usb/src/sys/i386/xen/pmap.c#16 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/highfp.c#1 branch
.. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#10 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#14 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/trap.c#8 integrate
.. //depot/projects/usb/src/sys/ia64/ia64/vm_machdep.c#5 integrate
.. //depot/projects/usb/src/sys/ia64/include/md_var.h#6 integrate
.. //depot/projects/usb/src/sys/ia64/include/proc.h#2 integrate
.. //depot/projects/usb/src/sys/isa/vga_isa.c#3 integrate
.. //depot/projects/usb/src/sys/kern/kern_idle.c#6 integrate
.. //depot/projects/usb/src/sys/kern/kern_intr.c#17 integrate
.. //depot/projects/usb/src/sys/kern/kern_lock.c#21 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#20 integrate
.. //depot/projects/usb/src/sys/kern/sched_4bsd.c#12 integrate
.. //depot/projects/usb/src/sys/kern/sched_ule.c#20 integrate
.. //depot/projects/usb/src/sys/kern/subr_log.c#3 integrate
.. //depot/projects/usb/src/sys/kern/subr_prf.c#10 integrate
.. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#22 integrate
.. //depot/projects/usb/src/sys/kern/vfs_acl.c#8 integrate
.. //depot/projects/usb/src/sys/kern/vfs_default.c#16 integrate
.. //depot/projects/usb/src/sys/kern/vfs_lookup.c#21 integrate
.. //depot/projects/usb/src/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/usb/src/sys/kern/vfs_vnops.c#24 integrate
.. //depot/projects/usb/src/sys/mips/include/pcb.h#2 integrate
.. //depot/projects/usb/src/sys/mips/mips/machdep.c#8 integrate
.. //depot/projects/usb/src/sys/mips/mips/pmap.c#14 integrate
.. //depot/projects/usb/src/sys/mips/mips/trap.c#4 integrate
.. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/modules/ichwd/Makefile#2 integrate
.. //depot/projects/usb/src/sys/modules/usb/Makefile#24 integrate
.. //depot/projects/usb/src/sys/modules/usb/atp/Makefile#1 branch
.. //depot/projects/usb/src/sys/net/if_ef.c#13 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#30 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_action.c#4 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#17 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#21 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#16 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_fec.c#6 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#19 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_sppp.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#18 integrate
.. //depot/projects/usb/src/sys/netinet/ip_ipsec.h#5 integrate
.. //depot/projects/usb/src/sys/netinet/ip_output.c#30 integrate
.. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate
.. //depot/projects/usb/src/sys/netinet/tcp_output.c#21 integrate
.. //depot/projects/usb/src/sys/netinet6/nd6.c#27 integrate
.. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#5 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#7 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#7 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/trap.c#5 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/vm_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/trap.c#4 integrate
.. //depot/projects/usb/src/sys/powerpc/booke/vm_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#12 integrate
.. //depot/projects/usb/src/sys/rpc/clnt_vc.c#9 integrate
.. //depot/projects/usb/src/sys/sparc64/include/pcb.h#3 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#10 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/vm_machdep.c#7 integrate
.. //depot/projects/usb/src/sys/sun4v/sun4v/trap.c#7 integrate
.. //depot/projects/usb/src/sys/sun4v/sun4v/vm_machdep.c#4 integrate
.. //depot/projects/usb/src/sys/sys/ata.h#8 integrate
.. //depot/projects/usb/src/sys/sys/fbio.h#2 integrate
.. //depot/projects/usb/src/sys/sys/mman.h#4 integrate
.. //depot/projects/usb/src/sys/sys/msgbuf.h#3 integrate
.. //depot/projects/usb/src/sys/sys/proc.h#23 integrate
.. //depot/projects/usb/src/sys/sys/signalvar.h#7 integrate
.. //depot/projects/usb/src/sys/teken/teken.c#4 integrate
.. //depot/projects/usb/src/sys/teken/teken.h#4 integrate
.. //depot/projects/usb/src/sys/teken/teken_subr.h#4 integrate
.. //depot/projects/usb/src/sys/vm/swap_pager.c#18 integrate
.. //depot/projects/usb/src/sys/vm/vm_fault.c#19 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#22 integrate
.. //depot/projects/usb/src/sys/vm/vm_zeroidle.c#10 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#16 integrate
.. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#7 integrate

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb.h#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb.h,v 1.9 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb.h,v 1.10 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb/libusb10.c#15 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  * Copyright (c) 2009 Hans Petter Selasky. All rights reserved.

==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb/libusb20.c#9 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.4 2009/06/12 16:07:06 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.5 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb/libusb20_desc.c#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.2 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#11 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.5 2009/10/22 21:01:41 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.6 2009/11/08 20:03:52 thompsa Exp $ */
 /*-
  * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
  *

==== //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.27 2009/10/08 17:41:53 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.28 2009/11/04 22:39:18 jkim Exp $");
 
 #include 
 #include 
@@ -65,9 +65,9 @@
 extern int		acpi_reset_video;
 
 #ifdef SMP
-extern struct xpcb	*stopxpcbs;
+extern struct xpcb	**stopxpcbs;
 #else
-static struct xpcb	*stopxpcbs;
+static struct xpcb	**stopxpcbs;
 #endif
 
 int			acpi_restorecpu(struct xpcb *, vm_offset_t);
@@ -104,10 +104,10 @@
 	int		apic_id = cpu_apic_ids[cpu];
 	int		ms;
 
-	WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]);
-	WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit);
+	WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, stopxpcbs[cpu]);
+	WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu]->xpcb_gdt.rd_limit);
 	WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
-	    stopxpcbs[cpu].xpcb_gdt.rd_base);
+	    stopxpcbs[cpu]->xpcb_gdt.rd_base);
 	WAKECODE_FIXUP(wakeup_cpu, int, cpu);
 
 	/* do an INIT IPI: assert RESET */
@@ -245,8 +245,8 @@
 	cr3 = rcr3();
 	load_cr3(KPML4phys);
 
-	stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save;
-	if (acpi_savecpu(&stopxpcbs[0])) {
+	stopfpu = &stopxpcbs[0]->xpcb_pcb.pcb_save;
+	if (acpi_savecpu(stopxpcbs[0])) {
 		fpugetregs(curthread, stopfpu);
 
 #ifdef SMP
@@ -261,11 +261,11 @@
 		WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0));
 		WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0));
 
-		WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]);
+		WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, stopxpcbs[0]);
 		WAKECODE_FIXUP(wakeup_gdt, uint16_t,
-		    stopxpcbs[0].xpcb_gdt.rd_limit);
+		    stopxpcbs[0]->xpcb_gdt.rd_limit);
 		WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t,
-		    stopxpcbs[0].xpcb_gdt.rd_base);
+		    stopxpcbs[0]->xpcb_gdt.rd_base);
 		WAKECODE_FIXUP(wakeup_cpu, int, 0);
 
 		/* Call ACPICA to enter the desired sleep state */
@@ -320,6 +320,7 @@
 acpi_alloc_wakeup_handler(void)
 {
 	void		*wakeaddr;
+	int		i;
 
 	/*
 	 * Specify the region for our wakeup code.  We want it in the low 1 MB
@@ -334,12 +335,9 @@
 		printf("%s: can't alloc wake memory\n", __func__);
 		return (NULL);
 	}
-	stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT);
-	if (stopxpcbs == NULL) {
-		contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF);
-		printf("%s: can't alloc CPU state memory\n", __func__);
-		return (NULL);
-	}
+	stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_WAITOK);
+	for (i = 0; i < mp_ncpus; i++)
+		stopxpcbs[i] = malloc(sizeof(**stopxpcbs), M_DEVBUF, M_WAITOK);
 
 	return (wakeaddr);
 }

==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#18 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.177 2009/11/05 14:34:38 attilio Exp $");
 
 #include "opt_cpu.h"
 
@@ -607,6 +607,21 @@
 		printf(", %d lines/tag", (regs[2] >> 8) & 0x0f);
 		print_AMD_l2_assoc((regs[2] >> 12) & 0x0f);	
 	}
+
+	/*
+	 * Opteron Rev E shows a bug as in very rare occasions a read memory 
+	 * barrier is not performed as expected if it is followed by a 
+	 * non-atomic read-modify-write instruction.  
+	 * As long as that bug pops up very rarely (intensive machine usage
+	 * on other operating systems generally generates one unexplainable 
+	 * crash any 2 months) and as long as a model specific fix would be
+	 * impratical at this stage, print out a warning string if the broken
+	 * model and family are identified.
+	 */
+	if (CPUID_TO_FAMILY(cpu_id) == 0xf && CPUID_TO_MODEL(cpu_id) >= 0x20 &&
+	    CPUID_TO_MODEL(cpu_id) <= 0x3f)
+		printf("WARNING: This architecture revision has known SMP "
+		    "hardware bugs which may cause random instability\n");
 }
 
 static void

==== //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#9 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.56 2009/10/01 12:52:48 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.57 2009/11/09 02:54:16 kuriyama Exp $");
 
 #include "opt_cpu.h"
 
@@ -47,6 +47,13 @@
 static int	hw_instruction_sse;
 SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD,
     &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU");
+/*
+ * -1: automatic (default)
+ *  0: keep enable CLFLUSH
+ *  1: force disable CLFLUSH
+ */
+static int	hw_clflush_disable = -1;
+TUNABLE_INT("hw.clflush_disable", &hw_clflush_disable);
 
 int	cpu;			/* Are we 386, 386sx, 486, etc? */
 u_int	cpu_feature;		/* Feature flags */
@@ -169,6 +176,16 @@
 	 * XXXKIB: (temporary) hack to work around traps generated when
 	 * CLFLUSHing APIC registers window.
 	 */
-	if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS))
+	TUNABLE_INT_FETCH("hw.clflush_disable", &hw_clflush_disable);
+	if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS) &&
+	    hw_clflush_disable == -1)
+		cpu_feature &= ~CPUID_CLFSH;
+	/*
+	 * Allow to disable CLFLUSH feature manually by
+	 * hw.clflush_disable tunable.  This may help Xen guest on some AMD
+	 * CPUs.
+	 */
+	if (hw_clflush_disable == 1) {
 		cpu_feature &= ~CPUID_CLFSH;
+	}
 }

==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#25 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.310 2009/08/13 17:09:45 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.311 2009/11/04 22:39:18 jkim Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -105,7 +105,7 @@
 extern pt_entry_t *SMPpt;
 
 struct pcb stoppcbs[MAXCPU];
-struct xpcb *stopxpcbs = NULL;
+struct xpcb **stopxpcbs = NULL;
 
 /* Variables needed for SMP tlb shootdown. */
 vm_offset_t smp_tlb_addr1;
@@ -1256,8 +1256,8 @@
 
 	rf = intr_disable();
 	cr3 = rcr3();
-	stopfpu = &stopxpcbs[cpu].xpcb_pcb.pcb_save;
-	if (savectx2(&stopxpcbs[cpu])) {
+	stopfpu = &stopxpcbs[cpu]->xpcb_pcb.pcb_save;
+	if (savectx2(stopxpcbs[cpu])) {
 		fpugetregs(curthread, stopfpu);
 		wbinvd();
 		atomic_set_int(&stopped_cpus, cpumask);

==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#33 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.675 2009/10/21 18:38:02 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.676 2009/11/11 14:21:31 avg Exp $");
 
 /*
  *	Manages physical address maps.
@@ -183,7 +183,7 @@
 SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
 static int pg_ps_enabled = 1;
-SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0,
+SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
     "Are large page mappings enabled?");
 
 static u_int64_t	KPTphys;	/* phys addr of kernel level 1 */

==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#19 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.336 2009/09/24 14:26:42 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.337 2009/11/10 11:43:07 kib Exp $");
 
 /*
  * AMD64 Trap and System call handling
@@ -1007,39 +1007,7 @@
 #endif
 	}
 
-	switch (error) {
-	case 0:
-		frame->tf_rax = td->td_retval[0];
-		frame->tf_rdx = td->td_retval[1];
-		frame->tf_rflags &= ~PSL_C;
-		break;
-
-	case ERESTART:
-		/*
-		 * Reconstruct pc, we know that 'syscall' is 2 bytes.
-		 * We have to do a full context restore so that %r10
-		 * (which was holding the value of %rcx) is restored for
-		 * the next iteration.
-		 */
-		frame->tf_rip -= frame->tf_err;
-		frame->tf_r10 = frame->tf_rcx;
-		td->td_pcb->pcb_flags |= PCB_FULLCTX;
-		break;
-
-	case EJUSTRETURN:
-		break;
-
-	default:
- 		if (p->p_sysent->sv_errsize) {
- 			if (error >= p->p_sysent->sv_errsize)
-  				error = -1;	/* XXX */
-   			else
-  				error = p->p_sysent->sv_errtbl[error];
-		}
-		frame->tf_rax = error;
-		frame->tf_rflags |= PSL_C;
-		break;
-	}
+	cpu_set_syscall_retval(td, error);
 
 	/*
 	 * Traced syscall.

==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#14 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.264 2009/07/09 09:34:11 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.265 2009/11/10 11:43:07 kib Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
@@ -317,6 +317,45 @@
 	cpu_thread_clean(td);
 }
 
+void
+cpu_set_syscall_retval(struct thread *td, int error)
+{
+
+	switch (error) {
+	case 0:
+		td->td_frame->tf_rax = td->td_retval[0];
+		td->td_frame->tf_rdx = td->td_retval[1];
+		td->td_frame->tf_rflags &= ~PSL_C;
+		break;
+
+	case ERESTART:
+		/*
+		 * Reconstruct pc, we know that 'syscall' is 2 bytes.
+		 * We have to do a full context restore so that %r10
+		 * (which was holding the value of %rcx) is restored
+		 * for the next iteration.
+		 */
+		td->td_frame->tf_rip -= td->td_frame->tf_err;
+		td->td_frame->tf_r10 = td->td_frame->tf_rcx;
+		td->td_pcb->pcb_flags |= PCB_FULLCTX;
+		break;
+
+	case EJUSTRETURN:
+		break;
+
+	default:
+		if (td->td_proc->p_sysent->sv_errsize) {
+			if (error >= td->td_proc->p_sysent->sv_errsize)
+				error = -1;	/* XXX */
+			else
+				error = td->td_proc->p_sysent->sv_errtbl[error];
+		}
+		td->td_frame->tf_rax = error;
+		td->td_frame->tf_rflags |= PSL_C;
+		break;
+	}
+}
+
 /*
  * Initialize machine state (pcb and trap frame) for a new thread about to
  * upcall. Put enough state in the new thread's PCB to get it to go back 

==== //depot/projects/usb/src/sys/amd64/isa/isa_dma.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.22 2005/05/14 10:14:56 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.23 2009/11/09 20:29:10 rdivacky Exp $");
 
 /*
  * code to manage AT bus
@@ -71,6 +71,8 @@
 static u_int8_t	dma_busy = 0;		/* Used in isa_dmastart() */
 static u_int8_t	dma_inuse = 0;		/* User for acquire/release */
 static u_int8_t dma_auto_mode = 0;
+static struct mtx isa_dma_lock;
+MTX_SYSINIT(isa_dma_lock, &isa_dma_lock, "isa DMA lock", MTX_DEF);
 
 #define VALID_DMA_MASK (7)
 
@@ -84,39 +86,56 @@
 isa_dma_init(int chan, u_int bouncebufsize, int flag)
 {
 	void *buf;
-
-	/*
-	 * If a DMA channel is shared, both drivers have to call isa_dma_init
-	 * since they don't know that the other driver will do it.
-	 * Just return if we're already set up good.
-	 * XXX: this only works if they agree on the bouncebuf size.  This
-	 * XXX: is typically the case since they are multiple instances of
-	 * XXX: the same driver.
-	 */
-	if (dma_bouncebuf[chan] != NULL)
-		return (0);
+	int contig;
 
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dma_init: channel out of range");
 #endif
 
-	dma_bouncebufsize[chan] = bouncebufsize;
 
 	/* Try malloc() first.  It works better if it works. */
 	buf = malloc(bouncebufsize, M_DEVBUF, flag);
 	if (buf != NULL) {
-		if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) {
-			dma_bouncebuf[chan] = buf;
-			return (0);
+		if (isa_dmarangecheck(buf, bouncebufsize, chan) != 0) {
+			free(buf, M_DEVBUF);
+			buf = NULL;
 		}
-		free(buf, M_DEVBUF);
+		contig = 0;
 	}
-	buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful,
+
+	if (buf == NULL) {
+		buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful,
 			   1ul, chan & 4 ? 0x20000ul : 0x10000ul);
+		contig = 1;
+	}
+
 	if (buf == NULL)
 		return (ENOMEM);
+
+	mtx_lock(&isa_dma_lock);
+	/*
+	 * If a DMA channel is shared, both drivers have to call isa_dma_init
+	 * since they don't know that the other driver will do it.
+	 * Just return if we're already set up good.
+	 * XXX: this only works if they agree on the bouncebuf size.  This
+	 * XXX: is typically the case since they are multiple instances of
+	 * XXX: the same driver.
+	 */
+	if (dma_bouncebuf[chan] != NULL) {
+		if (contig)
+			contigfree(buf, bouncebufsize, M_DEVBUF);
+		else
+			free(buf, M_DEVBUF);
+		mtx_unlock(&isa_dma_lock);
+		return (0);
+	}
+
+	dma_bouncebufsize[chan] = bouncebufsize;
 	dma_bouncebuf[chan] = buf;
+
+	mtx_unlock(&isa_dma_lock);
+
 	return (0);
 }
 
@@ -133,12 +152,15 @@
 		panic("isa_dma_acquire: channel out of range");
 #endif
 
+	mtx_lock(&isa_dma_lock);
 	if (dma_inuse & (1 << chan)) {
 		printf("isa_dma_acquire: channel %d already in use\n", chan);
+		mtx_unlock(&isa_dma_lock);
 		return (EBUSY);
 	}
 	dma_inuse |= (1 << chan);
 	dma_auto_mode &= ~(1 << chan);
+	mtx_unlock(&isa_dma_lock);
 
 	return (0);
 }
@@ -155,8 +177,11 @@
 	if (chan & ~VALID_DMA_MASK)
 		panic("isa_dma_release: channel out of range");
 
+	mtx_lock(&isa_dma_lock);
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dma_release: channel %d not in use\n", chan);
+#else
+	mtx_lock(&isa_dma_lock);
 #endif
 
 	if (dma_busy & (1 << chan)) {
@@ -171,6 +196,8 @@
 
 	dma_inuse &= ~(1 << chan);
 	dma_auto_mode &= ~(1 << chan);
+
+	mtx_unlock(&isa_dma_lock);
 }
 
 /*
@@ -186,6 +213,7 @@
 		panic("isa_dmacascade: channel out of range");
 #endif
 
+	mtx_lock(&isa_dma_lock);
 	/* set dma channel mode, and set dma channel mode */
 	if ((chan & 4) == 0) {
 		outb(DMA1_MODE, DMA37MD_CASCADE | chan);
@@ -194,6 +222,7 @@
 		outb(DMA2_MODE, DMA37MD_CASCADE | (chan & 3));
 		outb(DMA2_SMSK, chan & 3);
 	}
+	mtx_unlock(&isa_dma_lock);
 }
 
 /*
@@ -206,8 +235,11 @@
 	vm_paddr_t phys;
 	int waport;
 	caddr_t newaddr;
+	int dma_range_checked;
 
-	GIANT_REQUIRED;
+	/* translate to physical */
+	phys = pmap_extract(kernel_pmap, (vm_offset_t)addr);
+	dma_range_checked = isa_dmarangecheck(addr, nbytes, chan);
 
 #ifdef DIAGNOSTIC
 	if (chan & ~VALID_DMA_MASK)
@@ -217,8 +249,11 @@
 	    || (chan >= 4 && (nbytes > (1<<17) || (uintptr_t)addr & 1)))
 		panic("isa_dmastart: impossible request");
 
+	mtx_lock(&isa_dma_lock);
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dmastart: channel %d not acquired\n", chan);
+#else
+	mtx_lock(&isa_dma_lock);
 #endif
 
 #if 0
@@ -233,7 +268,7 @@
 
 	dma_busy |= (1 << chan);
 
-	if (isa_dmarangecheck(addr, nbytes, chan)) {
+	if (dma_range_checked) {
 		if (dma_bouncebuf[chan] == NULL
 		    || dma_bouncebufsize[chan] < nbytes)
 			panic("isa_dmastart: bad bounce buffer"); 
@@ -246,9 +281,6 @@
 		addr = newaddr;
 	}
 
-	/* translate to physical */
-	phys = pmap_extract(kernel_pmap, (vm_offset_t)addr);
-
 	if (flags & ISADMA_RAW) {
 	    dma_auto_mode |= (1 << chan);
 	} else { 
@@ -323,6 +355,7 @@
 		/* unmask channel */
 		outb(DMA2_SMSK, chan & 3);
 	}
+	mtx_unlock(&isa_dma_lock);
 }
 
 void
@@ -336,6 +369,7 @@
 		printf("isa_dmadone: channel %d not acquired\n", chan);
 #endif
 
+	mtx_lock(&isa_dma_lock);
 	if (((dma_busy & (1 << chan)) == 0) && 
 	    (dma_auto_mode & (1 << chan)) == 0 )
 		printf("isa_dmadone: channel %d not busy\n", chan);
@@ -351,6 +385,7 @@
 		dma_bounced &= ~(1 << chan);
 	}
 	dma_busy &= ~(1 << chan);
+	mtx_unlock(&isa_dma_lock);
 }
 
 /*
@@ -367,8 +402,6 @@
 	vm_offset_t endva;
 	u_int dma_pgmsk = (chan & 4) ?  ~(128*1024-1) : ~(64*1024-1);
 
-	GIANT_REQUIRED;
-
 	endva = (vm_offset_t)round_page((vm_offset_t)va + length);
 	for (; va < (caddr_t) endva ; va += PAGE_SIZE) {
 		phys = trunc_page(pmap_extract(kernel_pmap, (vm_offset_t)va));
@@ -420,13 +453,15 @@
  * or -1 if the channel requested is not active.
  *
  */
-int
-isa_dmastatus(int chan)
+static int
+isa_dmastatus_locked(int chan)
 {
 	u_long	cnt = 0;
 	int	ffport, waport;
 	u_long	low1, high1, low2, high2;
 
+	mtx_assert(&isa_dma_lock, MA_OWNED);
+
 	/* channel active? */
 	if ((dma_inuse & (1 << chan)) == 0) {
 		printf("isa_dmastatus: channel %d not active\n", chan);
@@ -472,6 +507,18 @@
 	return(cnt);
 }
 
+int
+isa_dmastatus(int chan)
+{
+	int status;
+
+	mtx_lock(&isa_dma_lock);
+	status = isa_dmastatus_locked(chan);
+	mtx_unlock(&isa_dma_lock);
+
+	return (status);
+}
+
 /*
  * Reached terminal count yet ?
  */
@@ -491,12 +538,16 @@
 int
 isa_dmastop(int chan) 
 {
+	int status;
+
+	mtx_lock(&isa_dma_lock);
 	if ((dma_inuse & (1 << chan)) == 0)
 		printf("isa_dmastop: channel %d not acquired\n", chan);  
 
 	if (((dma_busy & (1 << chan)) == 0) &&
 	    ((dma_auto_mode & (1 << chan)) == 0)) {
 		printf("chan %d not busy\n", chan);
+		mtx_unlock(&isa_dma_lock);
 		return -2 ;
 	}
     
@@ -505,7 +556,12 @@
 	} else {
 		outb(DMA2_SMSK, (chan & 3) | 4 /* disable mask */);
 	}
-	return(isa_dmastatus(chan));
+
+	status = isa_dmastatus_locked(chan);
+
+	mtx_unlock(&isa_dma_lock);
+
+	return (status);
 }
 
 /*

==== //depot/projects/usb/src/sys/arm/arm/db_trace.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.14 2007/12/02 20:40:31 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.16 2009/11/05 06:27:46 marcel Exp $");
 #include 
 #include 
 
@@ -194,18 +194,18 @@
 int
 db_trace_thread(struct thread *thr, int count)
 {
-	uint32_t addr;
+	struct pcb *ctx;
 
-	if (thr == curthread)
-		addr = (uint32_t)__builtin_frame_address(0);
-	else
-		addr = thr->td_pcb->un_32.pcb32_r11;
-	db_stack_trace_cmd(addr, -1);
+	ctx = kdb_thr_ctx(thr);
+	db_stack_trace_cmd(ctx->un_32.pcb32_r11, -1);
 	return (0);
 }
 
 void
 db_trace_self(void)
 {
-	db_trace_thread(curthread, -1);
+	db_addr_t addr;
+
+	addr = (db_addr_t)__builtin_frame_address(1);
+	db_stack_trace_cmd(addr, -1);
 }

==== //depot/projects/usb/src/sys/arm/arm/gdb_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/gdb_machdep.c,v 1.1 2006/07/14 00:50:51 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/gdb_machdep.c,v 1.2 2009/11/05 06:31:50 marcel Exp $");
 
 
 #include 
@@ -53,12 +53,15 @@
 
 	*regsz = gdb_cpu_regsz(regnum);
 
-	if (kdb_thread  == curthread) {
-		if (regnum < 16)
-			return (&kdb_frame->tf_r0 + 4 * regnum);
+	if (kdb_thread == curthread) {
+		if (regnum < 15)
+			return (&kdb_frame->tf_r0 + regnum);
+		if (regnum == 15)
+			return (&kdb_frame->tf_pc);
 		if (regnum == 25)
 			return (&kdb_frame->tf_spsr);
 	}
+
 	switch (regnum) {
 	case 8:  return (&kdb_thrctx->un_32.pcb32_r8);
 	case 9:  return (&kdb_thrctx->un_32.pcb32_r9);
@@ -78,6 +81,7 @@
 			  return (&kdb_thrctx->un_32.pcb32_pc);
 		  }
 	}
+
 	return (NULL);
 }
 

==== //depot/projects/usb/src/sys/arm/arm/machdep.c#11 (text+ko) ====

@@ -46,7 +46,7 @@
 #include "opt_ddb.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.34 2009/10/27 10:47:58 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.35 2009/11/04 04:41:03 alc Exp $");
 
 #include 

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From hselasky at FreeBSD.org  Thu Nov 12 08:12:14 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Thu Nov 12 08:12:20 2009
Subject: PERFORCE change 170529 for review
Message-ID: <200911120812.nAC8CDDa013219@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170529

Change 170529 by hselasky@hselasky_laptop001 on 2009/11/12 08:11:42

	
	USB audio:
		 - fix initialization order

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#60 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#60 (text+ko) ====

@@ -1318,6 +1318,11 @@
 	ch->pcm_cap.minspeed = ch->sample_rate;
 	ch->pcm_cap.maxspeed = ch->sample_rate;
 
+	/* setup mutex and PCM channel */
+
+	ch->pcm_ch = c;
+	ch->pcm_mtx = c->lock;
+
 	if (ch->p_asf1d->bNrChannels >= 2)
 		ch->pcm_cap.fmtlist[0] =
 		    SND_FORMAT(ch->p_fmt->freebsd_fmt, 2, 0);
@@ -1391,8 +1396,6 @@
 	ch->start = ch->buf;
 	ch->end = ch->buf + buf_size;
 	ch->cur = ch->buf;
-	ch->pcm_ch = c;
-	ch->pcm_mtx = c->lock;
 	ch->pcm_buf = b;
 
 	if (ch->pcm_mtx == NULL) {
From rwatson at FreeBSD.org  Thu Nov 12 11:18:20 2009
From: rwatson at FreeBSD.org (Robert Watson)
Date: Thu Nov 12 11:18:32 2009
Subject: PERFORCE change 170532 for review
Message-ID: <200911121118.nACBIJia040345@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170532

Change 170532 by rwatson@rwatson_vimage_client on 2009/11/12 11:17:20

	Use preferred format string for amd64.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#6 (text+ko) ====

@@ -87,7 +87,7 @@
 	    &fd_recv, &fdcount) < 0)
 		err(-1, "lch_rpc_rights");
 	if (len != sizeof(ch))
-		errx(-1, "lch_rpc_rights: len %d", len);
+		errx(-1, "lch_rpc_rights: len %zd", len);
 	if (ch != 'X')
 		errx(-1, "lch_rpc_rights: ch %d", ch);
 	if (fdcount == 1)
From rwatson at FreeBSD.org  Thu Nov 12 11:18:21 2009
From: rwatson at FreeBSD.org (Robert Watson)
Date: Thu Nov 12 11:18:32 2009
Subject: PERFORCE change 170533 for review
Message-ID: <200911121118.nACBIJH4040350@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170533

Change 170533 by rwatson@rwatson_vimage_client on 2009/11/12 11:17:50

	Allow stderr to print from sandboxes.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#10 (text+ko) ====

@@ -60,7 +60,8 @@
 	if (argc != 1)
 		errx(-1, "usage: sandbox_echo");
 
-	if (lch_start(MYNAME, sandbox_argv, LCH_PERMIT_STDERR, &lcsp) < 0)
+	if (lch_start(MYNAME, sandbox_argv,
+	    LCH_PERMIT_STDOUT | LCH_PERMIT_STDERR, &lcsp) < 0)
 		err(-1, "lch_start %s", argv[1]);
 
 	for (i = 0; i < 10; i++) {
From rwatson at FreeBSD.org  Thu Nov 12 11:54:58 2009
From: rwatson at FreeBSD.org (Robert Watson)
Date: Thu Nov 12 11:55:04 2009
Subject: PERFORCE change 170537 for review
Message-ID: <200911121154.nACBsvDK042973@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170537

Change 170537 by rwatson@rwatson_vimage_client on 2009/11/12 11:54:45

	Integrate capabilities rtld from 9-current to pick up relocation
	fixes.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#30 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#30 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.139 2009/07/17 19:45:42 kib Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.140 2009/10/10 15:27:10 kib Exp $
  */
 
 /*
@@ -556,6 +556,7 @@
     /* Initialize a fake symbol for resolving undefined weak references. */
     sym_zero.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE);
     sym_zero.st_shndx = SHN_UNDEF;
+    sym_zero.st_value = -(uintptr_t)obj_main->relocbase;
 
 #ifdef IN_RTLD_CAP
     if (ld_libcache != NULL)
@@ -1115,26 +1116,26 @@
 
     obj = obj_new();
     for (ph = phdr;  ph < phlimit;  ph++) {
+	if (ph->p_type != PT_PHDR)
+	    continue;
+
+	obj->phdr = phdr;
+	obj->phsize = ph->p_memsz;
+	obj->relocbase = (caddr_t)phdr - ph->p_vaddr;
+	break;
+    }
+
+    for (ph = phdr;  ph < phlimit;  ph++) {
 	switch (ph->p_type) {
 
-	case PT_PHDR:
-	    if ((const Elf_Phdr *)ph->p_vaddr != phdr) {
-		_rtld_error("%s: invalid PT_PHDR", path);
-		return NULL;
-	    }
-	    obj->phdr = (const Elf_Phdr *) ph->p_vaddr;
-	    obj->phsize = ph->p_memsz;
-	    break;
-
 	case PT_INTERP:
-	    obj->interp = (const char *) ph->p_vaddr;
+	    obj->interp = (const char *)(ph->p_vaddr + obj->relocbase);
 	    break;
 
 	case PT_LOAD:
 	    if (nsegs == 0) {	/* First load segment */
 		obj->vaddrbase = trunc_page(ph->p_vaddr);
-		obj->mapbase = (caddr_t) obj->vaddrbase;
-		obj->relocbase = obj->mapbase - obj->vaddrbase;
+		obj->mapbase = obj->vaddrbase + obj->relocbase;
 		obj->textsize = round_page(ph->p_vaddr + ph->p_memsz) -
 		  obj->vaddrbase;
 	    } else {		/* Last load segment */
@@ -1145,7 +1146,7 @@
 	    break;
 
 	case PT_DYNAMIC:
-	    obj->dynamic = (const Elf_Dyn *) ph->p_vaddr;
+	    obj->dynamic = (const Elf_Dyn *)(ph->p_vaddr + obj->relocbase);
 	    break;
 
 	case PT_TLS:
@@ -1153,7 +1154,7 @@
 	    obj->tlssize = ph->p_memsz;
 	    obj->tlsalign = ph->p_align;
 	    obj->tlsinitsize = ph->p_filesz;
-	    obj->tlsinit = (void*) ph->p_vaddr;
+	    obj->tlsinit = (void*)(ph->p_vaddr + obj->relocbase);
 	    break;
 	}
     }
From rwatson at FreeBSD.org  Thu Nov 12 12:22:25 2009
From: rwatson at FreeBSD.org (Robert Watson)
Date: Thu Nov 12 12:22:31 2009
Subject: PERFORCE change 170538 for review
Message-ID: <200911121222.nACCMOKa045908@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170538

Change 170538 by rwatson@rwatson_vimage_client on 2009/11/12 12:21:51

	Integrate ELF-related kernel code from head into capabilities
	branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/elf.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/elf.h#4 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/elf.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/elf.h,v 1.21 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/amd64/include/elf.h,v 1.22 2009/10/10 15:31:24 kib Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -106,4 +106,10 @@
 #define	ELF_TARG_MACH	EM_X86_64
 #define	ELF_TARG_VER	1
 
+#if __ELF_WORD_SIZE == 32
+#define	ET_DYN_LOAD_ADDR 0x01001000
+#else
+#define	ET_DYN_LOAD_ADDR 0x01021000
+#endif
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/arm/include/elf.h#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/elf.h,v 1.10 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/arm/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -97,4 +97,7 @@
  * value.
  */
 #define MAGIC_TRAMP_NUMBER	0x5c000003
+
+#define	ET_DYN_LOAD_ADDR 0x12000
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/elf.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/i386/include/elf.h,v 1.19 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/i386/include/elf.h,v 1.20 2009/10/10 15:31:24 kib Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -105,4 +105,6 @@
 #define	ELF_TARG_MACH	EM_386
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x01001000
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/elf.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/include/elf.h,v 1.17 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/ia64/include/elf.h,v 1.18 2009/10/10 15:31:24 kib Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -141,4 +141,6 @@
 
 #define	DT_IA_64_PLT_RESERVE	0x70000000
 
+#define	ET_DYN_LOAD_ADDR 0x2500000000000000
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#10 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.200 2009/10/03 10:50:00 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.203 2009/10/18 12:57:48 kib Exp $");
 
 #include "opt_compat.h"
 
@@ -640,7 +640,8 @@
 	}
 
 	for (i = 0, numsegs = 0; i < hdr->e_phnum; i++) {
-		if (phdr[i].p_type == PT_LOAD) {	/* Loadable segment */
+		if (phdr[i].p_type == PT_LOAD && phdr[i].p_memsz != 0) {
+			/* Loadable segment */
 			prot = 0;
 			if (phdr[i].p_flags & PF_X)
   				prot |= VM_PROT_EXECUTE;
@@ -692,9 +693,9 @@
 	u_long text_size = 0, data_size = 0, total_size = 0;
 	u_long text_addr = 0, data_addr = 0;
 	u_long seg_size, seg_addr;
-	u_long addr, entry = 0, proghdr = 0;
+	u_long addr, baddr, et_dyn_addr, entry = 0, proghdr = 0;
 	int32_t osrel = 0;
-	int error = 0, i;
+	int error = 0, i, n;
 	const char *interp = NULL, *newinterp = NULL;
 	Elf_Brandinfo *brand_info;
 	char *path;
@@ -723,14 +724,22 @@
 	phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff);
 	if (!aligned(phdr, Elf_Addr))
 		return (ENOEXEC);
+	n = 0;
+	baddr = 0;
 	for (i = 0; i < hdr->e_phnum; i++) {
+		if (phdr[i].p_type == PT_LOAD) {
+			if (n == 0)
+				baddr = phdr[i].p_vaddr;
+			n++;
+			continue;
+		}
 		if (phdr[i].p_type == PT_INTERP) {
 			/* Path to interpreter */
 			if (phdr[i].p_filesz > MAXPATHLEN ||
 			    phdr[i].p_offset + phdr[i].p_filesz > PAGE_SIZE)
 				return (ENOEXEC);
 			interp = imgp->image_header + phdr[i].p_offset;
-			break;
+			continue;
 		}
 	}
 
@@ -740,9 +749,19 @@
 		    hdr->e_ident[EI_OSABI]);
 		return (ENOEXEC);
 	}
-	if (hdr->e_type == ET_DYN &&
-	    (brand_info->flags & BI_CAN_EXEC_DYN) == 0)
-		return (ENOEXEC);
+	if (hdr->e_type == ET_DYN) {
+		if ((brand_info->flags & BI_CAN_EXEC_DYN) == 0)
+			return (ENOEXEC);
+		/*
+		 * Honour the base load address from the dso if it is
+		 * non-zero for some reason.
+		 */
+		if (baddr == 0)
+			et_dyn_addr = ET_DYN_LOAD_ADDR;
+		else
+			et_dyn_addr = 0;
+	} else
+		et_dyn_addr = 0;
 	sv = brand_info->sysvec;
 	if (interp != NULL && brand_info->interp_newpath != NULL)
 		newinterp = brand_info->interp_newpath;
@@ -769,6 +788,8 @@
 	for (i = 0; i < hdr->e_phnum; i++) {
 		switch (phdr[i].p_type) {
 		case PT_LOAD:	/* Loadable segment */
+			if (phdr[i].p_memsz == 0)
+				break;
 			prot = 0;
 			if (phdr[i].p_flags & PF_X)
   				prot |= VM_PROT_EXECUTE;
@@ -788,7 +809,7 @@
 
 			if ((error = __elfN(load_section)(vmspace,
 			    imgp->object, phdr[i].p_offset,
-			    (caddr_t)(uintptr_t)phdr[i].p_vaddr,
+			    (caddr_t)(uintptr_t)phdr[i].p_vaddr + et_dyn_addr,
 			    phdr[i].p_memsz, phdr[i].p_filesz, prot,
 			    sv->sv_pagesize)) != 0)
 				return (error);
@@ -802,11 +823,12 @@
 			if (phdr[i].p_offset == 0 &&
 			    hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize
 				<= phdr[i].p_filesz)
-				proghdr = phdr[i].p_vaddr + hdr->e_phoff;
+				proghdr = phdr[i].p_vaddr + hdr->e_phoff +
+				    et_dyn_addr;
 
-			seg_addr = trunc_page(phdr[i].p_vaddr);
+			seg_addr = trunc_page(phdr[i].p_vaddr + et_dyn_addr);
 			seg_size = round_page(phdr[i].p_memsz +
-			    phdr[i].p_vaddr - seg_addr);
+			    phdr[i].p_vaddr + et_dyn_addr - seg_addr);
 
 			/*
 			 * Is this .text or .data?  We can't use
@@ -828,7 +850,7 @@
 			    phdr[i].p_memsz)) {
 				text_size = seg_size;
 				text_addr = seg_addr;
-				entry = (u_long)hdr->e_entry;
+				entry = (u_long)hdr->e_entry + et_dyn_addr;
 			} else {
 				data_size = seg_size;
 				data_addr = seg_addr;
@@ -836,7 +858,7 @@
 			total_size += seg_size;
 			break;
 		case PT_PHDR: 	/* Program header table info */
-			proghdr = phdr[i].p_vaddr;
+			proghdr = phdr[i].p_vaddr + et_dyn_addr;
 			break;
 		default:
 			break;
@@ -908,7 +930,7 @@
 			return (error);
 		}
 	} else
-		addr = 0;
+		addr = et_dyn_addr;
 
 	/*
 	 * Construct auxargs table (used by the fixup routine)

==== //depot/projects/trustedbsd/capabilities/src/sys/mips/include/elf.h#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	JNPR: elf.h,v 1.4 2006/12/02 09:53:40 katta
- * $FreeBSD: src/sys/mips/include/elf.h,v 1.4 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/mips/include/elf.h,v 1.5 2009/10/10 15:31:24 kib Exp $
  *
  */
 
@@ -250,4 +250,6 @@
 
 #define	AT_COUNT	16	/* Count of defined aux entry types. */
 
+#define	ET_DYN_LOAD_ADDR 0x0120000
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/elf.h#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.10 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $
  */
 
 #ifndef _MACHINE_ELF_H_
@@ -96,4 +96,6 @@
 #define	ELF_TARG_MACH	EM_PPC
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x01010000
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/elf.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.17 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.19 2009/10/18 13:08:15 marius Exp $
  */
 
 #ifndef	_MACHINE_ELF_H_
@@ -97,4 +97,6 @@
 #define	ELF_TARG_MACH	ELF_ARCH
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x100000
+
 #endif /* !_MACHINE_ELF_H_ */

==== //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/elf.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.4 2009/03/17 12:50:16 kib Exp $
+ * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.6 2009/10/18 13:08:15 marius Exp $
  */
 
 #ifndef	_MACHINE_ELF_H_
@@ -97,4 +97,6 @@
 #define	ELF_TARG_MACH	ELF_ARCH
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x100000
+
 #endif /* !_MACHINE_ELF_H_ */
From raj at FreeBSD.org  Thu Nov 12 12:47:52 2009
From: raj at FreeBSD.org (Rafal Jaworowski)
Date: Thu Nov 12 12:48:00 2009
Subject: PERFORCE change 170540 for review
Message-ID: <200911121247.nACCloFl057918@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170540

Change 170540 by raj@raj_fdt on 2009/11/12 12:47:20

	IFC @170536

Affected files ...

.. //depot/projects/fdt/Makefile.inc1#2 integrate
.. //depot/projects/fdt/UPDATING#2 integrate
.. //depot/projects/fdt/bin/getfacl/getfacl.1#2 integrate
.. //depot/projects/fdt/bin/ps/keyword.c#2 integrate
.. //depot/projects/fdt/bin/sh/arith_lex.l#2 integrate
.. //depot/projects/fdt/bin/sh/trap.c#2 integrate
.. //depot/projects/fdt/contrib/bind9/bin/dig/dighost.c#2 integrate
.. //depot/projects/fdt/contrib/ee/ee.c#2 integrate
.. //depot/projects/fdt/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/fdt/crypto/openssh/ssh_namespace.h#2 integrate
.. //depot/projects/fdt/etc/rc.d/jail#2 integrate
.. //depot/projects/fdt/games/fortune/datfiles/fortunes#2 integrate
.. //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#2 integrate
.. //depot/projects/fdt/lib/libc/gen/fmtmsg.c#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawn.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate
.. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_init.3#2 integrate
.. //depot/projects/fdt/lib/libc/locale/isblank.3#2 integrate
.. //depot/projects/fdt/lib/libc/net/gai_strerror.c#2 integrate
.. //depot/projects/fdt/lib/libc/net/ip6opt.c#2 integrate
.. //depot/projects/fdt/lib/libc/nls/C.msg#2 integrate
.. //depot/projects/fdt/lib/libc/nls/Makefile.inc#2 integrate
.. //depot/projects/fdt/lib/libc/nls/ja_JP.UTF-8.msg#1 branch
.. //depot/projects/fdt/lib/libc/nls/ja_JP.eucJP.msg#1 branch
.. //depot/projects/fdt/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate
.. //depot/projects/fdt/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate
.. //depot/projects/fdt/lib/libc/sys/accept.2#2 integrate
.. //depot/projects/fdt/lib/libc/sys/mmap.2#2 integrate
.. //depot/projects/fdt/lib/libkvm/kvm_i386.c#2 integrate
.. //depot/projects/fdt/lib/libpmc/pmc_attach.3#2 integrate
.. //depot/projects/fdt/lib/libstand/udp.c#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb.h#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb10.c#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb10_desc.c#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb10_io.c#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb20.c#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb20_desc.c#2 integrate
.. //depot/projects/fdt/lib/libusb/libusb20_ugen20.c#2 integrate
.. //depot/projects/fdt/release/picobsd/bridge/PICOBSD#2 integrate
.. //depot/projects/fdt/sbin/camcontrol/camcontrol.8#2 integrate
.. //depot/projects/fdt/sbin/camcontrol/camcontrol.c#2 integrate
.. //depot/projects/fdt/sbin/ddb/ddb_capture.c#2 integrate
.. //depot/projects/fdt/sbin/ifconfig/ifconfig.8#2 integrate
.. //depot/projects/fdt/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/fdt/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/fdt/sbin/mount/mount.8#2 integrate
.. //depot/projects/fdt/sbin/reboot/reboot.c#2 integrate
.. //depot/projects/fdt/sbin/sysctl/sysctl.c#2 integrate
.. //depot/projects/fdt/secure/lib/libssh/Makefile#2 integrate
.. //depot/projects/fdt/secure/usr.bin/bdes/bdes.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/chpmon.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/eltsub.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/eltsub.h#1 branch
.. //depot/projects/fdt/share/examples/ses/srcs/getencstat.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/getnobj.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/getobjmap.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/getobjstat.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/inienc.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/sesd.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/setencstat.c#2 integrate
.. //depot/projects/fdt/share/examples/ses/srcs/setobjstat.c#2 integrate
.. //depot/projects/fdt/share/man/man3/tree.3#2 integrate
.. //depot/projects/fdt/share/man/man4/ata.4#2 integrate
.. //depot/projects/fdt/share/man/man4/atapicam.4#2 integrate
.. //depot/projects/fdt/share/man/man4/hptrr.4#2 integrate
.. //depot/projects/fdt/share/man/man4/msk.4#2 integrate
.. //depot/projects/fdt/share/man/man4/netintro.4#2 integrate
.. //depot/projects/fdt/share/man/man4/tty.4#2 integrate
.. //depot/projects/fdt/share/man/man4/umass.4#2 integrate
.. //depot/projects/fdt/share/man/man5/ar.5#2 integrate
.. //depot/projects/fdt/share/man/man5/make.conf.5#2 integrate
.. //depot/projects/fdt/share/man/man5/msdosfs.5#2 integrate
.. //depot/projects/fdt/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/fdt/share/man/man7/adding_user.7#2 integrate
.. //depot/projects/fdt/share/misc/iso3166#2 integrate
.. //depot/projects/fdt/share/misc/organization.dot#2 integrate
.. //depot/projects/fdt/share/timedef/ja_JP.SJIS.src#2 integrate
.. //depot/projects/fdt/share/timedef/ja_JP.UTF-8.src#2 integrate
.. //depot/projects/fdt/share/timedef/ja_JP.eucJP.src#2 integrate
.. //depot/projects/fdt/share/zoneinfo/antarctica#2 integrate
.. //depot/projects/fdt/share/zoneinfo/asia#2 integrate
.. //depot/projects/fdt/share/zoneinfo/europe#2 integrate
.. //depot/projects/fdt/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/fdt/sys/amd64/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/initcpu.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/mp_machdep.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/fdt/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/fdt/sys/arm/arm/gdb_machdep.c#2 integrate
.. //depot/projects/fdt/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/fdt/sys/arm/arm/trap.c#2 integrate
.. //depot/projects/fdt/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/arm/at91/at91_machdep.c#2 integrate
.. //depot/projects/fdt/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/fdt/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/fdt/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/fdt/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/fdt/sys/boot/common/boot.c#2 integrate
.. //depot/projects/fdt/sys/boot/uboot/lib/glue.c#2 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_all.c#2 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_all.h#2 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_da.c#2 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_pmp.c#2 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/fdt/sys/cam/cam.c#2 integrate
.. //depot/projects/fdt/sys/cam/cam.h#2 integrate
.. //depot/projects/fdt/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/fdt/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/fdt/sys/cam/cam_periph.h#2 integrate
.. //depot/projects/fdt/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/fdt/sys/cam/cam_xpt_internal.h#2 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_sg.c#2 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_xpt.c#2 integrate
.. //depot/projects/fdt/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate
.. //depot/projects/fdt/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/kern_windrv.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/subr_hal.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/subr_ndis.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/subr_ntoskrnl.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/subr_pe.c#2 integrate
.. //depot/projects/fdt/sys/compat/ndis/subr_usbd.c#2 integrate
.. //depot/projects/fdt/sys/conf/NOTES#2 integrate
.. //depot/projects/fdt/sys/conf/files#2 integrate
.. //depot/projects/fdt/sys/conf/files.ia64#2 integrate
.. //depot/projects/fdt/sys/conf/options#2 integrate
.. //depot/projects/fdt/sys/contrib/altq/altq/altq_hfsc.c#2 integrate
.. //depot/projects/fdt/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/fdt/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/fdt/sys/dev/acpi_support/acpi_aiboost.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi_hpet.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/fdt/sys/dev/ahci/ahci.c#2 integrate
.. //depot/projects/fdt/sys/dev/ahci/ahci.h#2 integrate
.. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/fdt/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/fdt/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/fdt/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/fdt/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/fdt/sys/dev/arcmsr/arcmsr.h#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-raid.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-sata.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-adaptec.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ahci.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-intel.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-marvell.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-promise.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate
.. //depot/projects/fdt/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/fdt/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/fdt/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/fdt/sys/dev/bwi/if_bwi.c#2 integrate
.. //depot/projects/fdt/sys/dev/bwi/if_bwivar.h#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#2 integrate
.. //depot/projects/fdt/sys/dev/drm/drmP.h#2 integrate
.. //depot/projects/fdt/sys/dev/drm/drm_scatter.c#2 integrate
.. //depot/projects/fdt/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/fdt/sys/dev/drm/radeon_cp.c#2 integrate
.. //depot/projects/fdt/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/fdt/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/fdt/sys/dev/fb/vgareg.h#2 integrate
.. //depot/projects/fdt/sys/dev/fdc/fdc.c#2 integrate
.. //depot/projects/fdt/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/fdt/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/fdt/sys/dev/ichwd/ichwd.c#2 integrate
.. //depot/projects/fdt/sys/dev/ieee488/ibfoo.c#2 integrate
.. //depot/projects/fdt/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/fdt/sys/dev/if_ndis/if_ndis_usb.c#2 integrate
.. //depot/projects/fdt/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/fdt/sys/dev/ixgb/if_ixgb.c#2 integrate
.. //depot/projects/fdt/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/fdt/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/fdt/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/fdt/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/fdt/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/fdt/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/fdt/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/fdt/sys/dev/pci/vga_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/fdt/sys/dev/siis/siis.c#2 integrate
.. //depot/projects/fdt/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/fdt/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/fdt/sys/dev/sound/usb/uaudio.c#2 integrate
.. //depot/projects/fdt/sys/dev/stge/if_stge.c#2 integrate
.. //depot/projects/fdt/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/fdt/sys/dev/syscons/scterm-teken.c#2 integrate
.. //depot/projects/fdt/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/fdt/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci.h#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci_mbus.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/controller/ehci_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/input/atp.c#1 branch
.. //depot/projects/fdt/sys/dev/usb/input/uhid.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/input/ukbd.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/input/ums.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/serial/usb_serial.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/storage/umass.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/usb_compat_linux.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/usb_compat_linux.h#2 integrate
.. //depot/projects/fdt/sys/dev/usb/usb_core.h#2 integrate
.. //depot/projects/fdt/sys/dev/usb/usb_transfer.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/usbdi.h#2 integrate
.. //depot/projects/fdt/sys/dev/usb/wlan/if_urtw.c#2 integrate
.. //depot/projects/fdt/sys/dev/vge/if_vge.c#2 integrate
.. //depot/projects/fdt/sys/dev/vge/if_vgevar.h#2 integrate
.. //depot/projects/fdt/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/fdt/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/fdt/sys/fs/nfsclient/nfs_clvnops.c#2 integrate
.. //depot/projects/fdt/sys/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/fdt/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/initcpu.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/i386/isa/isa_dma.c#2 integrate
.. //depot/projects/fdt/sys/i386/xen/pmap.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/highfp.c#1 branch
.. //depot/projects/fdt/sys/ia64/ia64/interrupt.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/ia64/include/md_var.h#2 integrate
.. //depot/projects/fdt/sys/ia64/include/proc.h#2 integrate
.. //depot/projects/fdt/sys/isa/vga_isa.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_intr.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/fdt/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/fdt/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/fdt/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/fdt/sys/kern/subr_log.c#2 integrate
.. //depot/projects/fdt/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/fdt/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/fdt/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/fdt/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/fdt/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/fdt/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/fdt/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/fdt/sys/libkern/inet_aton.c#1 branch
.. //depot/projects/fdt/sys/mips/include/pcb.h#2 integrate
.. //depot/projects/fdt/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/fdt/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/fdt/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/fdt/sys/mips/mips/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/modules/ichwd/Makefile#2 integrate
.. //depot/projects/fdt/sys/modules/usb/Makefile#2 integrate
.. //depot/projects/fdt/sys/modules/usb/atp/Makefile#1 branch
.. //depot/projects/fdt/sys/net/if.c#2 integrate
.. //depot/projects/fdt/sys/net/if.h#2 integrate
.. //depot/projects/fdt/sys/net/if_ef.c#2 integrate
.. //depot/projects/fdt/sys/net/if_var.h#2 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_action.c#2 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/fdt/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/fdt/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/fdt/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/fdt/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/fdt/sys/netgraph/ng_sppp.c#2 integrate
.. //depot/projects/fdt/sys/netinet/in.h#2 integrate
.. //depot/projects/fdt/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/fdt/sys/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/fdt/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/fdt/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/fdt/sys/netinet/libalias/alias_proxy.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/fdt/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/fdt/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/fdt/sys/pc98/cbus/cbus_dma.c#2 integrate
.. //depot/projects/fdt/sys/pc98/cbus/scterm-sck.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/swtch.S#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/trap.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/booke/trap.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/booke/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/fdt/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/fdt/sys/rpc/clnt_vc.c#2 integrate
.. //depot/projects/fdt/sys/sparc64/include/pcb.h#2 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/sun4v/sun4v/trap.c#2 integrate
.. //depot/projects/fdt/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/fdt/sys/sys/aac_ioctl.h#2 integrate
.. //depot/projects/fdt/sys/sys/ata.h#2 integrate
.. //depot/projects/fdt/sys/sys/conf.h#2 integrate
.. //depot/projects/fdt/sys/sys/fbio.h#2 integrate
.. //depot/projects/fdt/sys/sys/mman.h#2 integrate
.. //depot/projects/fdt/sys/sys/msgbuf.h#2 integrate
.. //depot/projects/fdt/sys/sys/param.h#2 integrate
.. //depot/projects/fdt/sys/sys/priv.h#2 integrate
.. //depot/projects/fdt/sys/sys/proc.h#2 integrate
.. //depot/projects/fdt/sys/sys/signalvar.h#2 integrate
.. //depot/projects/fdt/sys/sys/sockio.h#2 integrate
.. //depot/projects/fdt/sys/teken/teken.c#2 integrate
.. //depot/projects/fdt/sys/teken/teken.h#2 integrate
.. //depot/projects/fdt/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/fdt/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/fdt/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/fdt/sys/vm/vm_map.c#2 integrate
.. //depot/projects/fdt/sys/vm/vm_zeroidle.c#2 integrate
.. //depot/projects/fdt/tools/regression/lib/libutil/Makefile#2 integrate
.. //depot/projects/fdt/tools/regression/lib/libutil/test-flopen.c#2 integrate
.. //depot/projects/fdt/tools/regression/lib/libutil/test-grp.c#2 integrate
.. //depot/projects/fdt/tools/regression/lib/libutil/test-pidfile.c#1 branch
.. //depot/projects/fdt/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate
.. //depot/projects/fdt/tools/regression/lib/libutil/test-trimdomain.c#2 integrate
.. //depot/projects/fdt/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate
.. //depot/projects/fdt/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate
.. //depot/projects/fdt/usr.bin/gzip/unbzip2.c#2 integrate
.. //depot/projects/fdt/usr.bin/kdump/kdump.c#2 integrate
.. //depot/projects/fdt/usr.bin/leave/leave.c#2 integrate
.. //depot/projects/fdt/usr.bin/logger/logger.c#2 integrate
.. //depot/projects/fdt/usr.bin/tail/tail.1#2 integrate
.. //depot/projects/fdt/usr.bin/vmstat/vmstat.c#2 integrate
.. //depot/projects/fdt/usr.sbin/crashinfo/crashinfo.sh#2 integrate
.. //depot/projects/fdt/usr.sbin/i2c/i2c.8#2 integrate
.. //depot/projects/fdt/usr.sbin/nfsd/stablerestart.5#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/Makefile#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/acpi.c#2 delete
.. //depot/projects/fdt/usr.sbin/sysinstall/acpidump.h#2 delete
.. //depot/projects/fdt/usr.sbin/sysinstall/biosmptable.c#2 delete
.. //depot/projects/fdt/usr.sbin/sysinstall/dist.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/install.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/menus.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/sysinstall.8#2 integrate
.. //depot/projects/fdt/usr.sbin/usbconfig/dump.c#2 integrate
.. //depot/projects/fdt/usr.sbin/usbconfig/usbconfig.8#2 integrate
.. //depot/projects/fdt/usr.sbin/vidcontrol/vidcontrol.1#2 integrate
.. //depot/projects/fdt/usr.sbin/vidcontrol/vidcontrol.c#2 integrate
.. //depot/projects/fdt/usr.sbin/wake/wake.8#2 integrate
.. //depot/projects/fdt/usr.sbin/zic/zdump.c#2 integrate
.. //depot/projects/fdt/usr.sbin/zic/zic.8#2 integrate

Differences ...

==== //depot/projects/fdt/Makefile.inc1#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -272,7 +272,7 @@
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
-		-iprefix ${LIB32TMP}/usr/ \
+		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
 

==== //depot/projects/fdt/UPDATING#2 (text+ko) ====

@@ -22,6 +22,11 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20091109:
+	The layout of the structure ieee80211req_scan_result has changed.
+	Applications that require wireless scan results (e.g. ifconfig(8))
+	from net80211 need to be recompiled.
+
 20091025:
 	The iwn(4) driver has been updated to support the 5000 and 5150 series.
 	There's one kernel module for each firmware. Adding "device iwnfw"
@@ -537,6 +542,11 @@
 		# Map old usb library to new one for usb2 stack
 		libusb-0.1.so.8	libusb20.so.1
 
+20090209:
+	All USB ethernet devices now attach as interfaces under the name ueN
+	(eg. ue0). This is to provide a predictable name as vendors often
+	change usb chipsets in a product without notice.
+
 20090203:
 	The ichsmb(4) driver has been changed to require SMBus slave
 	addresses be left-justified (xxxxxxx0b) rather than right-justified.
@@ -1047,4 +1057,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $
+$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $

==== //depot/projects/fdt/bin/getfacl/getfacl.1#2 (text+ko) ====

@@ -25,12 +25,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for POSIX.1e access control lists.
 .\"
-.Dd September 04, 2009
+.Dd September 4, 2009
 .Dt GETFACL 1
 .Os
 .Sh NAME

==== //depot/projects/fdt/bin/ps/keyword.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
 
 #include 
 #include 
@@ -70,7 +70,7 @@
 
 /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
 static VAR var[] = {
-	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0},
+	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0},
 	{"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0},
 	{"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT,
 		"x", 0},
@@ -159,7 +159,7 @@
 		UINT, UIDFMT, 0},
 	{"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname,
 		USERLEN, 0, CHAR, NULL, 0},
-	{"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0},
+	{"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0},
 	{"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR,
 		NULL, 0},
 	{"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid),
@@ -207,7 +207,7 @@
 		NULL, 0},
 	{"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
 	{"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
-	{"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0},
+	{"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0},
 	{"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0},
 	{"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT,
 		"x", 0},

==== //depot/projects/fdt/bin/sh/arith_lex.l#2 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif /* not lint */
 
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $");
 
 #include 
 
@@ -51,6 +51,13 @@
 
 int yylex(void);
 
+struct varname
+{
+	struct varname *next;
+	char name[1];
+};
+static struct varname *varnames;
+
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max) \
 	result = (*buf = *arith_buf++) ? 1 : YY_NULL;
@@ -80,11 +87,14 @@
 			 * If variable doesn't exist, we should initialize
 			 * it to zero.
 			 */
-			char *temp;
+			struct varname *temp;
 			if (lookupvar(yytext) == NULL)
 				setvarsafe(yytext, "0", 0);
-			temp = (char *)ckmalloc(strlen(yytext) + 1);
-			yylval.s_value = strcpy(temp, yytext);
+			temp = ckmalloc(sizeof(struct varname) +
+			    strlen(yytext));
+			temp->next = varnames;
+			varnames = temp;
+			yylval.s_value = strcpy(temp->name, yytext);
 
 			return ARITH_VAR;
 		}
@@ -130,5 +140,15 @@
 void
 arith_lex_reset(void)
 {
+	struct varname *name, *next;
+
 	YY_NEW_FILE;
+
+	name = varnames;
+	while (name != NULL) {
+		next = name->next;
+		ckfree(name);
+		name = next;
+	}
+	varnames = NULL;
 }

==== //depot/projects/fdt/bin/sh/trap.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.34 2009/06/13 21:10:41 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $");
 
 #include 
 #include 
@@ -244,7 +244,8 @@
 setsignal(int signo)
 {
 	int action;
-	sig_t sig, sigact = SIG_DFL;
+	sig_t sigact = SIG_DFL;
+	struct sigaction sa;
 	char *t;
 
 	if ((t = trap[signo]) == NULL)
@@ -320,9 +321,10 @@
 		case S_IGN:	sigact = SIG_IGN;	break;
 	}
 	*t = action;
-	sig = signal(signo, sigact);
-	if (sig != SIG_ERR && action == S_CATCH)
-		siginterrupt(signo, 1);
+	sa.sa_handler = sigact;
+	sa.sa_flags = 0;
+	sigemptyset(&sa.sa_mask);
+	sigaction(signo, &sa, NULL);
 }
 
 

==== //depot/projects/fdt/contrib/bind9/bin/dig/dighost.c#2 (text+ko) ====

@@ -2604,10 +2604,12 @@
 
 	if (sevent->result == ISC_R_CANCELED) {
 		debug("in cancel handler");
-		isc_socket_detach(&query->sock);
-		sockcount--;
-		INSIST(sockcount >= 0);
-		debug("sockcount=%d", sockcount);
+		if (query->sock != NULL) {
+			isc_socket_detach(&query->sock);
+			sockcount--;
+			INSIST(sockcount >= 0);
+			debug("sockcount=%d", sockcount);
+		}
 		query->waiting_connect = ISC_FALSE;
 		isc_event_free(&event);
 		l = query->lookup;

==== //depot/projects/fdt/contrib/ee/ee.c#2 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.7 2009/09/04 07:42:13 ache Exp $");
+__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.8 2009/11/10 00:48:24 delphij Exp $");
 
 char *ee_copyright_message = 
 "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon ";
@@ -1989,7 +1989,7 @@
 	int number;
 	int i;
 	char *ptr;
-	char *direction = NULL;
+	char *direction = "d";
 	struct text *t_line;
 
 	ptr = cmd_str;

==== //depot/projects/fdt/contrib/libpcap/inet.c#2 (text+ko) ====

@@ -403,22 +403,30 @@
 	pcap_addr_t *curaddr, *prevaddr, *nextaddr;
 #ifdef SIOCGIFDESCR
 	struct ifreq ifrdesc;
+#ifdef __FreeBSD__
+#define _IFDESCRSIZE 64
+	char ifdescr[_IFDESCRSIZE];
+#else
 	char ifdescr[IFDESCRSIZE];
+#endif
 	int s;
-#endif
 
-#ifdef SIOCGIFDESCR
 	/*
 	 * Get the description for the interface.
 	 */
 	memset(&ifrdesc, 0, sizeof ifrdesc);
 	strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
+#ifdef __FreeBSD__
+	ifrdesc.ifr_buffer.buffer = ifdescr;
+	ifrdesc.ifr_buffer.length = _IFDESCRSIZE;
+#else
 	ifrdesc.ifr_data = (caddr_t)&ifdescr;
+#endif
 	s = socket(AF_INET, SOCK_DGRAM, 0);
 	if (s >= 0) {
 		if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 &&
-		    strlen(ifrdesc.ifr_data) != 0)
-			description = ifrdesc.ifr_data;
+		    strlen(ifdescr) != 0)
+			description = ifdescr;
 		close(s);
 	}
 #endif

==== //depot/projects/fdt/crypto/openssh/ssh_namespace.h#2 (text) ====

@@ -9,7 +9,7 @@
  *
  * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }'
  *
- * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $
+ * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.9 2009/11/10 09:45:43 des Exp $
  */
 
 #define a2port					ssh_a2port
@@ -223,6 +223,8 @@
 #define get_u32					ssh_get_u32
 #define get_u64					ssh_get_u64
 #define getrrsetbyname				ssh_getrrsetbyname
+#define glob					ssh_glob
+#define globfree				ssh_globfree
 #define host_hash				ssh_host_hash
 #define hostfile_read_key			ssh_hostfile_read_key
 #define hpdelim					ssh_hpdelim

==== //depot/projects/fdt/etc/rc.d/jail#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/jail,v 1.43 2009/06/10 18:18:14 ed Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.44 2009/11/02 09:56:46 remko Exp $
 #
 
 # PROVIDE: jail
@@ -728,4 +728,4 @@
 if [ -n "$*" ]; then
 	jail_list="$*"
 fi
-run_rc_command "${cmd}"
+run_rc_command "${cmd}" &

==== //depot/projects/fdt/games/fortune/datfiles/fortunes#2 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.280 2009/11/07 22:13:29 dougb Exp $
 %
 =======================================================================
 ||								     ||
@@ -69,6 +69,17 @@
 
 		-- CommUNIXque 1:1, ASCAR Business Systems
 %
+			   1/2
+	12 + 144 + 20 + 3*4                    2
+	----------------------  +  5 * 11  =  9  +  0
+		  7
+
+A dozen, a gross and a score,
+Plus three times the square root of four,
+	Divided by seven,
+	Plus five times eleven,
+Equals nine squared plus zero, no more!
+%
 			-- Gifts for Children --
 
 This is easy.  You never have to figure out what to get for children,
@@ -674,17 +685,6 @@
 %
 	... with liberty and justice for all who can afford it.
 %
-			   1/2
-	12 + 144 + 20 + 3*4                    2
-	----------------------  +  5 * 11  =  9  +  0
-		  7
-
-A dozen, a gross and a score,
-Plus three times the square root of four,
-	Divided by seven,
-	Plus five times eleven,
-Equals nine squared plus zero, no more!
-%
 	7,140	pounds on the Sun
 	   97	pounds on Mercury or Mars
 	  255	pounds on Earth
@@ -2516,12 +2516,6 @@
 yourself for far less money.  This article can help you.
 		-- Dave Barry, "The Taming of the Screw"
 %
-	I'd say that VCS is more like the anal sex of the software
-world: Everybody talks about it, some people do it, some people enjoy
-it, but typically only vague implications about the best techniques
-are ever voiced in public.
-              -- Warner Losh, on Version Control Systems
-%
 	"I'll tell you what I know, then," he decided.  "The pin I'm wearing
 means I'm a member of the IA.  That's Inamorati Anonymous.  An inamorato is
 somebody in love.  That's the worst addiction of all."
@@ -25228,7 +25222,8 @@
 		-- Sylvestre Matuschka, "the Hungarian Train Wreck Freak",
 		   escaped prison 1937, not heard from since
 %
-Iam
+I
+am
 not
 very
 happy
@@ -33070,6 +33065,10 @@
 %
 May a Misguided Platypus lay its Eggs in your Jockey Shorts
 %
+May all your Emus lay soft boiled eggs, and may all your
+Kangaroos be born with iPods already fitted.
+		-- Aussie New Years wish, found on hasselbladinfo.com
+%
 May all your PUSHes be POPped.
 %
 May Euell Gibbons eat your only copy of the manual!
@@ -59769,6 +59768,17 @@
 and now you're telling me just to be myself?
 		-- The Return of the Secaucus Seven
 %
+You've decked the halls with a dozen miles' length of electric lights. 
+Your front lawn is a gleaming testament of incandescent wonder. The neighbors 
+wear sunglasses 24/7,  and orbiting satellites have officially picked up 
+and pinpointed your house as the brightest spot on earth.
+        
+You've finally put together the Christmas wonderland of your dreams... now 
+if only you could get a good picture of it.
+        
+Photographing holiday lights is no easy task. 
+		-- from an email sent by photojojo.com
+%
 You've got to have a gimmick if your band sucks.
 		-- Gary Giddens
 %
@@ -59809,18 +59819,3 @@
 Zymurgy's Law of Volunteer Labor:
 	People are always available for work in the past tense.
 %
-You've decked the halls with a dozen miles' length of electric lights. 
-Your front lawn is a gleaming testament of incandescent wonder. The neighbors 
-wear sunglasses 24/7,  and orbiting satellites have officially picked up 
-and pinpointed your house as the brightest spot on earth.
-        
-You've finally put together the Christmas wonderland of your dreams... now 
-if only you could get a good picture of it.
-        
-Photographing holiday lights is no easy task. 
-		-- from an email sent by photojojo.com
-%
-May all your Emus lay soft boiled eggs, and may all your
-Kangaroos be born with iPods already fitted.
-		-- Aussie New Years wish, found on hasselbladinfo.com
-%

==== //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#2 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.32 2009/07/16 20:29:36 dougb Exp $
+%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.33 2009/11/07 21:28:21 dougb Exp $
 %
 						PLAYGIRL, Inc.
 						Philadelphia, Pa.  19369
@@ -1153,6 +1153,12 @@
 	"Gabriel's trumpet will produce you from the ass of a pig."
 		-- Al Swearingen, E. B. Farnum, _Deadwood_
 %
+	I'd say that VCS is more like the anal sex of the software
+world: Everybody talks about it, some people do it, some people enjoy
+it, but typically only vague implications about the best techniques
+are ever voiced in public.
+              -- Warner Losh, on Version Control Systems
+%
 	"I'll tell ya, Jeb," Wilbur said to his friend, "the tractor
 business ain't doin' too well.  I ain't sold one all month.
 	"You think you've got problems?" Jeb replied.  "The other day, I went

==== //depot/projects/fdt/lib/libc/gen/fmtmsg.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.6 2009/11/08 14:02:54 brueffer Exp $");
 
 #include 
 #include 
@@ -128,7 +128,7 @@
 		size += strlen(sevname);
 	if (text != MM_NULLTXT)
 		size += strlen(text);
-	if (text != MM_NULLACT)
+	if (act != MM_NULLACT)
 		size += strlen(act);
 	if (tag != MM_NULLTAG)
 		size += strlen(tag);

==== //depot/projects/fdt/lib/libc/gen/posix_spawn.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2 2008/07/28 09:36:56 ed Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWN 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2 2008/07/28 09:36:56 ed Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_init.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getflags.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETFLAGS 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getpgroup.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETPGROUP 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedparam.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3
 .Os
 .Sh NAME

==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigmask.3#2 (text+ko) ====

@@ -32,9 +32,9 @@
 .\" the referee document.  The original Standard can be obtained online at
 .\"	http://www.opengroup.org/unix/online.html.
 .\"
-.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $
+.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $
 .\"
-.Dd Mar 24, 2008
+.Dd March 24, 2008
 .Dt POSIX_SPAWNATTR_GETSIGMASK 3
 .Os
 .Sh NAME

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From raj at FreeBSD.org  Thu Nov 12 13:08:12 2009
From: raj at FreeBSD.org (Rafal Jaworowski)
Date: Thu Nov 12 13:08:19 2009
Subject: PERFORCE change 170541 for review
Message-ID: <200911121308.nACD8B3x060276@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170541

Change 170541 by raj@raj_fdt on 2009/11/12 13:07:24

	Vendor import of the DTC/libfdt package.
	
	Obtained from:	git://git.jdl.com/software/dtc.git

Affected files ...

.. //depot/projects/fdt/sys/contrib/dtc/Documentation/dtc-paper.bib#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Documentation/dtc-paper.tex#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Documentation/dts-format.txt#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Documentation/manual.txt#1 add
.. //depot/projects/fdt/sys/contrib/dtc/GPL#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Makefile#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Makefile.convert-dtsv0#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Makefile.dtc#1 add
.. //depot/projects/fdt/sys/contrib/dtc/Makefile.ftdump#1 add
.. //depot/projects/fdt/sys/contrib/dtc/README.license#1 add
.. //depot/projects/fdt/sys/contrib/dtc/TODO#1 add
.. //depot/projects/fdt/sys/contrib/dtc/checks.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/convert-dtsv0-lexer.l#1 add
.. //depot/projects/fdt/sys/contrib/dtc/data.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/dtc-lexer.l#1 add
.. //depot/projects/fdt/sys/contrib/dtc/dtc-parser.y#1 add
.. //depot/projects/fdt/sys/contrib/dtc/dtc.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/dtc.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/flattree.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/fstree.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/ftdump.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/Makefile.libfdt#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/TODO#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_ro.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_rw.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_strerror.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_sw.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_wip.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_internal.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/libfdt/version.lds#1 add
.. //depot/projects/fdt/sys/contrib/dtc/livetree.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/scripts/setlocalversion#1 add
.. //depot/projects/fdt/sys/contrib/dtc/srcpos.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/srcpos.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/add_subnode_with_nops.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/aliases.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/asm_tree_dump.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/bad-empty-ranges.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/bad-name-property.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/bad-ncells.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/bad-reg-ranges.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/bad-string-props.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/base01.asm#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/base01.cmd#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/base01.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/base01.stderr#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/boot-cpuid.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/comments-cmp.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/comments.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/data.S#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/default-addr-size.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/del_node.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/del_property.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dtbs_equal_ordered.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dtc-checkfails.sh#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dtc-fatal.sh#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dumptrees.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dup-nodename.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dup-phandle.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/dup-propname.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/empty.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/escapes.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/extra-terminating-null.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/extra-terminating-null.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/find_property.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/get_alias.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/get_mem_rsv.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/get_name.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/get_path.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/get_phandle.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/getprop.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.bin#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include0.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include1.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include2.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include3.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include4.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include5.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include6.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include7.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/include8.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/label01.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/mangle-layout.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/mangle-layout.supp#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/minusone-phandle.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/move_and_save.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/node_check_compatible.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_compatible.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_phandle.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_prop_value.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/nonexist-label-ref.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/nonexist-node-ref.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/nop_node.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/nop_property.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/nopulate.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/notfound.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/obsolete-chosen-interrupt-controller.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/open_pack.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/open_pack.supp#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/parent_offset.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/path-references.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/path-references.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/path_offset.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/path_offset_aliases.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/prop-after-subnode.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/references.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/references.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/references_dts0.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/reg-ranges-root.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/root_node.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/run_tests.sh#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/rw_tree1.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/set_name.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/setprop.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/setprop_inplace.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/string_escapes.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/subnode_offset.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/supernode_atdepth_offset.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/sw_tree1.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/test01.asm#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/test01.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/test01.stderr#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/test_kernel_dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/test_tree1.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/test_tree1_dts0.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/testdata.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/tests.h#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/tests.sh#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/testutils.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/trees.S#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/truncated_property.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/value-labels.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/value-labels.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/tests/zero-phandle.dts#1 add
.. //depot/projects/fdt/sys/contrib/dtc/treesource.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/util.c#1 add
.. //depot/projects/fdt/sys/contrib/dtc/util.h#1 add

Differences ...
From mav at FreeBSD.org  Thu Nov 12 13:37:42 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Thu Nov 12 13:37:49 2009
Subject: PERFORCE change 170543 for review
Message-ID: <200911121337.nACDbfSa062404@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170543

Change 170543 by mav@mav_mavbook on 2009/11/12 13:37:13

	Remove code that 10 years ago was closing race between sim_action()
	and device/SIM freeze. It just impossible with present CAM locking,
	but caused some unexpected side effects.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#6 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#5 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#127 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#6 (text+ko) ====

@@ -334,7 +334,6 @@
 	}
 	ccbq->devq_openings = openings;
 	ccbq->dev_openings = openings;	
-	TAILQ_INIT(&ccbq->active_ccbs);
 	return (0);
 }
 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#5 (text+ko) ====

@@ -60,7 +60,6 @@
 	int	dev_openings;	
 	int	dev_active;
 	int	held;
-	struct	ccb_hdr_tailq active_ccbs;
 };
 
 struct cam_ed;
@@ -209,9 +208,6 @@
 cam_ccbq_send_ccb(struct cam_ccbq *ccbq, union ccb *send_ccb)
 {
 
-	TAILQ_INSERT_TAIL(&ccbq->active_ccbs,
-			  &(send_ccb->ccb_h),
-			  xpt_links.tqe);
 	send_ccb->ccb_h.pinfo.index = CAM_ACTIVE_INDEX;
 	ccbq->dev_active++;
 	ccbq->dev_openings--;		
@@ -220,8 +216,7 @@
 static __inline void
 cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *done_ccb)
 {
-	TAILQ_REMOVE(&ccbq->active_ccbs, &done_ccb->ccb_h,
-		     xpt_links.tqe);
+
 	ccbq->dev_active--;
 	ccbq->dev_openings++;	
 	ccbq->held++;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#127 (text+ko) ====

@@ -3327,9 +3327,7 @@
 			}
 			mtx_unlock(&xsoftc.xpt_lock);
 		}
-		devq->active_dev = device;
 		cam_ccbq_remove_ccb(&device->ccbq, work_ccb);
-
 		cam_ccbq_send_ccb(&device->ccbq, work_ccb);
 
 		devq->send_openings--;
@@ -3367,8 +3365,6 @@
 		 */
 		sim = work_ccb->ccb_h.path->bus->sim;
 		(*(sim->sim_action))(sim, work_ccb);
-
-		devq->active_dev = NULL;
 	}
 	devq->send_queue.qfrozen_cnt--;
 }
@@ -4099,45 +4095,18 @@
 u_int32_t
 xpt_freeze_devq(struct cam_path *path, u_int count)
 {
-	struct ccb_hdr *ccbh;
 
 	mtx_assert(path->bus->sim->mtx, MA_OWNED);
-
 	path->device->ccbq.queue.qfrozen_cnt += count;
-
-	/*
-	 * Mark the last CCB in the queue as needing
-	 * to be requeued if the driver hasn't
-	 * changed it's state yet.  This fixes a race
-	 * where a ccb is just about to be queued to
-	 * a controller driver when it's interrupt routine
-	 * freezes the queue.  To completly close the
-	 * hole, controller drives must check to see
-	 * if a ccb's status is still CAM_REQ_INPROG
-	 * just before they queue
-	 * the CCB.  See ahc_action/ahc_freeze_devq for
-	 * an example.
-	 */
-	ccbh = TAILQ_LAST(&path->device->ccbq.active_ccbs, ccb_hdr_tailq);
-	if (ccbh && ccbh->status == CAM_REQ_INPROG)
-		ccbh->status = CAM_REQUEUE_REQ;
 	return (path->device->ccbq.queue.qfrozen_cnt);
 }
 
 u_int32_t
 xpt_freeze_simq(struct cam_sim *sim, u_int count)
 {
+
 	mtx_assert(sim->mtx, MA_OWNED);
-
 	sim->devq->send_queue.qfrozen_cnt += count;
-	if (sim->devq->active_dev != NULL) {
-		struct ccb_hdr *ccbh;
-
-		ccbh = TAILQ_LAST(&sim->devq->active_dev->ccbq.active_ccbs,
-				  ccb_hdr_tailq);
-		if (ccbh && ccbh->status == CAM_REQ_INPROG)
-			ccbh->status = CAM_REQUEUE_REQ;
-	}
 	return (sim->devq->send_queue.qfrozen_cnt);
 }
 
From jona at FreeBSD.org  Thu Nov 12 14:24:29 2009
From: jona at FreeBSD.org (Jonathan Anderson)
Date: Thu Nov 12 14:24:36 2009
Subject: PERFORCE change 170545 for review
Message-ID: <200911121424.nACEOSZM066732@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170545

Change 170545 by jona@jona-capsicum-belle64 on 2009/11/12 14:23:34

	Some CSU cleanup

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#5 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#6 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#5 (text+ko) ====

@@ -44,7 +44,6 @@
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern int cap_main(int, char **, char **) __attribute__((weak));
 extern void _start(char **, void (*)(void));
 extern void _capstart(char **, void (*)(void));
 

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#6 (text+ko) ====

@@ -54,11 +54,14 @@
 
 
 
-int cap_main(int argc, char **argv, char **env)
+extern int cap_main(int, char **, char **) __attribute__((weak));
+int cap_main(__unused int argc, __unused char **argv, __unused char **env)
 {
 	const char warning[] =
 		"ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n";
 
 	write(2, warning, sizeof(warning));
+
+	return -1;
 }
 

==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#5 (text+ko) ====

@@ -43,7 +43,6 @@
 extern void _fini(void);
 extern void _init(void);
 extern int main(int, char **, char **);
-extern int cap_main(int, char **, char **) __attribute__((weak));
 extern void _start(char *, ...);
 extern void _capstart(char *, ...);
 
@@ -148,8 +147,8 @@
 #endif
 	atexit(_fini);
 #ifdef GCRT
-	monstartup(&eprol, &etext);
-__asm__("eprol:");
+/*	monstartup(&eprol, &etext);
+__asm__("eprol:");*/
 #endif
 	_init();
 	exit( cap_main(argc, argv, env) );
From raj at FreeBSD.org  Thu Nov 12 15:03:08 2009
From: raj at FreeBSD.org (Rafal Jaworowski)
Date: Thu Nov 12 15:03:15 2009
Subject: PERFORCE change 170548 for review
Message-ID: <200911121503.nACF37kX070614@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170548

Change 170548 by raj@raj_fdt on 2009/11/12 15:02:49

	Adjust tests makefile to run on FreeBSD host.
	
	We pass all cases from the included testsuite:
	
	cd sys/contrib/dtc
	gmake
	gmake tests
	cd tests
	./run_tests.sh
	
	<< ... >>
	
	********** TEST SUMMARY
	*     Total testcases:	1248
	*                PASS:	1248
	*                FAIL:	0
	*   Bad configuration:	0
	* Strange test result:	0
	**********

Affected files ...

.. //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#2 edit

Differences ...

==== //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#2 (text+ko) ====

@@ -43,7 +43,7 @@
 
 $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(LIBFDT_archive)
 	@$(VECHO) LD [libdl] $@
-	$(LINK.c) -o $@ $^ -ldl
+	$(LINK.c) -o $@ $^
 
 $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o $(LIBFDT_archive)
 
From hselasky at FreeBSD.org  Thu Nov 12 16:21:27 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Thu Nov 12 16:21:32 2009
Subject: PERFORCE change 170553 for review
Message-ID: <200911121621.nACGLQiO077283@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170553

Change 170553 by hselasky@hselasky_laptop001 on 2009/11/12 16:20:44

	
	USB audio:
	  - remove volume alignment (was previously not correctly implemented)
	  - reported by: Jaakko Heinonen, jh @

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#61 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#61 (text+ko) ====

@@ -118,7 +118,6 @@
 	int32_t	maxval;
 #define	MIX_MAX_CHAN 8
 	int32_t	wValue[MIX_MAX_CHAN];	/* using nchan */
-	uint32_t mod;		/* modulus */
 	uint32_t mul;
 	uint32_t ctl;
 
@@ -1573,9 +1572,7 @@
 	if (mc->type == MIX_ON_OFF) {
 		mc->minval = 0;
 		mc->maxval = 1;
-		mc->mod = 1;
 	} else if (mc->type == MIX_SELECTOR) {
-		mc->mod = 1;
 	} else {
 
 		/* determine min and max values */
@@ -1603,11 +1600,8 @@
 
 		/* compute value alignment */
 		res = uaudio_mixer_get(sc->sc_udev, GET_RES, mc);
-		if (res == 0)
-			res = 1;
-		mc->mod = mc->mul / res;
-		if (mc->mod == 0)
-			mc->mod = 1;
+
+		DPRINTF("Resolution = %d\n", (int)res);
 	}
 
 	uaudio_mixer_add_ctl_sub(sc, mc);
@@ -3100,9 +3094,6 @@
 		/* compute actual volume */
 		val = (val * mc->mul) / 255;
 
-		/* align volume level */
-		val = val - (val % mc->mod);
-
 		/* add lower offset */
 		val = val + mc->minval;
 
From rwatson at FreeBSD.org  Thu Nov 12 18:12:21 2009
From: rwatson at FreeBSD.org (Robert Watson)
Date: Thu Nov 12 18:12:30 2009
Subject: PERFORCE change 170558 for review
Message-ID: <200911121812.nACICHBt097350@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170558

Change 170558 by rwatson@rwatson_vimage_client on 2009/11/12 18:11:34

	Integrate TrustedBSD capabilities branch.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/UPDATING#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/cat/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/csh/iconv_stub.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/getfacl/getfacl.1#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/ls/ls.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/ps/keyword.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/arith_lex.l#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/expand.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/sh/trap.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/bin/uuidgen/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dighost.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/ee/ee.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/i386/i386.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/inet.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/doc/man/pam.conf.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_namespace.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/gettytab#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/bgfsck#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/cleartmp#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/fsck#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/hostid#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/hostname#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/jail#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ldconfig#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/motd#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/mountcritlocal#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/moused#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netif#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/newsyslog#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/nfsclient#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/pf#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/savecore#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes-o.real#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/number/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/games/number/number.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libgcov/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/kerberos5/lib/libgssapi_krb5/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libbluetooth/bluetooth.3#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libbluetooth/bluetooth.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#16 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/errlst.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fmtmsg.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getcwd.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawn.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/pselect.3#2 delete
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/pselect.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/wordexp.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/include/namespace.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/include/un-namespace.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isblank.3#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/gai_strerror.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/getnameinfo.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/ip6opt.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/C.msg#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/Makefile.inc#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Makefile.inc#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#18 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/accept.2#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/mmap.2#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/nanosleep.2#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pselect.2#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libfetch/common.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_i386.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/libpmc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc_attach.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libstand/open.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libstand/udp.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/ia64/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/pthread.map#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_private.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_syscalls.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10_desc.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10_io.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20_desc.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20_ugen20.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/README#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/share/mk/doc.relnotes.mk#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/share/sgml/release.dsl#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/picobsd/bridge/PICOBSD#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/release/scripts/package-split.py#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/adjkerntz/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/atacontrol/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/atm/atmconfig/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/badsect/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/bsdlabel/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ccdconfig/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/clri/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/comcontrol/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/conscontrol/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ddb/ddb_capture.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/bpf.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/dhcpd.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/packet.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dmesg/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dump/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/dumpfs.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/dumpon/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/geom_part.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/gpart.8#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ggate/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/growfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/gvinum/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/af_nd6.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.8#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifieee80211.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/init/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ipf/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/iscontrol/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/kldunload/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/ldconfig/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/md5/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mdconfig/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mdmfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mknod/mknod.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mksnap_ffs/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.8#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_autofs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_cd9660/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_ext2fs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_msdosfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nfs/mount_nfs.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nullfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_reiserfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/mount_unionfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/newfs_msdos/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/nfsiod/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/pfctl/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/rcorder/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/reboot/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/reboot/reboot.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/recoverdisk/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/routed/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/savecore/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/sconfig/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/shutdown/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/spppcontrol/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/swapon/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/sysctl/sysctl.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/tunefs/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sbin/tunefs/tunefs.8#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/lib/libssh/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/bdes/bdes.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/chpmon.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/eltsub.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/eltsub.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getencstat.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getnobj.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getobjmap.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getobjstat.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/inienc.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/sesd.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/setencstat.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/setobjstat.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man3/tree.3#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/Makefile#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/acpi_hp.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/acpi_wmi.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ata.4#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/atapicam.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bce.4#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/hifn.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/hptrr.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ichwd.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/iwn.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/iwnfw.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/lindev.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mac_mls.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/malo.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/msk.4#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/netintro.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/sbp_targ.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/targ.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/tty.4#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/umass.4#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man4/urtw.4#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/ar.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/make.conf.5#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/msdosfs.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/rc.conf.5#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man5/regdomain.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man7/adding_user.7#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/BUS_BIND_INTR.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/man/man9/get_cyclecount.9#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/bsd-family-tree#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-src.dot#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/iso3166#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/misc/organization.dot#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.sys.mk#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.SJIS.src#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.UTF-8.src#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.eucJP.src#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/antarctica#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/asia#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/australasia#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/europe#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/southamerica#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/zone.tab#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/identcpu.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/initcpu.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/intr_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/machdep.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mp_machdep.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/vm_machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/GENERIC#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/ia32/ia32_signal.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/intr_machdep.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/isa/isa_dma.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/db_trace.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/gdb_machdep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/vm_machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/HL200#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/KB920X#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_sata.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/boot.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/commands.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/uboot/lib/glue.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/zfs/zfs.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/boot/zfs/zfsimpl.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_da.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_pmp.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_ccb.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_queue.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_queue.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt_internal.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_all.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_cd.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_ch.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_da.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_low.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_pt.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_sa.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_sg.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_target.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_xpt.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/boot/zfs/zfsimpl.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/vnode.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#20 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#16 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ipc.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_socket.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/kern_ndis.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/kern_windrv.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_ndis.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_pe.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_usbd.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios_alloc.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#20 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.amd64#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.i386#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.ia64#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#15 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/changes.txt#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adfile.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adisasm.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adwalk.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acapps.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdebug.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpixf.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/LICENSE#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/rdma/krping/krping.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu_util.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aac.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aac_cam.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aacreg.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aacvar.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_aiboost.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_cpu.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_hpet.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpivar.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/agp/agp_i810.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/amr/amr.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_anreg.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/arcmsr/arcmsr.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/arcmsr/arcmsr.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-all.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-all.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-disk.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-dma.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-pci.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-raid.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-sata.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-cam.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-cd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-fd.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-tape.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-ahci.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-intel.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-promise.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-via.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/if_ath.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/atkbdc/atkbd.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bce.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bcereg.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bwi/if_bwi.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/bwi/if_bwivar.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/dpms/dpms.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drmP.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_pciids.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_scatter.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/i915_drv.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/mach64_state.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/r600_blit.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_cp.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/e1000/if_igb.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vgareg.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/fdc/fdc.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/gem/if_gem_pci.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hptrr/hptrr_osm_bsd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ichwd/ichwd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ieee488/ibfoo.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/if_ndis/if_ndis.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/if_ndis/if_ndis_usb.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_sbus.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/iwn/if_iwn.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/iwn/if_iwnreg.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/iwn/if_iwnvar.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgb/if_ixgb.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgb/if_ixgb.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgbe/ixgbe.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/miidevs#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt_cam.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt_raid.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_msk.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_mskreg.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mwl/if_mwl_pci.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge_var.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/nfe/if_nfe.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/vga_pci.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpt.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/pcfclock.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/re/if_re.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/siis/siis.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sk/if_sk.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/stge/if_stge.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/sym/sym_hipd.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scterm-teken.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_mbus.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehcireg.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_atmelarm.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_pci.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohcireg.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci_pci.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhcireg.h#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/atp.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/uhid.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ums.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uch341.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#18 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdi.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uath.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_ural.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwreg.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwvar.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/vge/if_vge.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/vge/if_vgevar.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/wpi/if_wpi.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clsubs.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/smbfs/smbfs_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_subr.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/concat/g_concat.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/label/g_label.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/shsec/g_shsec.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/stripe/g_stripe.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/apm.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/GENERIC#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/NOTES#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/identcpu.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/initcpu.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/intr_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/machdep.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/nexus.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/vm_machdep.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/intr_machdep.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/isa/isa_dma.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysvec.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/pmap.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/conf/GENERIC#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/highfp.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/interrupt.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/pmap.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/trap.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/asm.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/md_var.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/param.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/proc.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/isa/vga_isa.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/bus_if.m#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#41 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_context.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_cpuset.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_event.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#23 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#19 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_idle.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_jail.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_ktrace.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_shutdown.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thr.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thread.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_4bsd.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_ule.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/stack_protector.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_log.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_prf.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_taskqueue.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_trap.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_generic.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_process.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#41 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#22 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#40 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sysv_shm.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_ttydisc.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#17 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_acl.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_default.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_mount.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/libkern/inet_aton.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/pcb.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/pm_machdep.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/pmap.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/trap.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/Makefile#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/cam/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/dpms/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/ichwd/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/iwn4965/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/iwn5000/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/iwn5150/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfsclient/Makefile#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/pf/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/ubser/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/Makefile#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/atp/Makefile#1 branch
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/uch341/Makefile#2 delete
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/ucom/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/vesa/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/modules/x86bios/Makefile#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_bridge.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ef.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_enc.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ethersubr.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_gif.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/if_var.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/pfil.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net/pfil.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_action.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_hwmp.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_ioctl.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_output.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_proto.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/NOTES#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_bridge.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_eiface.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_fec.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_iface.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_sppp.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fastfwd.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_input.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_ipsec.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_ipsec.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_output.c#13 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_var.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw2.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias_proxy.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/raw_ip.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_bsd_addr.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_cc_functions.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_os_bsd.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_output.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_pcb.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_output.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/icmp6.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6.c#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_forward.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_input.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_output.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_var.h#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/nd6.c#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nfsclient/nfs_kdtrace.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nfsclient/nfs_vnops.c#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_impl.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_server.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/pc98/cbus/cbus_dma.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/pc98/cbus/scterm-sck.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/pc98/conf/GENERIC#10 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/clock.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/copyinout.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/mmu_oea.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/mmu_oea64.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/mp_cpudep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/platform_chrp.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/swtch.S#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/trap.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/trap_subr.S#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/vm_machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/machdep.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/mp_cpudep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/pmap.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/trap.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/vm_machdep.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/hid.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pcpu.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pmap.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/smp.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/spr.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powermac/hrowpic.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/cpu.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/mmu_if.m#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/mp_machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/stack_machdep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/rpc/clnt_vc.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/conf/GENERIC#12 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/in_cksum.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/pcb.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/machdep.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/trap.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/vm_machdep.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/machdep.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/pmap.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/trap.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/aac_ioctl.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/ata.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/bus.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/conf.h#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/errno.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/fbio.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/interrupt.h#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/kernel.h#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/ktrace.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/mman.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/msgbuf.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/param.h#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/priv.h#11 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/proc.h#14 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/signalvar.h#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/sockio.h#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#41 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#41 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscallsubr.h#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#41 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/time.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/ttyqueue.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/teken/sequences#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/teken/teken.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/teken/teken.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/teken/teken_subr.h#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/tools/fw_stub.awk#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/tools/makeobjops.awk#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/pmap.h#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/swap_pager.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_extern.h#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_fault.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#9 integrate
.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_zeroidle.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/expansion/question1.0#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/expansion/set-u1.0#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/expansion/set-u2.0#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/fstest/tests/rename/21.t#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libc/gen/test-wordexp.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-flopen.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-grp.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-pidfile.c#1 branch
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-trimdomain.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/regression/tmpfs/h_tools.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/tools/tools/netrate/netsend/netsend.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/unbzip2.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/kdump/kdump.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/leave/leave.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/logger/logger.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/job.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/main.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/route.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/systat/keyboard.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/systat/main.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/tail/tail.1#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/touch/touch.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.bin/vmstat/vmstat.c#6 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/iasl/Makefile#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/crashinfo/crashinfo.sh#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/i2c/i2c.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/jail/jail.8#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/nfsd/stablerestart.5#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/ntp/doc/ntpd.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/Makefile#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/acpi.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/acpidump.h#2 delete
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/biosmptable.c#2 delete
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/cdrom.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/dist.c#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/install.c#7 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/menus.c#8 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/sysinstall.8#5 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/tcpip.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/tzsetup/tzsetup.8#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/tzsetup/tzsetup.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/usbconfig/dump.c#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/usbconfig/usbconfig.8#3 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/vidcontrol/vidcontrol.1#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/wake/wake.8#2 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/zic/zdump.c#4 integrate
.. //depot/projects/trustedbsd/capabilities/src/usr.sbin/zic/zic.8#4 integrate

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -272,7 +272,7 @@
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \
-		-iprefix ${LIB32TMP}/usr/ \
+		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
 
@@ -599,11 +599,14 @@
 .if ${MK_INFO} != "no"
 _install-info=	install-info
 .endif
+.if ${MK_ZONEINFO} != "no"
+_zoneinfo=	zic tzsetup
+.endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
-	test true uname wc zic
+	test true uname wc ${_zoneinfo}
 
 #
 # distributeworld
@@ -929,6 +932,10 @@
 _mklocale=	usr.bin/mklocale
 .endif
 
+.if ${BOOTSTRAPPING} < 900002
+_sed=		usr.bin/sed
+.endif
+
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -954,6 +961,7 @@
     usr.bin/makewhatis \
     ${_mklocale} \
     usr.bin/rpcgen \
+    ${_sed} \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
@@ -1033,7 +1041,6 @@
 .for _tool in \
     gnu/usr.bin/binutils \
     gnu/usr.bin/cc \
-    usr.bin/sed \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
@@ -1122,7 +1129,7 @@
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \
+kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
     lib/libcrypt__L

==== //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20091027: pselect.3 implemented as syscall
+OLD_FILES+=usr/share/man/man3/pselect.3.gz
+# 20091005: fusword.9 and susword.9 removed
+OLD_FILES+=usr/share/man/man9/fusword.9.gz
+OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
@@ -26,6 +31,49 @@
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
+# 20090812: net80211 documentation overhaul
+OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
+OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20090719: library version bump for 8.0
@@ -503,6 +551,8 @@
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
+OLD_FILES+=usr/sbin/usbdevs
+OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h

==== //depot/projects/trustedbsd/capabilities/src/UPDATING#12 (text+ko) ====

@@ -22,6 +22,19 @@
 	machines to maximize performance.  (To disable malloc debugging, run

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From mav at FreeBSD.org  Thu Nov 12 20:15:28 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Thu Nov 12 20:15:35 2009
Subject: PERFORCE change 170571 for review
Message-ID: <200911122015.nACKFRKu008763@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170571

Change 170571 by mav@mav_mavbook on 2009/11/12 20:14:54

	Fix several device freeze counting bugs.
	Assert correct reference counting instead of blindly ignoring problems.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#43 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#128 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#29 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#20 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#43 (text+ko) ====

@@ -981,15 +981,21 @@
 {
 	union ccb      *saved_ccb;
 	cam_status	status;
-	int		frozen;
+	int		frozen = 0;
 	int		sense;
 	struct scsi_start_stop_unit *scsi_cmd;
 	u_int32_t	relsim_flags, timeout;
-	int		xpt_done_ccb;
+	int		xpt_done_ccb = FALSE;
 
-	xpt_done_ccb = FALSE;
 	status = done_ccb->ccb_h.status;
-	frozen = (status & CAM_DEV_QFRZN) != 0;
+	if (status & CAM_DEV_QFRZN) {
+		frozen = 1;
+		/*
+		 * Clear freeze flag now for case of retry,
+		 * freeze will be dropped later.
+		 */
+		done_ccb->ccb_h.status &= ~CAM_DEV_QFRZN;
+	}
 	sense  = (status & CAM_AUTOSNS_VALID) != 0;
 	status &= CAM_STATUS_MASK;
 
@@ -997,17 +1003,6 @@
 	relsim_flags = 0;
 	saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr;
 
-	/* 
-	 * Unfreeze the queue once if it is already frozen..
-	 */
-	if (frozen != 0) {
-		cam_release_devq(done_ccb->ccb_h.path,
-				 /*relsim_flags*/0,
-				 /*openings*/0,
-				 /*timeout*/0,
-				 /*getcount_only*/0);
-	}
-
 	switch (status) {
 	case CAM_REQ_CMP:
 	{
@@ -1184,14 +1179,33 @@
 	 */
 	if (done_ccb->ccb_h.retry_count > 0)
 		done_ccb->ccb_h.retry_count--;
-
+	/*
+	 * Drop freeze taken due to CAM_DEV_QFREEZE flag set on recovery
+	 * request.
+	 */
 	cam_release_devq(done_ccb->ccb_h.path,
 			 /*relsim_flags*/relsim_flags,
 			 /*openings*/0,
 			 /*timeout*/timeout,
 			 /*getcount_only*/0);
-	if (xpt_done_ccb == TRUE)
+	if (xpt_done_ccb == TRUE) {
+		/*
+		 * Copy frozen flag from recovery request if it is set there
+		 * for some reason.
+		 */
+		if (frozen != 0)
+			done_ccb->ccb_h.status |= CAM_DEV_QFRZN;
 		(*done_ccb->ccb_h.cbfcnp)(periph, done_ccb);
+	} else {
+		/* Drop freeze taken, if this recovery request got error. */
+		if (frozen != 0) {
+			cam_release_devq(done_ccb->ccb_h.path,
+				 /*relsim_flags*/0,
+				 /*openings*/0,
+				 /*timeout*/0,
+				 /*getcount_only*/0);
+		}
+	}
 }
 
 /*
@@ -1451,6 +1465,11 @@
 				action_string = "No recovery CCB supplied";
 				goto sense_error_done;
 			}
+			/*
+			 * Clear freeze flag for original request here, as
+			 * this freeze will be dropped as part of ERESTART.
+			 */
+			ccb->ccb_h.status &= ~CAM_DEV_QFRZN;
 			bcopy(ccb, save_ccb, sizeof(*save_ccb));
 			print_ccb = save_ccb;
 			periph->flags |= CAM_PERIPH_RECOVERY_INPROG;

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#128 (text+ko) ====

@@ -4131,45 +4131,36 @@
 static void
 xpt_release_devq_device(struct cam_ed *dev, u_int count, int run_queue)
 {
-	int	rundevq;
 
-	rundevq = 0;
-	if (dev->ccbq.queue.qfrozen_cnt > 0) {
-
-		count = (count > dev->ccbq.queue.qfrozen_cnt) ?
-		    dev->ccbq.queue.qfrozen_cnt : count;
-		dev->ccbq.queue.qfrozen_cnt -= count;
-		if (dev->ccbq.queue.qfrozen_cnt == 0) {
-
-			/*
-			 * No longer need to wait for a successful
-			 * command completion.
-			 */
-			dev->flags &= ~CAM_DEV_REL_ON_COMPLETE;
-
-			/*
-			 * Remove any timeouts that might be scheduled
-			 * to release this queue.
-			 */
-			if ((dev->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0) {
-				callout_stop(&dev->callout);
-				dev->flags &= ~CAM_DEV_REL_TIMEOUT_PENDING;
-			}
-
-			/*
-			 * Now that we are unfrozen schedule the
-			 * device so any pending transactions are
-			 * run.
-			 */
-			if ((dev->ccbq.queue.entries > 0)
-			 && (xpt_schedule_dev_sendq(dev->target->bus, dev))
-			 && (run_queue != 0)) {
-				rundevq = 1;
-			}
+	KASSERT(count <= dev->ccbq.queue.qfrozen_cnt,
+	    ("xpt_release_devq: requested %u > present %u\n",
+	    count, dev->ccbq.queue.qfrozen_cnt));
+	dev->ccbq.queue.qfrozen_cnt -= count;
+	if (dev->ccbq.queue.qfrozen_cnt == 0) {
+		/*
+		 * No longer need to wait for a successful
+		 * command completion.
+		 */
+		dev->flags &= ~CAM_DEV_REL_ON_COMPLETE;
+		/*
+		 * Remove any timeouts that might be scheduled
+		 * to release this queue.
+		 */
+		if ((dev->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0) {
+			callout_stop(&dev->callout);
+			dev->flags &= ~CAM_DEV_REL_TIMEOUT_PENDING;
+		}
+		/*
+		 * Now that we are unfrozen schedule the
+		 * device so any pending transactions are
+		 * run.
+		 */
+		if ((dev->ccbq.queue.entries > 0)
+		 && (xpt_schedule_dev_sendq(dev->target->bus, dev))
+		 && (run_queue != 0)) {
+			xpt_run_dev_sendq(dev->target->bus);
 		}
 	}
-	if (rundevq != 0)
-		xpt_run_dev_sendq(dev->target->bus);
 }
 
 void
@@ -4178,32 +4169,30 @@
 	struct	camq *sendq;
 
 	mtx_assert(sim->mtx, MA_OWNED);
-
 	sendq = &(sim->devq->send_queue);
-	if (sendq->qfrozen_cnt > 0) {
+	KASSERT(sendq->qfrozen_cnt > 0,
+	    ("xpt_release_simq: requested 1 > present %u\n",
+	    sendq->qfrozen_cnt));
+	sendq->qfrozen_cnt--;
+	if (sendq->qfrozen_cnt == 0) {
+		/*
+		 * If there is a timeout scheduled to release this
+		 * sim queue, remove it.  The queue frozen count is
+		 * already at 0.
+		 */
+		if ((sim->flags & CAM_SIM_REL_TIMEOUT_PENDING) != 0){
+			callout_stop(&sim->callout);
+			sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING;
+		}
+		if (run_queue) {
+			struct cam_eb *bus;
 
-		sendq->qfrozen_cnt--;
-		if (sendq->qfrozen_cnt == 0) {
 			/*
-			 * If there is a timeout scheduled to release this
-			 * sim queue, remove it.  The queue frozen count is
-			 * already at 0.
+			 * Now that we are unfrozen run the send queue.
 			 */
-			if ((sim->flags & CAM_SIM_REL_TIMEOUT_PENDING) != 0){
-				callout_stop(&sim->callout);
-				sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING;
-			}
-
-			if (run_queue) {
-				struct cam_eb *bus;
-
-				/*
-				 * Now that we are unfrozen run the send queue.
-				 */
-				bus = xpt_find_bus(sim->path_id);
-				xpt_run_dev_sendq(bus);
-				xpt_release_bus(bus);
-			}
+			bus = xpt_find_bus(sim->path_id);
+			xpt_run_dev_sendq(bus);
+			xpt_release_bus(bus);
 		}
 	}
 }

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#29 (text+ko) ====

@@ -1570,7 +1570,8 @@
 			bp->bio_resid = bp->bio_bcount;
 			bp->bio_error = error;
 			bp->bio_flags |= BIO_ERROR;
-			cam_release_devq(done_ccb->ccb_h.path,
+			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
+				cam_release_devq(done_ccb->ccb_h.path,
 					 /*relsim_flags*/0,
 					 /*reduction*/0,
 					 /*timeout*/0,
@@ -1658,7 +1659,8 @@
 				struct ccb_getdev cgd;
 
 				/* Don't wedge this device's queue */
-				cam_release_devq(done_ccb->ccb_h.path,
+				if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
+					cam_release_devq(done_ccb->ccb_h.path,
 						 /*relsim_flags*/0,
 						 /*reduction*/0,
 						 /*timeout*/0,

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#20 (text+ko) ====

@@ -606,7 +606,8 @@
 					retry_scheduled = 0;
 
 				/* Don't wedge this device's queue */
-				cam_release_devq(done_ccb->ccb_h.path,
+				if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
+					cam_release_devq(done_ccb->ccb_h.path,
 						 /*relsim_flags*/0,
 						 /*reduction*/0,
 						 /*timeout*/0,
From mav at FreeBSD.org  Fri Nov 13 22:38:36 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Fri Nov 13 22:38:42 2009
Subject: PERFORCE change 170602 for review
Message-ID: <200911132238.nADMcZ5a020665@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170602

Change 170602 by mav@mav_mavtest on 2009/11/13 22:38:16

	Do not enable tagged commands if controller does't support tags.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#57 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#57 (text+ko) ====

@@ -719,7 +719,8 @@
 		/* XXX: If not all tags allowed, we must to tell SIM which are. */
 		if (path->device->mintags < path->bus->sim->max_tagged_dev_openings)
 			path->device->mintags = path->device->maxtags = 0;
-		if (path->device->mintags != 0) {
+		if (path->device->mintags != 0 &&
+		    path->bus->sim->max_tagged_dev_openings != 0) {
 			xpt_start_tags(path);
 		}
 		ata_device_transport(path);
From mav at FreeBSD.org  Sat Nov 14 08:31:29 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Sat Nov 14 08:31:35 2009
Subject: PERFORCE change 170610 for review
Message-ID: <200911140831.nAE8VSga094457@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170610

Change 170610 by mav@mav_mavtest on 2009/11/14 08:31:22

	Honor HBA SNCQ capability bit whan reporting NCQ support.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#79 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#79 (text+ko) ====

@@ -734,7 +734,9 @@
 	/* Construct SIM entry */
 	ch->sim = cam_sim_alloc(ahciaction, ahcipoll, "ahcich", ch,
 	    device_get_unit(dev), &ch->mtx,
-	    min(2, ch->numslots), ch->numslots, devq);
+	    min(2, ch->numslots),
+	    (ch->caps & AHCI_CAP_SNCQ) ? ch->numslots : 0,
+	    devq);
 	if (ch->sim == NULL) {
 		device_printf(dev, "unable to allocate sim\n");
 		error = ENOMEM;
@@ -2119,7 +2121,9 @@
 		struct ccb_pathinq *cpi = &ccb->cpi;
 
 		cpi->version_num = 1; /* XXX??? */
-		cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE;
+		cpi->hba_inquiry = PI_SDTR_ABLE;
+		if (ch->caps & AHCI_CAP_SNCQ)
+			cpi->hba_inquiry |= PI_TAG_ABLE;
 		if (ch->caps & AHCI_CAP_SPM)
 			cpi->hba_inquiry |= PI_SATAPM;
 		cpi->target_sprt = 0;
From hselasky at FreeBSD.org  Sat Nov 14 13:55:53 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov 14 13:56:00 2009
Subject: PERFORCE change 170613 for review
Message-ID: <200911141355.nAEDtqrd043378@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170613

Change 170613 by hselasky@hselasky_laptop001 on 2009/11/14 13:55:00

	
	USB CORE:
		 - fix compilation without power daemon

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#23 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#35 (text+ko) ====

@@ -214,12 +214,13 @@
 
 		USB_BUS_UNLOCK(bus);
 
+#if USB_HAVE_POWERD
 		/*
 		 * First update the USB power state!
 		 */
 		usb_bus_powerd(bus);
-
-		 /* Explore the Root USB HUB. */
+#endif
+		/* Explore the Root USB HUB. */
 		(udev->hub->explore) (udev);
 		USB_BUS_LOCK(bus);
 	}
@@ -275,11 +276,13 @@
 	 */
 	usb_proc_rewakeup(&bus->explore_proc);	/* recover from DDB */
 
+#if USB_HAVE_POWERD
 	USB_BUS_UNLOCK(bus);
 
 	usb_bus_power_update(bus);
 
 	USB_BUS_LOCK(bus);
+#endif
 }
 
 /*------------------------------------------------------------------------*

==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#23 (text+ko) ====

@@ -438,8 +438,10 @@
 
 	USB_BUS_UNLOCK(bus);
 
+#if USB_HAVE_POWERD
 	/* In case we are out of sync, update the power state. */
 	usb_bus_power_update(udev->bus);
+#endif
 	return (0);			/* success */
 }
 
From hselasky at FreeBSD.org  Sat Nov 14 14:50:48 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov 14 14:50:54 2009
Subject: PERFORCE change 170616 for review
Message-ID: <200911141450.nAEEolwc048560@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170616

Change 170616 by hselasky@hselasky_laptop001 on 2009/11/14 14:50:39

	
	USB CORE:
	  - fix compiler warnings

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#58 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#58 (text+ko) ====

@@ -2190,12 +2190,12 @@
 #ifdef USB_VERBOSE
 	const struct usb_knowndev *kdp;
 #endif
-	uint8_t *temp_ptr;
+	char *temp_ptr;
 	size_t temp_size;
 	uint16_t vendor_id;
 	uint16_t product_id;
 
-	temp_ptr = udev->bus->scratch[0].data;
+	temp_ptr = (char *)udev->bus->scratch[0].data;
 	temp_size = sizeof(udev->bus->scratch[0].data);
 
 	vendor_id = UGETW(udd->idVendor);
From hselasky at FreeBSD.org  Sat Nov 14 19:07:05 2009
From: hselasky at FreeBSD.org (Hans Petter Selasky)
Date: Sat Nov 14 19:07:11 2009
Subject: PERFORCE change 170623 for review
Message-ID: <200911141907.nAEJ74Sp083744@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170623

Change 170623 by hselasky@hselasky_laptop001 on 2009/11/14 19:06:55

	
	USB controller:
		- fix compile warnings for latest version of GCC 4.x

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#41 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#29 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#29 (text+ko) ====

@@ -894,6 +894,7 @@
 
 	/* setup temp */
 
+	temp.pc = NULL;
 	temp.td = NULL;
 	temp.td_next = xfer->td_start[0];
 	temp.offset = 0;

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#41 (text+ko) ====

@@ -797,6 +797,7 @@
 
 	/* setup temp */
 
+	temp.pc = NULL;
 	temp.td = NULL;
 	temp.td_next = xfer->td_start[0];
 	temp.offset = 0;

==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#14 (text+ko) ====

@@ -767,6 +767,7 @@
 
 	/* setup temp */
 
+	temp.pc = NULL;
 	temp.td = NULL;
 	temp.td_next = xfer->td_start[0];
 	temp.offset = 0;

==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#27 (text+ko) ====

@@ -1144,6 +1144,7 @@
 
 	/* setup temp */
 
+	temp.pc = NULL;
 	temp.td = NULL;
 	temp.td_next = xfer->td_start[0];
 	temp.offset = 0;

==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#29 (text+ko) ====

@@ -858,6 +858,7 @@
 
 	/* setup temp */
 
+	temp.pc = NULL;
 	temp.td = NULL;
 	temp.td_next = xfer->td_start[0];
 	temp.offset = 0;
From mav at FreeBSD.org  Sat Nov 14 19:48:47 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Sat Nov 14 19:48:54 2009
Subject: PERFORCE change 170625 for review
Message-ID: <200911141948.nAEJmk4l086655@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170625

Change 170625 by mav@mav_mavbook on 2009/11/14 19:48:04

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/UPDATING#22 integrate
.. //depot/projects/scottl-camlock/src/bin/sh/trap.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#3 integrate
.. //depot/projects/scottl-camlock/src/etc/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#3 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#4 integrate
.. //depot/projects/scottl-camlock/src/etc/root/dot.profile#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/getnameinfo.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/net/ip6opt.c#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#6 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#7 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/ttys#3 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#9 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#5 integrate
.. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#4 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#2 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#3 integrate
.. //depot/projects/scottl-camlock/src/share/misc/organization.dot#2 integrate
.. //depot/projects/scottl-camlock/src/share/skel/dot.profile#3 integrate
.. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#5 integrate
.. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#5 integrate
.. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#36 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/Makefile.inc#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/boot.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#58 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#43 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#55 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#37 integrate
.. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/krping.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#23 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/vga_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/est.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#23 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#20 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.c#37 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if.h#16 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_var.h#27 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_action.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#15 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_proxy.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#27 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_fha.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/cbus_dma.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#33 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/priv.h#17 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#11 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-flopen.c#5 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-grp.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-trimdomain.c#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/Files/root/.profile#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/rescue/Files/etc/ttys#2 integrate
.. //depot/projects/scottl-camlock/src/tools/tools/tinybsd/conf/wrap/etc/ttys#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/gencat/gencat.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#5 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/systat/main.c#4 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sade/termcap.c#3 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/termcap.c#3 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/UPDATING#22 (text+ko) ====

@@ -22,6 +22,21 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20091113:
+	The default terminal emulation for syscons(4) has been changed
+	from cons25 to xterm on all platforms except pc98.  This means
+	that the /etc/ttys file needs to be updated to ensure correct
+	operation of applications on the console.
+
+	The terminal emulation style can be toggled per window by using
+	vidcontrol(1)'s -T flag.  The TEKEN_CONS25 kernel configuration
+	options can be used to change the compile-time default back to
+	cons25.
+
+	To prevent graphical artifacts, make sure the TERM environment
+	variable is set to match the terminal emulation that is being
+	performed by syscons(4).
+
 20091109:
 	The layout of the structure ieee80211req_scan_result has changed.
 	Applications that require wireless scan results (e.g. ifconfig(8))
@@ -1057,4 +1072,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $
+$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $

==== //depot/projects/scottl-camlock/src/bin/sh/trap.c#3 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.34 2009/06/13 21:10:41 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $");
 
 #include 
 #include 
@@ -244,7 +244,8 @@
 setsignal(int signo)
 {
 	int action;
-	sig_t sig, sigact = SIG_DFL;
+	sig_t sigact = SIG_DFL;
+	struct sigaction sa;
 	char *t;
 
 	if ((t = trap[signo]) == NULL)
@@ -320,9 +321,10 @@
 		case S_IGN:	sigact = SIG_IGN;	break;
 	}
 	*t = action;
-	sig = signal(signo, sigact);
-	if (sig != SIG_ERR && action == S_CATCH)
-		siginterrupt(signo, 1);
+	sa.sa_handler = sigact;
+	sa.sa_flags = 0;
+	sigemptyset(&sa.sa_mask);
+	sigaction(signo, &sa, NULL);
 }
 
 

==== //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#3 (text+ko) ====


==== //depot/projects/scottl-camlock/src/etc/Makefile#5 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $
+# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $
 
 .include 
 
@@ -18,8 +18,13 @@
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
 	rc.subr remote rpc services shells \
-	sysctl.conf syslog.conf \
-	etc.${MACHINE_ARCH}/ttys
+	sysctl.conf syslog.conf
+
+.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
+BIN1+=	etc.${MACHINE}/ttys
+.else
+BIN1+=	etc.${MACHINE_ARCH}/ttys
+.endif
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \

==== //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.amd64/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.amd64/ttys,v 1.19 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.arm/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.arm/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	off  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	off  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.i386/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.i386/ttys,v 1.19 2009/11/13 11:28:54 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.ia64/ttys,v 1.12 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.13 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	off secure
-# Virtual terminals.
-ttyv1	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	off secure
+# Virtual terminals
+ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals. The 'dialup' keyword identifies dialin lines to login,
 # fingerd etc.

==== //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.mips/ttys,v 1.6 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.mips/ttys,v 1.7 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.

==== //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.20 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.21 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -34,15 +34,15 @@
 ttya	"/usr/libexec/getty 3wire.9600"	vt100	off secure
 ttyb	"/usr/libexec/getty 3wire.9600"	vt100	off secure
 # syscons(4)
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/scottl-camlock/src/etc/root/dot.profile#3 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $
+# $FreeBSD: src/etc/root/dot.profile,v 1.22 2009/11/13 05:54:55 ed Exp $
 #
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
 export PATH
 HOME=/root
 export HOME
-TERM=${TERM:-cons25}
+TERM=${TERM:-xterm}
 export TERM
 PAGER=more
 export PAGER

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.24 2009/09/04 07:44:58 des Exp $
+.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.25 2009/11/13 09:03:50 roam Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISGRAPH 3
@@ -50,7 +50,7 @@
 function tests for any printing character except space
 .Pq Ql "\ "
 and other
-locale specific space-like characters.
+locale-specific space-like characters.
 The value of the argument must be representable as an
 .Vt "unsigned char"
 or the value of

==== //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isprint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.25 2009/09/04 07:44:58 des Exp $
+.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.26 2009/11/13 09:07:33 roam Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISPRINT 3
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 The
 .Fn isprint
-function tests for any printing character including space
+function tests for any printing character, including space
 .Pq Ql "\ " .
 The value of the argument must be representable as an
 .Vt "unsigned char"

==== //depot/projects/scottl-camlock/src/lib/libc/net/getnameinfo.c#2 (text+ko) ====

@@ -45,13 +45,14 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.21 2009/11/12 11:54:12 ume Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -385,6 +386,7 @@
 {
 	const struct sockaddr_dl *sdl =
 	    (const struct sockaddr_dl *)(const void *)sa;
+	const struct fw_hwaddr *iha;
 	int n;
 
 	if (serv != NULL && servlen > 0)
@@ -400,6 +402,15 @@
 	}
 
 	switch (sdl->sdl_type) {
+	case IFT_IEEE1394:
+		if (sdl->sdl_alen < sizeof(iha->sender_unique_ID_hi) +
+		    sizeof(iha->sender_unique_ID_lo))
+			return EAI_FAMILY;
+		iha = (const struct fw_hwaddr *)(const void *)LLADDR(sdl);
+		return hexname((const u_int8_t *)&iha->sender_unique_ID_hi,
+		    sizeof(iha->sender_unique_ID_hi) +
+		    sizeof(iha->sender_unique_ID_lo),
+		    host, hostlen);
 	/*
 	 * The following have zero-length addresses.
 	 * IFT_ATM	(net/if_atmsubr.c)

==== //depot/projects/scottl-camlock/src/lib/libc/net/ip6opt.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.8 2005/07/19 18:13:58 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.9 2009/11/11 15:21:06 ume Exp $");
 
 #include 
 #include 
@@ -55,8 +55,7 @@
  * byte, the length byte, and the option data.
  */
 int
-inet6_option_space(nbytes)
-	int nbytes;
+inet6_option_space(int nbytes)
 {
 	nbytes += 2;	/* we need space for nxt-hdr and length fields */
 	return(CMSG_SPACE((nbytes + 7) & ~7));
@@ -68,10 +67,7 @@
  * success or -1 on an error.
  */
 int
-inet6_option_init(bp, cmsgp, type)
-	void *bp;
-	struct cmsghdr **cmsgp;
-	int type;
+inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type)
 {
 	struct cmsghdr *ch = (struct cmsghdr *)bp;
 
@@ -98,11 +94,8 @@
  * earlier.  It must have a value between 0 and 7, inclusive.
  */
 int
-inet6_option_append(cmsg, typep, multx, plusy)
-	struct cmsghdr *cmsg;
-	const u_int8_t *typep;
-	int multx;
-	int plusy;
+inet6_option_append(struct cmsghdr *cmsg, const u_int8_t *typep, int multx,
+    int plusy)
 {
 	int padlen, optlen, off;
 	u_char *bp = (u_char *)cmsg + cmsg->cmsg_len;
@@ -171,11 +164,7 @@
  * 
  */
 u_int8_t *
-inet6_option_alloc(cmsg, datalen, multx, plusy)
-	struct cmsghdr *cmsg;
-	int datalen;
-	int multx;
-	int plusy;
+inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx, int plusy)
 {
 	int padlen, off;
 	u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len;
@@ -238,9 +227,7 @@
  * (RFC 2292, 6.3.5)
  */
 int
-inet6_option_next(cmsg, tptrp)
-	const struct cmsghdr *cmsg;
-	u_int8_t **tptrp;
+inet6_option_next(const struct cmsghdr *cmsg, u_int8_t **tptrp)
 {
 	struct ip6_ext *ip6e;
 	int hdrlen, optlen;
@@ -296,10 +283,7 @@
  *       it's a typo. The variable should be type of u_int8_t **.
  */
 int
-inet6_option_find(cmsg, tptrp, type)
-	const struct cmsghdr *cmsg;
-	u_int8_t **tptrp;
-	int type;
+inet6_option_find(const struct cmsghdr *cmsg, u_int8_t **tptrp, int type)
 {
 	struct ip6_ext *ip6e;
 	int hdrlen, optlen;
@@ -352,8 +336,7 @@
  * calculated length and the limitation of the buffer.
  */
 static int
-ip6optlen(opt, lim)
-	u_int8_t *opt, *lim;
+ip6optlen(u_int8_t *opt, u_int8_t *lim)
 {
 	int optlen;
 

==== //depot/projects/scottl-camlock/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/nl_NL.ISO8859-1.msg,v 1.1 2009/03/13 10:40:38 gabor Exp $
+$ $FreeBSD: src/lib/libc/nls/nl_NL.ISO8859-1.msg,v 1.2 2009/11/11 18:28:12 rene Exp $
 $
 $ Message catalog for nl_NL.ISO8859-1 locale
 $
@@ -26,7 +26,7 @@
 $ ECHILD
 10 Geen kindprocessen
 $ EDEADLK
-11 Een deadlock is vermeden
+11 Een deadlock op een bron is vermeden
 $ ENOMEM
 12 Kan geen geheugen meer verkrijgen
 $ EACCES
@@ -40,13 +40,13 @@
 $ EEXIST
 17 Bestand bestaat reeds
 $ EXDEV
-18 Verwijzing tussen bestanden op verschillende bestandssystemen
+18 Verwijzing tussen verschillende apparaten
 $ ENODEV
 19 Bewerking wordt niet ondersteund door dit apparaat
 $ ENOTDIR
 20 Dit is geen map
 $ EISDIR
-21 Dit is een map 
+21 Dit is een map
 $ EINVAL
 22 Ongeldig argument
 $ ENFILE
@@ -62,7 +62,7 @@
 $ ENOSPC
 28 Geen ruimte meer op dit apparaat
 $ ESPIPE
-29 Onuitvoerbare zoekopdracht
+29 Ongeldige zoekopdracht
 $ EROFS
 30 Van dit bestandssysteem kan alleen worden gelezen
 $ EMLINK
@@ -84,7 +84,7 @@
 $ EDESTADDRREQ
 39 Een bestemmingsadres is vereist
 $ EMSGSIZE
-40 Te grote bericht
+40 Te groot bericht
 $ EPROTOTYPE
 41 Protocol past niet bij dit contactpunt
 $ ENOPROTOOPT
@@ -116,7 +116,7 @@
 $ ENOBUFS
 55 Geen bufferruimte meer beschikbaar
 $ EISCONN
-56 Dit contactpunt is al verbonden
+56 Contactpunt is al verbonden
 $ ENOTCONN
 57 Contactpunt is niet verbonden
 $ ESHUTDOWN
@@ -136,9 +136,9 @@
 $ EHOSTUNREACH
 65 Bestemming niet bereikbaar
 $ ENOTEMPTY
-66 Directory is niet leeg
+66 Map is niet leeg
 $ EPROCLIM
-67 Te veel taken
+67 Te veel processen
 $ EUSERS
 68 Te veel gebruikers
 $ EDQUOT
@@ -160,7 +160,7 @@
 $ ENOLCK
 77 Geen sloten beschikbaar
 $ ENOSYS
-78 Deze systeemfunctie is niet geimplementeerd
+78 Systeemfunctie is niet geimplementeerd
 $ EFTYPE
 79 Bestandsformaat niet van toepassing
 $ EAUTH
@@ -173,30 +173,24 @@
 83 Geen bericht van het gewenste type
 $ EOVERFLOW
 84 Waarde te groot om te bewaren in gegevenstype
+$ ECANCELED
+85 Bewerking geannuleerd
 $ EILSEQ
-85 Ongeldige bytereeks
-$ ENOTSUP
-86 Niet ondersteund
-$ ECANCELED
-87 Bewerking geannuleerd
+86 Ongeldige bytereeks
+$ ENOATTR
+87 Attribuut niet gevonden
+$ EDOOFUS
+88 Programmeerfout
 $ EBADMSG
-88 Verkeerd of defect bericht
-$ ENODATA
-89 Geen bericht beschikbaar
-$ ENOSR
-90 Geen STREAM-voorraad
-$ ENOSTR
-91 Dit is geen STREAM
-$ ETIME
-92 STREAM-ioctl verlopen
-$ ENOATTR
-93 Attribuut niet gevonden
+89 Verkeerd of defect bericht
 $ EMULTIHOP
-94 Multihopverzoek
+90 Multihopverzoek
 $ ENOLINK
-95 Verbinding werd verstoord
+91 Verbinding werd verstoord
 $ EPROTO
-96 Protocolfout
+92 Protocolfout
+$ ENOTCAPABLE
+93 Onvoldoende mogelijkheden
 $
 $ strsignal() support catalog
 $
@@ -263,5 +257,38 @@
 30 Gebruikersignaal 1
 $ SIGUSR2
 31 Gebruikersignaal 2
-$ SIGPWR
-32 Stroomuitval/stroominschakeling
+$
+$ gai_strerror() support catalog
+$set 3
+$ 1 (obsolete)
+1 Adresfamilie voor hostnaam niet ondersteund
+$ EAI_AGAIN
+2 Tijdelijke fout in naamresolutie
+$ EAI_BADFLAGS
+3 Ongeldige waarde voor ai_flags
+$ EAI_FAIL
+4 Onherstelbare fout in naamresolutie
+$ EAI_FAMILY
+5 ai_familie niet ondersteund
+$ EAI_MEMORY
+6 Geheugenallocatiefout
+$ 7 (obsolete)
+7 Geen adres met hostnaam geassocieerd
+$ EAI_NONAME
+8 hostname noch servname gegeven, of onbekend
+$ EAI_SERVICE
+9 servname niet ondersteund voor ai_socktype
+$ EAI_SOCKTYPE
+10 ai_socktype niet ondersteund
+$ EAI_SYSTEM
+11 Systeemfout geretourneerd in errno
+$ EAI_BADHINTS
+12 Ongeldige waarde voor hints
+$ EAI_PROTOCOL
+13 Opgelost protocol is onbekend
+$ EAI_OVERFLOW
+14 Argumentbuffer overstroomd
+$ 0
+32766 Succes
+$ NL_MSGMAX
+32767 Onbekende fout

==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#6 (text+ko) ====

@@ -156,7 +156,7 @@
 #define	MALLOC_DSS
 
 #include 
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.186 2009/11/14 09:31:47 cperciva Exp $");
 
 #include "libc_private.h"
 #ifdef MALLOC_DEBUG
@@ -5116,7 +5116,7 @@
 	arena_maxclass = chunksize - (arena_chunk_header_npages <<
 	    PAGE_SHIFT);
 
-	UTRACE(0, 0, 0);
+	UTRACE((void *)(intptr_t)(-1), 0, 0);
 
 #ifdef MALLOC_STATS
 	memset(&stats_chunks, 0, sizeof(chunk_stats_t));

==== //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#2 (text+ko) ====

@@ -26,14 +26,14 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.27 2007/01/09 00:28:16 imp Exp $
+.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.29 2009/11/13 13:26:27 brueffer Exp $
 .\"
-.Dd June 4, 1993
+.Dd November 13, 2009
 .Dt VFORK 2
 .Os
 .Sh NAME
 .Nm vfork
-.Nd spawn new process in a virtual memory efficient way
+.Nd create a new process without copying the address space
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
@@ -113,14 +113,6 @@
 system call appeared in
 .Bx 2.9 .
 .Sh BUGS
-This system call will be eliminated when proper system sharing
-mechanisms are implemented.
-Users should not depend on the memory
-sharing semantics of
-.Fn vfork
-as it will, in that case, be made synonymous to
-.Xr fork 2 .
-.Pp
 To avoid a possible deadlock situation,
 processes that are children in the middle
 of a

==== //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#3 (text+ko) ====

@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.15 2009/06/20 10:09:59 des Exp $
+.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.16 2009/11/13 11:19:26 des Exp $
 .\"
 .Dd June 20, 2009
 .Dt PAM_UNIX 8
@@ -105,6 +105,17 @@
 If the password database has no password for the entity being
 authenticated, then this option will forgo password prompting, and
 silently allow authentication to succeed.
+.Pp
+.Sy NOTE:
+If
+.Nm
+is invoked by a process that does not have the privileges required to
+access the password database (in most cases, this means root
+privileges), the
+.Cm nullok
+option may cause
+.Nm
+to allow any user to log in with any password.
 .It Cm local_pass
 Use only the local password database, even if NIS is in use.
 This will cause an authentication failure if the system is configured

==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#7 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.140 2009/10/10 15:27:10 kib Exp $
+ * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.141 2009/11/14 15:08:44 rwatson Exp $
  */
 
 /*
@@ -3425,7 +3425,7 @@
 	if (object_match_name(needed->obj, name))
 	    return needed->obj;
     }
-    _rtld_error("%s: Unexpected  inconsistency: dependency %s not found",
+    _rtld_error("%s: Unexpected inconsistency: dependency %s not found",
 	obj->path, name);
     die();
 }

==== //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/ttys#3 (text+ko) ====

@@ -1,26 +1,26 @@
 #
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
-# $FreeBSD: src/release/picobsd/floppy.tree/etc/ttys,v 1.5 2009/02/19 23:29:05 luigi Exp $
+# $FreeBSD: src/release/picobsd/floppy.tree/etc/ttys,v 1.6 2009/11/13 11:32:14 ed Exp $
 #
 # name	getty				type	status		comments
 #
 # This entry needed for asking password when init goes to single-user mode
 # If you want to be asked for password, change "secure" to "insecure" here
 #console	none				unknown	off secure
-vga	none				cons25	off secure
+vga	none				xterm	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv8	"/usr/libexec/getty Pc"		cons25	on  secure
-#ttyv9	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
+#ttyv8	"/usr/libexec/getty Pc"		xterm	on  secure
+#ttyv9	"/usr/libexec/getty Pc"		xterm	on  secure
 # Pseudo terminals
 ttyp0	none			network secure

>>> TRUNCATED FOR MAIL (1000 lines) <<<
From mav at FreeBSD.org  Sat Nov 14 20:46:46 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Sat Nov 14 20:46:52 2009
Subject: PERFORCE change 170630 for review
Message-ID: <200911142046.nAEKkjSg091925@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170630

Change 170630 by mav@mav_mavbook on 2009/11/14 20:45:47

	IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/contrib/cvs/DEVEL-CVS#1 add
.. //depot/projects/scottl-camlock/src/etc/etc.pc98/ttys#1 add
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#44 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#129 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#80 integrate
.. //depot/projects/scottl-camlock/src/sys/libkern/inet_aton.c#1 add
.. //depot/projects/scottl-camlock/src/tools/build/options/WITHOUT_CVS#1 add
.. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-pidfile.c#1 add

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#44 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.85 2009/11/05 08:55:24 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.87 2009/11/14 20:30:42 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#7 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.10 2009/10/22 21:07:32 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.11 2009/11/14 20:30:42 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#6 (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_queue.h,v 1.11 2009/10/22 21:07:32 mav Exp $
+ * $FreeBSD: src/sys/cam/cam_queue.h,v 1.12 2009/11/14 20:30:42 mav Exp $
  */
 
 #ifndef _CAM_CAM_QUEUE_H

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#129 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.234 2009/11/11 11:10:36 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.235 2009/11/14 20:23:20 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#30 (text+ko) ====

@@ -46,7 +46,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.111 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.112 2009/11/14 20:13:38 mav Exp $");
 
 #include "opt_cd.h"
 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#21 (text+ko) ====

@@ -68,7 +68,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.49 2009/10/23 08:27:55 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.50 2009/11/14 20:13:38 mav Exp $");
 
 #include 
 #include 

==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#80 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.13 2009/11/11 11:10:36 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.14 2009/11/14 20:06:04 mav Exp $");
 
 #include 
 #include 
From rene at FreeBSD.org  Sat Nov 14 23:33:33 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sat Nov 14 23:33:39 2009
Subject: PERFORCE change 170633 for review
Message-ID: <200911142333.nAENXWrT017367@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170633

Change 170633 by rene@rene_self on 2009/11/14 23:32:57

	[porters handbook]
	Add a section about Clang to the "Dos and Don'ts" chapter.
	To be reviewed by the clang team and the doc review team.

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 (text+ko) ====

@@ -13602,6 +13602,92 @@
 	  shorthand solution.    
       
 
+      
+	Clang: new C/C++ compiler
+
+	A future version of &os; will likely have the Clang C/C++
+	  compiler as its base compiler.  Some modifications to the Ports
+	  Collection are necessary.  In general, these are write proper
+	    ports and write proper source code.  More
+	  specifically:
+
+	
+	  
+	    Respect CC and CXX. Do
+	      not any of cc, c99,
+	      gcc, c++, or
+	      g++ directly.
+	  
+
+	  
+	    Respect LD, do not use
+	      ld directly.
+	  
+
+	  
+	    Do not use cpp for reformatting manual
+	      pages or shell scripts.  Try to use something more suitable
+	      instead, possibly falling back to CPP.
+	      
+	  
+
+	  
+	    If there are link errors related to missing or already
+	      defined functions, try to add CSTD=gnu89 to
+	      Makefile.  The function vsnprintf() is
+	      already built in.
+	  
+
+	  
+	    The -traditional option is not supported,
+	      so existing occurences have to be removed.  No concensus has yet
+	      been reached on ports abusing this option to preserve white space
+	      in text formatting.  Note that the Clang preprocessor does not
+	      preserve white space.
+	  
+
+	  
+	    Explicit type indication of variables must be used in
+	      built-in assembler code.
+	  
+
+	  
+	    The main function must be properly declared as
+
+	    int main(int argc, char **argv)
+	  
+
+	  
+	    The maximum useable optimization level is 3.  Level 4 is
+	      reserved for link-time optimization for the Clang backend.
+	  
+
+	  
+	
+
+	Some temporary hacks that might be used if all else fails:
+
+	
+	  
+	    Adding -fheinous-gnu-extensions.  Note
+	      that this option is already deprecated.
+	  
+
+	  
+	    Reducing the warning level by adding
+	      --diasable-werror or
+	      --disable-strict, or by disabling
+	      --warn-common or
+	      -Werror.
+	  
+	
+
+
+      
+
       
 	Respect both <makevar>CC</makevar> and
 	  <makevar>CXX</makevar>
From remko at elvandar.org  Sun Nov 15 09:58:21 2009
From: remko at elvandar.org (Remko Lodder)
Date: Sun Nov 15 09:58:28 2009
Subject: PERFORCE change 170633 for review
In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org>
References: <200911142333.nAENXWrT017367@repoman.freebsd.org>
Message-ID: <1D8EE757-D3A6-43D1-B8CF-40BBE46A8796@elvandar.org>


On Nov 15, 2009, at 12:33 AM, Rene Ladan wrote:

> http://p4web.freebsd.org/chv.cgi?CH=170633
> 
> Change 170633 by rene@rene_self on 2009/11/14 23:32:57
> 
> 	[porters handbook]
> 	Add a section about Clang to the "Dos and Don'ts" chapter.
> 	To be reviewed by the clang team and the doc review team.
> 
> Affected files ...
> 
> .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 edit
> 
> Differences ...
> 
> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 (text+ko) ====
> 
> @@ -13602,6 +13602,92 @@
> 	  shorthand solution.
>       
> 
> +      
> +	Clang: new C/C++ compiler
> +
> +	A future version of &os; will likely have the Clang C/C++
> +	  compiler as its base compiler.  Some modifications to the Ports
> +	  Collection are necessary.  In general, these are write proper
> +	    ports and write proper source code.  More
> +	  specifically:
> +
> +	
> +	  
> +	    Respect CC and CXX. Do
              ^^^ You should probably add something like 'variables' on the end of the line.
> +	      not any of cc, c99,
> +	      gcc, c++, or
> +	      g++ directly.

What shouldn't we do with 'cc' 'c99' etc? I think we should be more specific here in terms of
'do not use cc[..] directly.

> +	  



> +
> +	  
> +	    Respect LD, do not use
> +	      ld directly.
> +	  
> +
> +	  
> +	    Do not use cpp for reformatting manual
> +	      pages or shell scripts.  Try to use something more suitable
> +	      instead, possibly falling back to CPP.
> +	      
> +	  
> +
> +	  
> +	    If there are link errors related to missing or already
> +	      defined functions, try to add CSTD=gnu89 to
> +	      Makefile.  The function vsnprintf() is
> +	      already built in.
> +	  
> +
> +	  
> +	    The -traditional option is not supported,
> +	      so existing occurences have to be removed.  No concensus has yet
> +	      been reached on ports abusing this option to preserve white space
> +	      in text formatting.  Note that the Clang preprocessor does not
> +	      preserve white space.
> +	  
> +
> +	  
> +	    Explicit type indication of variables must be used in
> +	      built-in assembler code.
> +	  
> +
> +	  
> +	    The main function must be properly declared as

^^^ add :

> +
> +	    int main(int argc, char **argv)
> +	  
> +
> +	  
> +	    The maximum useable optimization level is 3.  Level 4 is
> +	      reserved for link-time optimization for the Clang backend.
> +	  
> +
> +	  
> +	
> +
> +	Some temporary hacks that might be used if all else fails:
> +
> +	
> +	  
> +	    Adding -fheinous-gnu-extensions.  Note
> +	      that this option is already deprecated.
> +	  
> +
> +	  
> +	    Reducing the warning level by adding
> +	      --diasable-werror or
> +	      --disable-strict, or by disabling
> +	      --warn-common or
> +	      -Werror.
> +	  
> +	
> +
> +
> +      
> +
>       
> 	Respect both <makevar>CC</makevar> and
> 	  <makevar>CXX</makevar>


Thanks for making this!

-- 
/"\   Best regards,                        | remko@FreeBSD.org
\ /   Remko Lodder                      | remko@EFnet
X    http://www.evilcoder.org/    |
/ \   ASCII Ribbon Campaign    | Against HTML Mail and News

From olli at fromme.com  Sun Nov 15 13:03:40 2009
From: olli at fromme.com (Oliver Fromme)
Date: Sun Nov 15 13:03:46 2009
Subject: PERFORCE change 170633 for review
In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org>
Message-ID: <200911151226.nAFCQD6g005359@haluter.fromme.com>


Rene Ladan wrote:
 > http://p4web.freebsd.org/chv.cgi?CH=170633
 > 
 > Change 170633 by rene@rene_self on 2009/11/14 23:32:57
 > 
 > 	[porters handbook]
 > 	Add a section about Clang to the "Dos and Don'ts" chapter.
 > 	To be reviewed by the clang team and the doc review team.
 > 
 > Affected files ...
 > 
 > .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 edit
 > 
 > Differences ...
 > 
 > ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 (text+ko) ====
 > [...]
 > +	  
 > +	    Respect CC and CXX. Do
 > +	      not any of cc, c99,
 > +	      gcc, c++, or
 > +	      g++ directly.
 > +	  

The last sentence is incomplete.
I think it's missing a verb like "do not _use_ any of ... directly".

 > +	  
 > +	    The main function must be properly declared as
 > +
 > +	    int main(int argc, char **argv)
 > +	  

I think "int main(void)" is also valid if the program doesn't
use any command line arguments, in conformance with the C
standard.  See src/usr/bin/true/true.c for example.

Best regards
   Oliver

-- 
Oliver Fromme, Bunsenstr. 13, 81735 Muenchen, Germany

``We are all but compressed light'' (Albert Einstein)
From rene at FreeBSD.org  Sun Nov 15 14:53:53 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sun Nov 15 14:54:00 2009
Subject: PERFORCE change 170641 for review
Message-ID: <200911151453.nAFErq9X041564@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170641

Change 170641 by rene@rene_self on 2009/11/15 14:53:01

	[porters handbook/clang]:
	* Add missing text [1] [2]
	* Elaborate a bit on CC and CXX variables [1]
	* Mention that "int main(void)" is also valid for Clang [2]
	* Mention the default C standards used
	Submitted by: remko [1], Oliver Fromme [2]	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#51 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#51 (text+ko) ====

@@ -13613,15 +13613,16 @@
 
 	
 	  
-	    Respect CC and CXX. Do
-	      not any of cc, c99,
-	      gcc, c++, or
-	      g++ directly.
+	    Respect the CC and CXX
+	      variables. Do not use any of the programs cc,
+	      c99, gcc,
+	      c++, or g++ in a port
+	      directly.
 	  
 
 	  
 	    Respect LD, do not use
-	      ld directly.
+	      ld in a port directly.
 	  
 
 	  
@@ -13632,10 +13633,11 @@
 	  
 
 	  
-	    If there are link errors related to missing or already
-	      defined functions, try to add CSTD=gnu89 to
-	      Makefile.  The function vsnprintf() is
-	      already built in.
+	    Clang uses the C99 standard by default, while GCC uses the C89
+	      standard by default.  Therefore, if there are any errors related
+	      to missing or already defined functions, try to add
+	      CSTD=gnu89 to
+	      Makefile.
 	  
 
 	  
@@ -13652,9 +13654,13 @@
 	  
 
 	  
-	    The main function must be properly declared as
+	    The main function must be properly declared as:
 
 	    int main(int argc, char **argv)
+
+	    or, if there are no parameters, as:
+
+	    int main(void)
 	  
 
 	  
From ed at 80386.nl  Sun Nov 15 16:03:34 2009
From: ed at 80386.nl (Ed Schouten)
Date: Sun Nov 15 16:03:40 2009
Subject: PERFORCE change 170633 for review
In-Reply-To: <200911142333.nAENXWrT017367@repoman.freebsd.org>
References: <200911142333.nAENXWrT017367@repoman.freebsd.org>
Message-ID: <20091115160332.GI64905@hoeg.nl>

* Rene Ladan  wrote:
> +	  
> +	    If there are link errors related to missing or already
> +	      defined functions, try to add CSTD=gnu89 to
> +	      Makefile.  The function vsnprintf() is
> +	      already built in.
> +	  

Port Makefiles should use USE_CSTD. Maybe we should also mention that?

-- 
 Ed Schouten 
 WWW: http://80386.nl/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/p4-projects/attachments/20091115/827f946e/attachment.pgp
From rene at freebsd.org  Sun Nov 15 16:06:45 2009
From: rene at freebsd.org (Rene Ladan)
Date: Sun Nov 15 16:06:52 2009
Subject: PERFORCE change 170633 for review
In-Reply-To: <20091115160332.GI64905@hoeg.nl>
References: <200911142333.nAENXWrT017367@repoman.freebsd.org>
	<20091115160332.GI64905@hoeg.nl>
Message-ID: <4B002710.6000103@freebsd.org>

Ed Schouten schreef:
> * Rene Ladan  wrote:
>> +	  
>> +	    If there are link errors related to missing or already
>> +	      defined functions, try to add CSTD=gnu89 to
>> +	      Makefile.  The function vsnprintf() is
>> +	      already built in.
>> +	  
> 
> Port Makefiles should use USE_CSTD. Maybe we should also mention that?
> 
That's what I intended to write, I'll fix this.

Rene
-- 
http://www.rene-ladan.nl/

GPG fingerprint = ADBC ECCD EB5F A6B4 549F  600D 8C9E 647A E564 2BFC 
(subkeys.pgp.net)
From rene at FreeBSD.org  Sun Nov 15 16:13:12 2009
From: rene at FreeBSD.org (Rene Ladan)
Date: Sun Nov 15 16:13:18 2009
Subject: PERFORCE change 170642 for review
Message-ID: <200911151613.nAFGDBqX049137@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170642

Change 170642 by rene@rene_self on 2009/11/15 16:12:53

	[porters handbook/clang]
	* use correct variable name for port Makefile: USE_CSTD [1]
	* don't mention the "patch server"
	Submitted by:	ed [1]

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 edit

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#52 (text+ko) ====

@@ -13636,7 +13636,7 @@
 	    Clang uses the C99 standard by default, while GCC uses the C89
 	      standard by default.  Therefore, if there are any errors related
 	      to missing or already defined functions, try to add
-	      CSTD=gnu89 to
+	      USE_CSTD=gnu89 to the port
 	      Makefile.
 	  
 
@@ -13687,11 +13687,6 @@
 	      -Werror.
 	  
 	
-
-
       
 
       
From pgj at FreeBSD.org  Sun Nov 15 20:09:10 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov 15 20:09:17 2009
Subject: PERFORCE change 170649 for review
Message-ID: <200911152009.nAFK99Gr080464@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170649

Change 170649 by pgj@beehive on 2009/11/15 20:08:21

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/share/images/articles/checkpoint/networks.pic#2 integrate
.. //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#4 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#22 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#61 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#74 integrate
.. //depot/projects/docproj_hu/www/share/sgml/press.xml#23 integrate
.. //depot/projects/docproj_hu/www/share/sgml/release.ent#18 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/share/images/articles/checkpoint/networks.pic#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.1 2003/04/11 08:59:19 blackend Exp $
+.\" $FreeBSD: doc/share/images/articles/checkpoint/networks.pic,v 1.2 2009/11/13 08:51:10 roam Exp $
 .\"
 .PS
 
@@ -24,7 +24,7 @@
     "\fC\s-2199.208.192.0/24\s+2\fP" "FW-1 protected nets" \
     with .nw at G.w;
 box wid 1.2 invis \
-    "\fC\s-2199.208.192.0/24\s+2\fP" "internal nets" \
+    "\fC\s-2192.168.10.0/24\s+2\fP" "internal nets" \
     with .ne at I.e;
 
 .PE

==== //depot/projects/docproj_hu/www/en/cgi/query-pr.cgi#4 (text+ko) ====

@@ -26,7 +26,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.66 2009/09/29 19:45:37 simon Exp $
+# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.69 2009/11/15 18:40:26 remko Exp $
 #
 
 #
@@ -474,6 +474,7 @@
 		my $url = "${self_url_base}${PR}";
 
 		my $outp = "";
+		my $qpcont = "";
 		my %mime_headers;
 		my $mime_boundary;
 		my $mime_endheader;
@@ -596,6 +597,21 @@
 				if ($inresponse) {
 					my $txt = $1;
 
+					# Detect Q-P line continuations,
+					# join them with the next line
+					# and process when the full line
+					# will be assembled.
+					if ($encoding == ENCODING_QP) {
+						if ($txt =~ /=$/) {
+							$txt =~ s/=$//;
+							$qpcont .= $txt;
+							next;
+						} else {
+							$txt = $qpcont . $txt;
+							$qpcont = "";
+						}
+					}
+
 					if ($txt !~ /^-+$/ && $txt !~ /(?:cut|snip)/i && $txt =~ /^--(\S+)$/) {
 						$mime_boundary = $1 if (!defined $mime_boundary && !$inpatch);
 
@@ -657,11 +673,10 @@
 					}
 
 					if ($encoding == ENCODING_BASE64) {
+						next if $txt =~ /:/;
 						$outp .= $txt;
 						next;
 					} elsif ($encoding == ENCODING_QP) {
-						# XXX: lines ending in = should be joined
-						$txt =~ s/=$//;
 						$txt = decode_qp($txt);
 					}
 
@@ -1013,7 +1028,7 @@
 	}
 
 	if (($inpatch & PATCH_BASE64) && $getpatch) {
-		$outp .= $_;
+		$outp .= $_ unless /:/;
 		return 1;
 	}
 
@@ -1107,8 +1122,8 @@
 						unless (!$getpatch and $inpatch & PATCH_UUENC_BIN);
 					$outp = htmlclean($outp) unless ($getpatch);
 					print $outp;
-					$inpatch ^= PATCH_UUENC; $outp = "";
-					$inpatch ^= PATCH_UUENC_BIN;
+					$outp = "";
+					$inpatch &= ~(PATCH_UUENC | PATCH_UUENC_BIN);
 
 					# No outer container?
 					sprint('patchblock_tfoot') if (!$inpatch and !$getpatch);

==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#22 (text+ko) ====

@@ -17,7 +17,7 @@
 
   
     
-      $FreeBSD: www/hu/share/sgml/events.xml,v 1.9 2009/10/22 23:02:11 pgj Exp $
+      $FreeBSD: www/hu/share/sgml/events.xml,v 1.10 2009/11/11 16:45:32 pgj Exp $
     
   
 

==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#61 (text+ko) ====

@@ -11,7 +11,7 @@
 
   
     
-      $FreeBSD: www/hu/share/sgml/news.xml,v 1.25 2009/10/30 20:54:26 pgj Exp $
+      $FreeBSD: www/hu/share/sgml/news.xml,v 1.26 2009/11/11 16:45:32 pgj Exp $
     
   
 

==== //depot/projects/docproj_hu/www/share/sgml/news.xml#74 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.276 2009/11/09 05:24:00 linimon Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.277 2009/11/12 22:58:14 delphij Exp $
     
   
 
@@ -33,6 +33,27 @@
     2009
 
     
+      11
+
+      
+	12
+
+	
+	  &os; 8.0-RC3 Available
+
+	  
    The third of the Release Candidates for the &os;-8.0
+	    release cycle is now available.  ISO images for Tier-1
+	    architectures and a memory stick image for
+	    amd64/i386 are now available
+	    on most of the &os;
+	    mirror sites.
    
+	    
+          
+        
+
+    
       10
 
       

==== //depot/projects/docproj_hu/www/share/sgml/press.xml#23 (text+ko) ====

@@ -9,7 +9,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/press.xml,v 1.88 2009/09/03 16:58:37 jkoshy Exp $
+      $FreeBSD: www/share/sgml/press.xml,v 1.90 2009/11/12 14:02:25 jkoshy Exp $
     
   
 
@@ -17,6 +17,30 @@
     2009
 
     
+      11
+
+      
+	FreeNAS 0.7 adds ZFS support
+	http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html
+	The H
+	http://www.h-online.com/
+	09 November 2009
+	crve
+	
    A description of the new features in version 0.7 of the FreeBSD-based FreeNAS project.
    
+          
+
+      
+	Update your FreeBSD software with care
+	http://blogs.techrepublic.com.com/security/?p=2615
+	Tech Republic
+	http://www.techrepublic.com/
+	09 November 2009
+	Chad Perrin
+	
    Chad Perrin describes how he keeps his FreeBSD system up to date.
    
+          
+        
+
+    
       8
 
       

==== //depot/projects/docproj_hu/www/share/sgml/release.ent#18 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
 
 
 
@@ -19,6 +19,28 @@
     2009
 
     
+      11
+
+      
+	12
+
+	
+	  Megjelent a &os; 8.0-RC3!
+
+	  
    A &os; 8.0 kiadási ciklusának harmadik
+	    kiadásra jelölt változata végre
+	    megérkezett.  ISO formátumban az összes
+	    Tier 1, valamint pendrive formátumban
+	    pedig amd64 és i386 architektúrákra érhetõek el
+	    lemezképek, melyek a legtöbb &os; tükrözésen
+	    már megtalálhatóak.
    
+	    
+          
+        
+
+    
       10
 
       

==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#25 (text+ko) ====

@@ -5,7 +5,7 @@
 
 
 
@@ -19,6 +19,34 @@
     2009
 
     
+      11
+
+      
+	A FreeNAS 0.7 ZFS támogatással érkezik
+	http://www.h-online.com/open/news/item/FreeNAS-0-7-adds-ZFS-support-853475.html
+	The H
+	http://www.h-online.com/
+	2009. november 9.
+	crve
+	
    A &os; alapú FreeNAS projekt 0.7-es
+	  kiadásának újdonságainak
+	  bemutatása.
    
+          
+
+      
+	Hogyan frissítsük szoftvereinket egy &os;
+	  rendszeren
+	http://vlogs.techrepublic.com.com/security/?p=2615
+	Tech Republic
+	http://www.techrepublic.com/
+	2009. november 9.
+	Chad Perrin
+	
    Chad Perrin bemutatja miként szokta frissíteni
+	  &os; rendszerét.
    
+          
+        
+
+    
       8
 
       
From pgj at FreeBSD.org  Sun Nov 15 21:05:06 2009
From: pgj at FreeBSD.org (Gabor Pali)
Date: Sun Nov 15 21:05:15 2009
Subject: PERFORCE change 170651 for review
Message-ID: <200911152105.nAFL55e7095952@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170651

Change 170651 by pgj@beehive on 2009/11/15 21:04:16

	MFen (doc):
		1.18       -> 1.19       hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml
		1.20       -> 1.21       hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#12 edit
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#13 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#12 (text+ko) ====

@@ -7,7 +7,7 @@
     The FreeBSD Hungarian Documentation Project
     Translated by: PALI, Gabor 
     %SOURCE%	en_US.ISO8859-1/books/handbook/jails/chapter.sgml
-    %SRCID%	1.18
+    %SRCID%	1.19
 -->
 
 
@@ -101,13 +101,14 @@
 
     
       
-	&man.chroot.2; (parancs)
+	&man.chroot.8; (parancs)
 	
-	  A &os; azon rendszerhívása, amely egy
-	    program és annak leszármazottjai
-	    futtatása során megváltoztatja a
-	    gyökérkönyvtárat.  (change
-	    root)
+	  Egy segédprogram, amely a &os; &man.chroot.2;
+	    rendszerhívásán keresztül egy
+	    program és annak leszármazottjainak
+	    futtatásához megváltoztatja a rendszer
+	    gyökérkönyvtárát (change
+	    root).
 	
       
 

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#13 (text+ko) ====

@@ -7,7 +7,7 @@
      The FreeBSD Hungarian Documentation Project
      Translated by: PALI, Gabor 
      %SOURCE%	en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml
-     %SRCID%	1.20
+     %SRCID%	1.21
 -->
 
 
@@ -953,7 +953,7 @@
         
 
     
-      VMware-rel MacOS-en
+      VMWare-rel MacOS-en
 
       A &mac;-ek számára fejlesztett
 	VMWare Fusion egy olyan kereskedelmi
@@ -1218,7 +1218,7 @@
       évekig nem kapott hivatalosan támogatást
       egyetlen elterjedtebb virtualizációs megoldás
       részérõl sem.  Sokan erre a célra eddig
-      a VMware korábbi és
+      a VMWare korábbi és
       inkább már elavult, a &linux; kompatibilitási
       rétegre épülõ változatait (mint
       például 
References: <200911142333.nAENXWrT017367@repoman.freebsd.org>
Message-ID: <364299f40911151324k6006e335ga40f6c4ea5c8331c@mail.gmail.com>

On Sat, Nov 14, 2009 at 3:33 PM, Rene Ladan  wrote:
> http://p4web.freebsd.org/chv.cgi?CH=170633
>
> Change 170633 by rene@rene_self on 2009/11/14 23:32:57
>
> ? ? ? ?[porters handbook]
> ? ? ? ?Add a section about Clang to the "Dos and Don'ts" chapter.
> ? ? ? ?To be reviewed by the clang team and the doc review team.
>
> Affected files ...
>
> .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 edit
>
> Differences ...
>
> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 (text+ko) ====
>
> @@ -13602,6 +13602,92 @@
> ? ? ? ? ?shorthand solution.
> ? ? ? 
>
> + ? ? ?
> + ? ? ? Clang: new C/C++ compiler
> +
> + ? ? ? A future version of &os; will likely have the Clang C/C++
> + ? ? ? ? compiler as its base compiler. ?Some modifications to the Ports
> + ? ? ? ? Collection are necessary. ?In general, these are write proper
> + ? ? ? ? ? ports and write proper source code. ?More
> + ? ? ? ? specifically:
> +
> + ? ? ? 
> + ? ? ? ? 
> + ? ? ? ? ? Respect CC and CXX. Do
> + ? ? ? ? ? ? not any of cc, c99,
> + ? ? ? ? ? ? gcc, c++, or
> + ? ? ? ? ? ? g++ directly.
> + ? ? ? ? 

    This is good practice for writing portable Makefile's, anyhow.
Cheers!
-Garrett
From mav at FreeBSD.org  Mon Nov 16 13:51:53 2009
From: mav at FreeBSD.org (Alexander Motin)
Date: Mon Nov 16 13:51:59 2009
Subject: PERFORCE change 170666 for review
Message-ID: <200911161351.nAGDpqgw025770@repoman.freebsd.org>

http://p4web.freebsd.org/chv.cgi?CH=170666

Change 170666 by mav@mav_mavtest on 2009/11/16 13:51:06

	Disable PortMultiplier Async Notifications for time of ports reset.
	They are useless at that time, but confuse Marvell AHCI.
	
	Add quirk for SiI57XX Port Multipliers, to hide extra port.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#18 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#18 (text+ko) ====

@@ -63,11 +63,12 @@
 typedef enum {
 	PMP_STATE_NORMAL,
 	PMP_STATE_PORTS,
-	PMP_STATE_CONFIG,
+	PMP_STATE_PRECONFIG,
 	PMP_STATE_RESET,
 	PMP_STATE_CONNECT