From owner-p4-projects@FreeBSD.ORG Sun Mar 19 02:44:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0248216A41F; Sun, 19 Mar 2006 02:44:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A505716A429 for ; Sun, 19 Mar 2006 02:44:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 236E243D45 for ; Sun, 19 Mar 2006 02:44:50 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2J2ioDC046492 for ; Sun, 19 Mar 2006 02:44:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2J2inG7046489 for perforce@freebsd.org; Sun, 19 Mar 2006 02:44:49 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 19 Mar 2006 02:44:49 GMT Message-Id: <200603190244.k2J2inG7046489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 02:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93533 Change 93533 by kmacy@kmacy_storage:sun4v_work on 2006/03/19 02:44:23 back out previous change Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#12 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#10 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#35 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#14 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#7 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#12 (text+ko) ==== @@ -201,6 +201,9 @@ ASSYM(PC_IRTAIL, offsetof(struct pcpu, pc_irtail)); ASSYM(PC_IRFREE, offsetof(struct pcpu, pc_irfree)); ASSYM(PC_MID, offsetof(struct pcpu, pc_mid)); +ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); +ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); +ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); @@ -219,12 +222,8 @@ ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); ASSYM(PC_PMAP, offsetof(struct pcpu, pc_curpmap)); -ASSYM(PC_CURPCB_RA, offsetof(struct pcpu, pc_curpcb_ra)); #else ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); -ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); -ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); -ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); #endif @@ -285,9 +284,6 @@ ASSYM(PCB_PC, offsetof(struct pcb, pcb_pc)); ASSYM(PCB_SP, offsetof(struct pcb, pcb_sp)); ASSYM(PCB_FEF, PCB_FEF); -#ifdef SUN4V -ASSYM(PCB_RA, offsetof(struct pcb, pcb_ra)); -#endif ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ASSYM(PM_ACTIVE, offsetof(struct pmap, pm_active)); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#10 (text+ko) ==== @@ -131,18 +131,10 @@ #define GET_MMFSA_SCRATCH(reg) \ ldxa [%g0 + %g0]ASI_SCRATCHPAD, reg; -#define GET_PCPU_PHYS_SCRATCH(tmp) \ - sethi %uhi(VM_MIN_DIRECT_ADDRESS), tmp; \ - mov SCRATCH_REG_PCPU, PCPU_REG; \ - sllx tmp, 32, tmp; \ - ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; \ - andn PCPU_REG, tmp, PCPU_REG - -#define GET_PCPU_SCRATCH \ +#define GET_PCPU_SCRATCH \ mov SCRATCH_REG_PCPU, PCPU_REG; \ ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; - #define GET_HASH_SCRATCH_USER(reg) \ mov SCRATCH_REG_HASH_USER, reg; \ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; @@ -178,15 +170,10 @@ ldxa [%g0 + reg]ASI_SCRATCHPAD, reg; #define SET_SCRATCH(offsetreg, reg) stxa reg, [%g0 + offsetreg]ASI_SCRATCHPAD -#define GET_PCB(reg) \ - GET_PCPU_SCRATCH; \ - ldx [PCPU_REG + PC_CURPCB], reg; -#define GET_PCB_PHYS(tmp, reg) \ - mov PC_CURPCB_RA, reg; \ - GET_PCPU_PHYS_SCRATCH(tmp); \ - ldxa [PCPU_REG + reg]ASI_REAL, reg; - +#define GET_PCB(reg) \ + GET_PCPU_SCRATCH; \ + ldx [PCPU_REG + PC_CURPCB], reg; #define SET_MMU_CONTEXT(typereg, reg) stxa reg, [typereg]ASI_MMU_CONTEXTID #define GET_MMU_CONTEXT(typereg, reg) ldxa [typereg]ASI_MMU_CONTEXTID, reg ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#7 (text+ko) ==== @@ -45,7 +45,7 @@ uint64_t pcb_nsaved; /* number of windows saved in pcb_rw */ uint64_t pcb_pc; uint64_t pcb_sp; - uint64_t pcb_ra; /* real address of pcb */ + uint64_t pcb_pa; /* physical address of pcb */ uint64_t pcb_pad[4]; } __aligned(64); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#7 (text+ko) ==== @@ -75,7 +75,9 @@ u_long pc_kwbuf_sp; \ u_int pc_kwbuf_full; \ u_int pc_node; \ - u_long pc_curpcb_ra; + u_int pc_tlb_ctx; \ + u_int pc_tlb_ctx_max; \ + u_int pc_tlb_ctx_min /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#35 (text+ko) ==== @@ -1005,7 +1005,7 @@ ldx [%l7 + TF_TPC], %g1 ldx [%l7 + TF_TNPC], %g2 ldx [%l7 + TF_TSTATE], %l0 - andn %l0, TSTATE_CWP_MASK, %g6 + andn %l0, TSTATE_CWP_MASK, %g7 wrpr %g1, %tpc wrpr %g2, %tnpc @@ -1059,7 +1059,7 @@ brnz %g1, 3f nop ! no trap, use restore directly rdpr %cwp, %g1 - wrpr %g1, %g6, %tstate ! needed by wbuf recovery code + wrpr %g1, %g7, %tstate ! needed by wbuf recovery code ! hand craft the restore to avoid getting to TL > 2 rdpr %wstate, %g1 btst 1, %g1 @@ -1087,7 +1087,7 @@ rdpr %canrestore, %g1 wrpr %g0, %g1, %cleanwin rdpr %cwp, %g1 - wrpr %g1, %g6, %tstate + wrpr %g1, %g7, %tstate ! MAGIC_TRAP_ON retry END(user_rtt) @@ -1143,14 +1143,14 @@ ldx [%l7 + TF_TPC], %g1 ldx [%l7 + TF_TNPC], %g2 ldx [%l7 + TF_TSTATE], %l0 - andn %l0, TSTATE_CWP_MASK, %g6 + andn %l0, TSTATE_CWP_MASK, %g7 wrpr %g1, %tpc wrpr %g2, %tnpc rdpr %canrestore, %g1 brnz %g1, 3f nop ! can use restore directly rdpr %cwp, %g1 - wrpr %g1, %g6, %tstate ! needed by wbuf recovery code + wrpr %g1, %g7, %tstate ! needed by wbuf recovery code ! avoid going above TL2 fill_64bit_rtt(ASI_N) @@ -1161,7 +1161,7 @@ ! set %tstate to the correct %cwp ! rdpr %cwp, %g1 - wrpr %g1, %g6, %tstate + wrpr %g1, %g7, %tstate retry END(krtt) END(ktl0) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#14 (text+ko) ==== @@ -384,6 +384,9 @@ #endif pc->pc_addr = (vm_offset_t)pcpu0; pc->pc_node = child; + pc->pc_tlb_ctx = TLB_CTX_USER_MIN; + pc->pc_tlb_ctx_min = TLB_CTX_USER_MIN; + pc->pc_tlb_ctx_max = TLB_CTX_USER_MAX; /* * Initialize global registers. @@ -396,16 +399,15 @@ */ pmap_bootstrap(end); + thread0.td_kstack = kstack0; + thread0.td_pcb = (struct pcb *) + (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + pc->pc_curpcb = thread0.td_pcb; + /* - * Update PCPU_REG and PCB to point to direct address + * Update PCPU_REG to point to direct address * to support easy phys <-> virt translation in trap handler */ - - thread0.td_kstack = kstack0; - thread0.td_pcb = (struct pcb *)(thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_ra = vtophys(thread0.td_pcb); - pc->pc_curpcb = thread0.td_pcb; - pc = (struct pcpu *)TLB_PHYS_TO_DIRECT(vtophys(pc)); cpu_setregs(pc); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#13 (text+ko) ==== @@ -49,22 +49,6 @@ mov %i1, %i0 END(cpu_throw) - - -ENTRY(pcb_ra_miss) - call pmap_kextract - mov PCB_REG, %o0 - mov %o0, %l0 - ! sanity check lookup - brnz %o0, 1f - nop - MAGIC_TRAP_ON - MAGIC_EXIT -1: - ! - ba,pt %xcc, pcb_ra_uptodate - stx %l0, [PCB_REG + PCB_RA] -END(pcb_ra_miss) /* * void cpu_switch(struct thread *old, struct thread *new) */ @@ -144,18 +128,13 @@ */ ldx [PCB_REG + PCB_SP], %fp ldx [PCB_REG + PCB_PC], %i7 - ldx [PCB_REG + PCB_RA], %l0 sub %fp, CCFSZ, %sp - brz %l0, pcb_ra_miss - nop -pcb_ra_uptodate: /* * Point to the pmaps of the new process, and of the last non-kernel * process to run. */ - stx %l0, [PCPU(CURPCB_RA)] ldx [%i0 + TD_PROC], %i2 ldx [PCPU(PMAP)], %l2 ldx [%i2 + P_VMSPACE], %i5 ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#7 (text+ko) ==== @@ -34,13 +34,12 @@ END(fault_64bit_sn0) ENTRY(fault_64bit_sn1) - GET_PCB_PHYS(%g5, %g6) - wr %g0, ASI_REAL, %asi - stxa %sp, [%g6 + PCB_RWSP]%asi - add %g6, PCB_RW, %g5 - SAVE_WINDOW_ASI(%g5) + /* XXX need to use physical addresses here */ + GET_PCB(%g6) + stx %sp, [%g6 + PCB_RWSP] + SPILL(stx, %g6 + PCB_RW, 8) mov 1, %g5 - stxa %g5, [%g6 + PCB_NSAVED]%asi + stx %g5, [%g6 + PCB_NSAVED] saved set tl0_trap, %g5 wrpr %g5, %tnpc @@ -82,20 +81,19 @@ END(fault_64bit_so0) ENTRY(fault_64bit_so1) - GET_PCB_PHYS(%g5, %g6) - wr %g0, ASI_REAL, %asi - ldxa [%g6 + PCB_NSAVED]%asi, %g2 + /* XXX need to use physical addresses */ + GET_PCB(%g6) + ld [%g6 + PCB_NSAVED], %g2 add %g2, 1, %g3 - stxa %g3, [%g6 + PCB_NSAVED]%asi + stx %g3, [%g6 + PCB_NSAVED] sll %g2, PTR_SHIFT, %g4 add %g6, PCB_RWSP, %g3 - add %g3, %g4, %g4 - stxa %sp, [%g4]%asi + stx %sp, [%g3 + %g4] sll %g2, RW_SHIFT, %g4 add %g4, %g6, %g4 add %g4, PCB_RW, %g3 - SAVE_WINDOW_ASI(%g3) + SAVE_WINDOW(%g3) saved set tl0_trap, %g5 wrpr %g5, %tnpc @@ -123,6 +121,7 @@ ! wrpr %g0, 1, %tl set TSTATE_KERNEL | TSTATE_IE, %g1 + GET_PCPU_SCRATCH wrpr %g0, %g1, %tstate set user_rtt, %g1 wrpr %g0, %g1, %tpc From owner-p4-projects@FreeBSD.ORG Sun Mar 19 02:46:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52C0E16A422; Sun, 19 Mar 2006 02:46:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30C5916A41F for ; Sun, 19 Mar 2006 02:46:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0102C43D45 for ; Sun, 19 Mar 2006 02:46:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2J2kql8046602 for ; Sun, 19 Mar 2006 02:46:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2J2kqXp046599 for perforce@freebsd.org; Sun, 19 Mar 2006 02:46:52 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 19 Mar 2006 02:46:52 GMT Message-Id: <200603190246.k2J2kqXp046599@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 02:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93534 Change 93534 by kmacy@kmacy_storage:sun4vtmp on 2006/03/19 02:46:30 fix signature for pmap_remove_tte Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#31 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#31 (text+ko) ==== @@ -72,7 +72,7 @@ #include -#if 0 +#if 1 #define PMAP_DEBUG #endif #ifndef PMAP_SHPGPERPROC @@ -180,7 +180,7 @@ static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m); static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); -static int pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va); +static void pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va); /* * Quick sort callout for comparing memory regions. @@ -1388,7 +1388,7 @@ /* disgusting hack to avoid TSB misses on kernel pages * this will need to be fixed some time soon */ - +#if 0 tm = m; tcount = count; @@ -1400,9 +1400,7 @@ va += PAGE_SIZE; tm++; } - - - +#endif } /* @@ -1634,7 +1632,7 @@ size -= bytes_zeroed; } } -static int +static void pmap_remove_tte(pmap_t pmap, uint64_t *tte, vm_offset_t va) { From owner-p4-projects@FreeBSD.ORG Sun Mar 19 14:03:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F233B16A423; Sun, 19 Mar 2006 14:03:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B1C2516A400 for ; Sun, 19 Mar 2006 14:03:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A8B343D46 for ; Sun, 19 Mar 2006 14:03:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JE3giT000971 for ; Sun, 19 Mar 2006 14:03:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JE3g88000968 for perforce@freebsd.org; Sun, 19 Mar 2006 14:03:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:03:42 GMT Message-Id: <200603191403.k2JE3g88000968@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93567 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:03:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=93567 Change 93567 by rwatson@rwatson_zoo on 2006/03/19 14:03:11 Bump default queue limit for audit pipes from 32 to 128, since 32 is pretty small. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#12 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#12 (text+ko) ==== @@ -68,7 +68,7 @@ /* * Audit pipe buffer parameters. */ -#define AUDIT_PIPE_QLIMIT_DEFAULT (32) +#define AUDIT_PIPE_QLIMIT_DEFAULT (128) #define AUDIT_PIPE_QLIMIT_MIN (0) #define AUDIT_PIPE_QLIMIT_MAX (1024) From owner-p4-projects@FreeBSD.ORG Sun Mar 19 14:34:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6546C16A423; Sun, 19 Mar 2006 14:34:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2A1A916A420 for ; Sun, 19 Mar 2006 14:34:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC1DB43D45 for ; Sun, 19 Mar 2006 14:34:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JEYK23002115 for ; Sun, 19 Mar 2006 14:34:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JEYJIE002112 for perforce@freebsd.org; Sun, 19 Mar 2006 14:34:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:34:19 GMT Message-Id: <200603191434.k2JEYJIE002112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:34:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=93568 Change 93568 by rwatson@rwatson_peppercorn on 2006/03/19 14:34:11 Normalize nested include guards. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#13 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#22 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#13 (text+ko) ==== @@ -34,8 +34,8 @@ * necessary for the kernel as a whole to interact with the audit subsystem. */ -#ifndef _BSM_AUDIT_KERNEL_H -#define _BSM_AUDIT_KERNEL_H +#ifndef _SECURITY_AUDIT_KERNEL_H_ +#define _SEUCRITY_AUDIT_KERNEL_H_ #ifndef _KERNEL #error "no user-serviceable parts inside" @@ -240,4 +240,4 @@ #endif /* AUDIT */ -#endif /* !_BSM_AUDIT_KERNEL_H */ +#endif /* !_SECURITY_AUDIT_KERNEL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#2 (text+ko) ==== @@ -28,8 +28,8 @@ * $FreeBSD$ */ -#ifndef _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ -#define _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ +#ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_ +#define _SECURITY_AUDIT_AUDIT_IOCTL_H_ #define AUDITPIPE_IOBASE 'A' @@ -48,4 +48,4 @@ #define AUDITPIPE_GET_DROPS _IOR(AUDITPIPE_IOBASE, 102, u_int64_t) #define AUDITPIPE_GET_TRUNCATES _IOR(AUDITPIPE_IOBASE, 103, u_int64_t) -#endif /* _SYS_SECURITY_AUDIT_AUDIT_IOCTL_H_ */ +#endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#22 (text+ko) ==== @@ -34,8 +34,8 @@ * within the audit implementation. */ -#ifndef _BSM_AUDIT_PRIVATE_H -#define _BSM_AUDIT_PRIVATE_H +#ifndef _SECURITY_AUDIT_PRIVATE_H_ +#define _SECURITY_AUDIT_PRIVATE_H_ #ifndef _KERNEL #error "no user-serviceable parts inside" @@ -338,4 +338,4 @@ */ void audit_pipe_submit(void *record, u_int record_len); -#endif /* ! _BSM_AUDIT_PRIVATE_H */ +#endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Mar 19 14:37:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108C916A420; Sun, 19 Mar 2006 14:37:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7A5E16A400 for ; Sun, 19 Mar 2006 14:37:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AED943D58 for ; Sun, 19 Mar 2006 14:37:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JEbOm4002324 for ; Sun, 19 Mar 2006 14:37:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JEbOm0002321 for perforce@freebsd.org; Sun, 19 Mar 2006 14:37:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:37:24 GMT Message-Id: <200603191437.k2JEbOm0002321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:37:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=93569 Change 93569 by rwatson@rwatson_peppercorn on 2006/03/19 14:36:45 Do install sys/security/audit include files. It would be nice just to install audit_ioctl.h, but we seem only to support installing directories, so we get them all. The two not intended for extra- kernel use have !_KERNEL #error's, which should help. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#7 edit .. //depot/projects/trustedbsd/audit3/include/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -210,6 +210,8 @@ rpcsvc .. security + audit + .. mac_biba .. mac_bsdextended ==== //depot/projects/trustedbsd/audit3/include/Makefile#7 (text+ko) ==== @@ -47,6 +47,7 @@ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ + security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs From owner-p4-projects@FreeBSD.ORG Sun Mar 19 14:45:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E2AE16A422; Sun, 19 Mar 2006 14:45:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEC2616A420 for ; Sun, 19 Mar 2006 14:45:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B22A43D45 for ; Sun, 19 Mar 2006 14:45:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JEjaxU002650 for ; Sun, 19 Mar 2006 14:45:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JEjaxW002647 for perforce@freebsd.org; Sun, 19 Mar 2006 14:45:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 14:45:36 GMT Message-Id: <200603191445.k2JEjaxW002647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:45:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=93570 Change 93570 by rwatson@rwatson_peppercorn on 2006/03/19 14:45:26 Add audit pipe ioctls to query minimum and maximum audit queue lengths. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#3 (text+ko) ==== @@ -36,16 +36,18 @@ /* * Ioctls to read and control the behavior of individual audit pipe devices. */ -#define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) -#define AUDITPIPE_GET_QLIMIT _IOR(AUDITPIPE_IOBASE, 2, u_int) -#define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) +#define AUDITPIPE_GET_QLEN _IOR(AUDITPIPE_IOBASE, 1, u_int) +#define AUDITPIPE_GET_QLIMIT _IOR(AUDITPIPE_IOBASE, 2, u_int) +#define AUDITPIPE_SET_QLIMIT _IOW(AUDITPIPE_IOBASE, 3, u_int) +#define AUDITPIPE_GET_QLIMIT_MIN _IOR(AUDITPIPE_IOBASE, 4, u_int) +#define AUDITPIPE_GET_QLIMIT_MAX _IOR(AUDITPIPE_IOBASE, 5, u_int) /* * Ioctls to retrieve audit pipe statistics. */ -#define AUDITPIPE_GET_INSERTS _IOR(AUDITPIPE_IOBASE, 100, u_int64_t) -#define AUDITPIPE_GET_READS _IOR(AUDITPIPE_IOBASE, 101, u_int64_t) -#define AUDITPIPE_GET_DROPS _IOR(AUDITPIPE_IOBASE, 102, u_int64_t) -#define AUDITPIPE_GET_TRUNCATES _IOR(AUDITPIPE_IOBASE, 103, u_int64_t) +#define AUDITPIPE_GET_INSERTS _IOR(AUDITPIPE_IOBASE, 100, u_int64_t) +#define AUDITPIPE_GET_READS _IOR(AUDITPIPE_IOBASE, 101, u_int64_t) +#define AUDITPIPE_GET_DROPS _IOR(AUDITPIPE_IOBASE, 102, u_int64_t) +#define AUDITPIPE_GET_TRUNCATES _IOR(AUDITPIPE_IOBASE, 103, u_int64_t) #endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_pipe.c#13 (text+ko) ==== @@ -457,6 +457,16 @@ error = EINVAL; break; + case AUDITPIPE_GET_QLIMIT_MIN: + *(u_int *)data = AUDIT_PIPE_QLIMIT_MIN; + error = 0; + break; + + case AUDITPIPE_GET_QLIMIT_MAX: + *(u_int *)data = AUDIT_PIPE_QLIMIT_MAX; + error = 0; + break; + case AUDITPIPE_GET_INSERTS: *(u_int *)data = ap->ap_inserts; error = 0; From owner-p4-projects@FreeBSD.ORG Sun Mar 19 14:52:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D75A16A424; Sun, 19 Mar 2006 14:52:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40CE616A41F for ; Sun, 19 Mar 2006 14:52:46 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BE9543D46 for ; Sun, 19 Mar 2006 14:52:46 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JEqjBP002915 for ; Sun, 19 Mar 2006 14:52:45 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JEqjEa002912 for perforce@freebsd.org; Sun, 19 Mar 2006 14:52:45 GMT (envelope-from cognet@freebsd.org) Date: Sun, 19 Mar 2006 14:52:45 GMT Message-Id: <200603191452.k2JEqjEa002912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 14:52:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=93571 Change 93571 by cognet@cognet on 2006/03/19 14:52:07 Update gnu/ : NO_GDB => MK_GDB=no Affected files ... .. //depot/projects/arm/gnu-arm.diff#10 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#10 (text+ko) ==== @@ -49,17 +49,17 @@ Index: gnu/usr.bin/Makefile =================================================================== RCS file: /cognet/ncvs/src/gnu/usr.bin/Makefile,v -retrieving revision 1.87 -diff -u -p -r1.87 Makefile ---- gnu/usr.bin/Makefile 6 Aug 2005 20:23:13 -0000 1.87 -+++ gnu/usr.bin/Makefile 29 Aug 2005 12:39:27 -0000 -@@ -22,7 +22,7 @@ SUBDIR= bc \ +retrieving revision 1.88 +diff -u -p -r1.88 Makefile +--- gnu/usr.bin/Makefile 17 Mar 2006 18:54:22 -0000 1.88 ++++ gnu/usr.bin/Makefile 18 Mar 2006 01:46:32 -0000 +@@ -24,7 +24,7 @@ SUBDIR= bc \ sort \ ${_texinfo} -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "powerpc" - NO_GDB= # not yet + MK_GDB= no # not yet .endif Index: gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h From owner-p4-projects@FreeBSD.ORG Sun Mar 19 15:05:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A60FD16A42B; Sun, 19 Mar 2006 15:05:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8099916A428 for ; Sun, 19 Mar 2006 15:05:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51B5343D45 for ; Sun, 19 Mar 2006 15:05:01 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JF518i003311 for ; Sun, 19 Mar 2006 15:05:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JF51kb003308 for perforce@freebsd.org; Sun, 19 Mar 2006 15:05:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 15:05:01 GMT Message-Id: <200603191505.k2JF51kb003308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 15:05:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=93572 Change 93572 by rwatson@rwatson_zoo on 2006/03/19 15:04:43 Simple audit pipe ioctl regression test. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/Makefile#1 add .. //depot/projects/trustedbsd/audit3/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Mar 19 17:11:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7366516A420; Sun, 19 Mar 2006 17:11:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 343D616A401 for ; Sun, 19 Mar 2006 17:11:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D741B43D46 for ; Sun, 19 Mar 2006 17:11:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JHBbF4016393 for ; Sun, 19 Mar 2006 17:11:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JHBb3p016390 for perforce@freebsd.org; Sun, 19 Mar 2006 17:11:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 17:11:37 GMT Message-Id: <200603191711.k2JHBb3p016390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 17:11:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=93581 Change 93581 by rwatson@rwatson_peppercorn on 2006/03/19 17:10:38 Mega-style patch. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#23 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#15 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#11 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#5 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_ioctl.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#23 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#12 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#23 (text+ko) ==== @@ -76,43 +76,43 @@ MALLOC_DEFINE(M_AUDITTEXT, "audit_text", "Audit text storage"); /* - * Audit control settings that are set/read by system calls and are + * Audit control settings that are set/read by system calls and are * hence non-static. */ -/* +/* * Define the audit control flags. */ -int audit_enabled; -int audit_suspended; +int audit_enabled; +int audit_suspended; /* * Flags controlling behavior in low storage situations. * Should we panic if a write fails? Should we fail stop * if we're out of disk space? */ -int audit_panic_on_write_fail; -int audit_fail_stop; +int audit_panic_on_write_fail; +int audit_fail_stop; /* * Are we currently "failing stop" due to out of disk space? */ -int audit_in_failure; +int audit_in_failure; /* - * Global audit statistiscs. + * Global audit statistiscs. */ -struct audit_fstat audit_fstat; +struct audit_fstat audit_fstat; /* * Preselection mask for non-attributable events. */ -struct au_mask audit_nae_mask; +struct au_mask audit_nae_mask; /* * Mutex to protect global variables shared between various threads and * processes. */ -struct mtx audit_mtx; +struct mtx audit_mtx; /* * Queue of audit records ready for delivery to disk. We insert new @@ -122,21 +122,21 @@ * not yet in the queue, which is needed to estimate the total * size of the combined set of records outstanding in the system. */ -struct kaudit_queue audit_q; -int audit_q_len; -int audit_pre_q_len; +struct kaudit_queue audit_q; +int audit_q_len; +int audit_pre_q_len; /* * Audit queue control settings (minimum free, low/high water marks, etc.) */ -struct au_qctrl audit_qctrl; +struct au_qctrl audit_qctrl; /* * Condition variable to signal to the worker that it has work to do: * either new records are in the queue, or a log replacement is taking * place. */ -struct cv audit_cv; +struct cv audit_cv; /* * Condition variable to signal to the worker that it has work to do: @@ -145,14 +145,14 @@ * * XXXRW: This description is incorrect. */ -struct cv audit_commit_cv; +struct cv audit_commit_cv; -/* - * Condition variable for auditing threads wait on when in fail-stop mode. - * Threads wait on this CV forever (and ever), never seeing the light of +/* + * Condition variable for auditing threads wait on when in fail-stop mode. + * Threads wait on this CV forever (and ever), never seeing the light of * day again. */ -static struct cv audit_fail_cv; +static struct cv audit_fail_cv; /* * Construct an audit record for the passed thread. @@ -228,7 +228,7 @@ audit_in_failure = 0; audit_fstat.af_filesz = 0; /* '0' means unset, unbounded */ - audit_fstat.af_currsz = 0; + audit_fstat.af_currsz = 0; audit_nae_mask.am_success = AU_NULL; audit_nae_mask.am_failure = AU_NULL; @@ -353,7 +353,7 @@ aumask = &audit_nae_mask; else aumask = &ar->k_ar.ar_subj_amask; - + if (error) sorf = AU_PRS_FAILURE; else @@ -363,7 +363,7 @@ case AUE_OPEN_RWTC: /* The open syscall always writes a AUE_OPEN_RWTC event; change - * it to the proper type of event based on the flags and the + * it to the proper type of event based on the flags and the * error value. */ ar->k_ar.ar_event = flags_and_error_to_openevent( @@ -421,7 +421,7 @@ uma_zfree(audit_record_zone, ar); return; } - + /* * Constrain the number of committed audit records based on * the configurable parameter. @@ -480,9 +480,9 @@ aumask = &audit_nae_mask; else aumask = &td->td_proc->p_au->ai_mask; - + /* - * Allocate an audit record, if preselection allows it, and store + * Allocate an audit record, if preselection allows it, and store * in the thread for later use. */ if (au_preselect(audit_event, aumask, @@ -533,7 +533,7 @@ audit_commit(td->td_ar, error, retval); if (td->td_ar != NULL) - AUDIT_PRINTF(("audit record committed by pid %d\n", + AUDIT_PRINTF(("audit record committed by pid %d\n", td->td_proc->p_pid)); td->td_ar = NULL; @@ -573,11 +573,11 @@ KASSERT(td->td_ar == NULL, ("audit_thread_free: td_ar != NULL")); } -/* - * Initialize the audit information for the a process, presumably the first +/* + * Initialize the audit information for the a process, presumably the first * process in the system. - * XXX It is not clear what the initial values should be for audit ID, - * session ID, etc. + * XXX It is not clear what the initial values should be for audit ID, + * session ID, etc. */ void audit_proc_kproc0(struct proc *p) @@ -600,7 +600,7 @@ p->p_au->ai_auid = AU_DEFAUDITID; } -/* +/* * Copy the audit info from the parent process to the child process when * a fork takes place. */ @@ -626,7 +626,7 @@ } /* - * Free the auditing structure for the process. + * Free the auditing structure for the process. */ void audit_proc_free(struct proc *p) ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#14 (text+ko) ==== @@ -76,7 +76,7 @@ #define ARG_AUID 0x0000000000000100ULL #define ARG_GID 0x0000000000000200ULL #define ARG_FD 0x0000000000000400ULL -#define ARG_POSIX_IPC_PERM 0x0000000000000800ULL +#define ARG_POSIX_IPC_PERM 0x0000000000000800ULL #define ARG_FFLAGS 0x0000000000001000ULL #define ARG_MODE 0x0000000000002000ULL #define ARG_DEV 0x0000000000004000ULL @@ -116,76 +116,67 @@ #define ARG_NONE 0x0000000000000000ULL #define ARG_ALL 0xFFFFFFFFFFFFFFFFULL -void audit_syscall_enter(unsigned short code, - struct thread *td); -void audit_syscall_exit(int error, struct thread *td); +void audit_syscall_enter(unsigned short code, struct thread *td); +void audit_syscall_exit(int error, struct thread *td); /* * The remaining kernel functions are conditionally compiled in as they - * are wrapped by a macro, and the macro should be the only place in + * are wrapped by a macro, and the macro should be the only place in * the source tree where these functions are referenced. */ #ifdef AUDIT struct ipc_perm; struct sockaddr; union auditon_udata; -void audit_arg_addr(void * addr); -void audit_arg_exit(int status, int retval); -void audit_arg_len(int len); -void audit_arg_fd(int fd); -void audit_arg_fflags(int fflags); -void audit_arg_gid(gid_t gid); -void audit_arg_uid(uid_t uid); -void audit_arg_egid(gid_t egid); -void audit_arg_euid(uid_t euid); -void audit_arg_rgid(gid_t rgid); -void audit_arg_ruid(uid_t ruid); -void audit_arg_sgid(gid_t sgid); -void audit_arg_suid(uid_t suid); -void audit_arg_groupset(gid_t *gidset, u_int gidset_size); -void audit_arg_login(char *login); -void audit_arg_ctlname(int *name, int namelen); -void audit_arg_mask(int mask); -void audit_arg_mode(mode_t mode); -void audit_arg_dev(int dev); -void audit_arg_value(long value); -void audit_arg_owner(uid_t uid, gid_t gid); -void audit_arg_pid(pid_t pid); -void audit_arg_process(struct proc *p); -void audit_arg_signum(u_int signum); -void audit_arg_socket(int sodomain, int sotype, - int soprotocol); -void audit_arg_sockaddr(struct thread *td, - struct sockaddr *so); -void audit_arg_auid(uid_t auid); -void audit_arg_auditinfo(struct auditinfo *au_info); -void audit_arg_upath(struct thread *td, char *upath, - u_int64_t flags); -void audit_arg_vnode(struct vnode *vp, u_int64_t flags); -void audit_arg_text(char *text); -void audit_arg_iovec(struct iovec *iov, - unsigned int iovcnt); -void audit_arg_cmd(int cmd); -void audit_arg_svipc_cmd(int cmd); -void audit_arg_svipc_perm(struct ipc_perm *perm); -void audit_arg_svipc_id(int id); -void audit_arg_svipc_addr(void *addr); -void audit_arg_posix_ipc_perm(uid_t uid, gid_t gid, - mode_t mode); -void audit_arg_auditon(union auditon_udata *udata); -void audit_arg_file(struct proc *p, struct file *fp); - -void audit_sysclose(struct thread *td, int fd); +void audit_arg_addr(void * addr); +void audit_arg_exit(int status, int retval); +void audit_arg_len(int len); +void audit_arg_fd(int fd); +void audit_arg_fflags(int fflags); +void audit_arg_gid(gid_t gid); +void audit_arg_uid(uid_t uid); +void audit_arg_egid(gid_t egid); +void audit_arg_euid(uid_t euid); +void audit_arg_rgid(gid_t rgid); +void audit_arg_ruid(uid_t ruid); +void audit_arg_sgid(gid_t sgid); +void audit_arg_suid(uid_t suid); +void audit_arg_groupset(gid_t *gidset, u_int gidset_size); +void audit_arg_login(char *login); +void audit_arg_ctlname(int *name, int namelen); +void audit_arg_mask(int mask); +void audit_arg_mode(mode_t mode); +void audit_arg_dev(int dev); +void audit_arg_value(long value); +void audit_arg_owner(uid_t uid, gid_t gid); +void audit_arg_pid(pid_t pid); +void audit_arg_process(struct proc *p); +void audit_arg_signum(u_int signum); +void audit_arg_socket(int sodomain, int sotype, int soprotocol); +void audit_arg_sockaddr(struct thread *td, struct sockaddr *so); +void audit_arg_auid(uid_t auid); +void audit_arg_auditinfo(struct auditinfo *au_info); +void audit_arg_upath(struct thread *td, char *upath, u_int64_t flags); +void audit_arg_vnode(struct vnode *vp, u_int64_t flags); +void audit_arg_text(char *text); +void audit_arg_iovec(struct iovec *iov, unsigned int iovcnt); +void audit_arg_cmd(int cmd); +void audit_arg_svipc_cmd(int cmd); +void audit_arg_svipc_perm(struct ipc_perm *perm); +void audit_arg_svipc_id(int id); +void audit_arg_svipc_addr(void *addr); +void audit_arg_posix_ipc_perm(uid_t uid, gid_t gid, mode_t mode); +void audit_arg_auditon(union auditon_udata *udata); +void audit_arg_file(struct proc *p, struct file *fp); +void audit_sysclose(struct thread *td, int fd); +void audit_proc_alloc(struct proc *p); +void audit_proc_kproc0(struct proc *p); +void audit_proc_init(struct proc *p); +void audit_proc_fork(struct proc *parent, struct proc *child); +void audit_proc_free(struct proc *p); +void audit_thread_alloc(struct thread *td); +void audit_thread_free(struct thread *td); -void audit_proc_alloc(struct proc *p); -void audit_proc_kproc0(struct proc *p); -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, - struct proc *child); -void audit_proc_free(struct proc *p); -void audit_thread_alloc(struct thread *td); -void audit_thread_free(struct thread *td); - /* * Define a macro to wrap the audit_arg_* calls by checking the global * audit_enabled flag before performing the actual call. @@ -193,23 +184,23 @@ #define AUDIT_ARG(op, args...) do { \ if (audit_enabled) \ audit_arg_ ## op (args); \ - } while (0) +} while (0) #define AUDIT_SYSCALL_ENTER(code, td) do { \ if (audit_enabled) { \ audit_syscall_enter(code, td); \ } \ - } while (0) +} while (0) /* * Wrap the audit_syscall_exit() function so that it is called only when - * auditing is enabled, or we have a audit record on the thread. It is + * auditing is enabled, or we have a audit record on the thread. It is * possible that an audit record was begun before auditing was turned off. */ #define AUDIT_SYSCALL_EXIT(error, td) do { \ if (audit_enabled | (td->td_ar != NULL)) \ audit_syscall_exit(error, td); \ - } while (0) +} while (0) /* * A Macro to wrap the audit_sysclose() function. @@ -217,26 +208,25 @@ #define AUDIT_SYSCLOSE(td, fd) do { \ if (audit_enabled) \ audit_sysclose(td, fd); \ - } while (0) +} while (0) #else /* !AUDIT */ -void audit_proc_init(struct proc *p); -void audit_proc_fork(struct proc *parent, - struct proc *child); -void audit_proc_free(struct proc *p); +void audit_proc_init(struct proc *p); +void audit_proc_fork(struct proc *parent, struct proc *child); +void audit_proc_free(struct proc *p); #define AUDIT_ARG(op, args...) do { \ - } while (0) +} while (0) #define AUDIT_SYSCALL_ENTER(code, td) do { \ - } while (0) +} while (0) #define AUDIT_SYSCALL_EXIT(error, td) do { \ - } while (0) +} while (0) #define AUDIT_SYSCLOSE(p, fd) do { \ - } while (0) +} while (0) #endif /* AUDIT */ ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_arg.c#15 (text+ko) ==== @@ -393,7 +393,7 @@ audit_arg_socket(int sodomain, int sotype, int soprotocol) { struct kaudit_record *ar; - + ar = currecord(); if (ar == NULL) return; @@ -428,7 +428,7 @@ break; case AF_UNIX: - audit_arg_upath(td, ((struct sockaddr_un *)so)->sun_path, + audit_arg_upath(td, ((struct sockaddr_un *)so)->sun_path, ARG_UPATH1); ARG_SET_VALID(ar, ARG_SADDRUNIX); break; @@ -482,7 +482,7 @@ /* Invalidate the text string */ ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_TEXT); if (text == NULL) - return; + return; if (ar->k_ar.ar_arg_text == NULL) ar->k_ar.ar_arg_text = malloc(MAXPATHLEN, M_AUDITTEXT, @@ -513,13 +513,11 @@ for (i = 0; i < iovcnt; i++) { if (!is_auditable_string(iov[i].iov_base, iov[i].iov_len)) continue; - if (first) { - ret = sbuf_printf(&sb, "%s", (char *)iov[i].iov_base); + ret = sbuf_printf(&sb, "%s", (char *)iov[i].iov_base); first = 0; - } else { + } else ret = sbuf_printf(&sb, ":%s", (char *)iov[i].iov_base); - } if (ret != 0) break; } @@ -564,8 +562,8 @@ if (ar == NULL) return; - bcopy(perm, &ar->k_ar.ar_arg_svipc_perm, - sizeof(ar->k_ar.ar_arg_svipc_perm)); + bcopy(perm, &ar->k_ar.ar_arg_svipc_perm, + sizeof(ar->k_ar.ar_arg_svipc_perm)); ARG_SET_VALID(ar, ARG_SVIPC_PERM); } @@ -619,8 +617,8 @@ if (ar == NULL) return; - bcopy((void *)udata, &ar->k_ar.ar_arg_auditon, - sizeof(ar->k_ar.ar_arg_auditon)); + bcopy((void *)udata, &ar->k_ar.ar_arg_auditon, + sizeof(ar->k_ar.ar_arg_auditon)); ARG_SET_VALID(ar, ARG_AUDITON); } @@ -667,20 +665,20 @@ if (so->so_pcb == NULL) return; ar->k_ar.ar_arg_sockinfo.so_type = - so->so_type; + so->so_type; ar->k_ar.ar_arg_sockinfo.so_domain = - INP_SOCKAF(so); + INP_SOCKAF(so); ar->k_ar.ar_arg_sockinfo.so_protocol = - so->so_proto->pr_protocol; + so->so_proto->pr_protocol; pcb = (struct inpcb *)so->so_pcb; ar->k_ar.ar_arg_sockinfo.so_raddr = - pcb->inp_faddr.s_addr; + pcb->inp_faddr.s_addr; ar->k_ar.ar_arg_sockinfo.so_laddr = - pcb->inp_laddr.s_addr; + pcb->inp_laddr.s_addr; ar->k_ar.ar_arg_sockinfo.so_rport = - pcb->inp_fport; + pcb->inp_fport; ar->k_ar.ar_arg_sockinfo.so_lport = - pcb->inp_lport; + pcb->inp_lport; ARG_SET_VALID(ar, ARG_SOCKINFO); } break; @@ -692,11 +690,11 @@ } -/* - * Store a path as given by the user process for auditing into the audit - * record stored on the user thread. This function will allocate the memory to - * store the path info if not already available. This memory will be - * freed when the audit record is freed. +/* + * Store a path as given by the user process for auditing into the audit + * record stored on the user thread. This function will allocate the memory + * to store the path info if not already available. This memory will be freed + * when the audit record is freed. * * XXXAUDIT: Possibly assert that the memory isn't already allocated? */ @@ -706,7 +704,7 @@ struct kaudit_record *ar; char **pathp; - if (td == NULL || upath == NULL) + if (td == NULL || upath == NULL) return; /* nothing to do! */ /* @@ -735,8 +733,8 @@ } /* - * Function to save the path and vnode attr information into the audit - * record. + * Function to save the path and vnode attr information into the audit + * record. * * It is assumed that the caller will hold any vnode locks necessary to * perform a VOP_GETATTR() on the passed vnode. @@ -773,7 +771,7 @@ ASSERT_VOP_LOCKED(vp, "audit_arg_vnode"); ar = currecord(); - if (ar == NULL) /* This will be the case for unaudited system calls */ + if (ar == NULL) return; /* @@ -816,9 +814,9 @@ } /* - * The close() system call uses it's own audit call to capture the - * path/vnode information because those pieces are not easily obtained - * within the system call itself. + * The close() system call uses it's own audit call to capture the path/vnode + * information because those pieces are not easily obtained within the system + * call itself. */ void audit_sysclose(struct thread *td, int fd) @@ -839,4 +837,4 @@ VOP_UNLOCK(vp, 0, td); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); -} +} ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#11 (text+ko) ==== @@ -54,7 +54,7 @@ MALLOC_DEFINE(M_AUDITBSM, "audit_bsm", "Audit BSM data"); -/* +/* * Forward declares. */ static void audit_sys_auditon(struct audit_record *ar, @@ -72,18 +72,16 @@ } /* - * This call reserves memory for the audit record. - * Memory must be guaranteed before any auditable event can be - * generated. - * The au_record structure maintains a reference to the - * memory allocated above and also the list of tokens associated - * with this record - */ -static struct au_record * + * This call reserves memory for the audit record. Memory must be guaranteed + * before any auditable event can be generated. The au_record structure + * maintains a reference to the memory allocated above and also the list of + * tokens associated with this record + */ +static struct au_record * kau_open(void) -{ +{ struct au_record *rec; - + rec = malloc(sizeof(*rec), M_AUDITBSM, M_WAITOK); rec->data = malloc(MAX_AUDIT_RECORD_SIZE * sizeof(u_char), M_AUDITBSM, M_WAITOK | M_ZERO); @@ -96,7 +94,7 @@ /* * Store the token with the record descriptor. - */ + */ static void kau_write(struct au_record *rec, struct au_token *tok) { @@ -118,7 +116,7 @@ size_t tot_rec_size; token_t *cur, *hdr, *trail; struct timeval tm; - + tot_rec_size = rec->len + BSM_HEADER_SIZE + BSM_TRAILER_SIZE; if (tot_rec_size <= MAX_AUDIT_RECORD_SIZE) { /* Create the header token */ @@ -131,34 +129,33 @@ TAILQ_INSERT_TAIL(&rec->token_q, trail, tokens); /* Serialize token data to the record. */ - rec->len = tot_rec_size; dptr = rec->data; TAILQ_FOREACH(cur, &rec->token_q, tokens) { - memcpy(dptr, cur->t_data, cur->len); + memcpy(dptr, cur->t_data, cur->len); dptr += cur->len; } } } /* - * Free a BSM audit record by releasing all the tokens and clearing the - * audit record information. + * Free a BSM audit record by releasing all the tokens and clearing the audit + * record information. */ void kau_free(struct au_record *rec) { struct au_token *tok; - /* Free the token list */ + /* Free the token list. */ while ((tok = TAILQ_FIRST(&rec->token_q))) { TAILQ_REMOVE(&rec->token_q, tok, tokens); free(tok->t_data, M_AUDITBSM); free(tok, M_AUDITBSM); - } + } rec->used = 0; - rec->len = 0; + rec->len = 0; free(rec->data, M_AUDITBSM); free(rec, M_AUDITBSM); } @@ -218,7 +215,8 @@ kau_write(rec, tok); \ } else { \ if (ARG_IS_VALID(kar, ARG_FD)) { \ - tok = au_to_arg32(1, "non-file: fd", ar->ar_arg_fd);\ + tok = au_to_arg32(1, "non-file: fd", \ + ar->ar_arg_fd); \ kau_write(rec, tok); \ } \ } \ @@ -250,92 +248,92 @@ struct au_token *tok; switch (ar->ar_arg_cmd) { - case A_SETPOLICY: + case A_SETPOLICY: if (sizeof(ar->ar_arg_auditon.au_flags) > 4) - tok = au_to_arg64(1, "policy", - ar->ar_arg_auditon.au_flags); + tok = au_to_arg64(1, "policy", + ar->ar_arg_auditon.au_flags); else - tok = au_to_arg32(1, "policy", - ar->ar_arg_auditon.au_flags); + tok = au_to_arg32(1, "policy", + ar->ar_arg_auditon.au_flags); kau_write(rec, tok); break; - case A_SETKMASK: - tok = au_to_arg32(2, "setkmask:as_success", - ar->ar_arg_auditon.au_mask.am_success); + case A_SETKMASK: + tok = au_to_arg32(2, "setkmask:as_success", + ar->ar_arg_auditon.au_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(2, "setkmask:as_failure", - ar->ar_arg_auditon.au_mask.am_failure); + tok = au_to_arg32(2, "setkmask:as_failure", + ar->ar_arg_auditon.au_mask.am_failure); kau_write(rec, tok); break; - case A_SETQCTRL: - tok = au_to_arg32(3, "setqctrl:aq_hiwater", - ar->ar_arg_auditon.au_qctrl.aq_hiwater); + case A_SETQCTRL: + tok = au_to_arg32(3, "setqctrl:aq_hiwater", + ar->ar_arg_auditon.au_qctrl.aq_hiwater); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_lowater", - ar->ar_arg_auditon.au_qctrl.aq_lowater); + tok = au_to_arg32(3, "setqctrl:aq_lowater", + ar->ar_arg_auditon.au_qctrl.aq_lowater); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_bufsz", - ar->ar_arg_auditon.au_qctrl.aq_bufsz); + tok = au_to_arg32(3, "setqctrl:aq_bufsz", + ar->ar_arg_auditon.au_qctrl.aq_bufsz); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_delay", - ar->ar_arg_auditon.au_qctrl.aq_delay); + tok = au_to_arg32(3, "setqctrl:aq_delay", + ar->ar_arg_auditon.au_qctrl.aq_delay); kau_write(rec, tok); - tok = au_to_arg32(3, "setqctrl:aq_minfree", - ar->ar_arg_auditon.au_qctrl.aq_minfree); + tok = au_to_arg32(3, "setqctrl:aq_minfree", + ar->ar_arg_auditon.au_qctrl.aq_minfree); kau_write(rec, tok); break; - case A_SETUMASK: - tok = au_to_arg32(3, "setumask:as_success", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); + case A_SETUMASK: + tok = au_to_arg32(3, "setumask:as_success", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(3, "setumask:as_failure", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); + tok = au_to_arg32(3, "setumask:as_failure", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); kau_write(rec, tok); break; - case A_SETSMASK: - tok = au_to_arg32(3, "setsmask:as_success", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); + case A_SETSMASK: + tok = au_to_arg32(3, "setsmask:as_success", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(3, "setsmask:as_failure", - ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); + tok = au_to_arg32(3, "setsmask:as_failure", + ar->ar_arg_auditon.au_auinfo.ai_mask.am_failure); kau_write(rec, tok); break; - case A_SETCOND: + case A_SETCOND: if (sizeof(ar->ar_arg_auditon.au_cond) > 4) - tok = au_to_arg64(3, "setcond", - ar->ar_arg_auditon.au_cond); + tok = au_to_arg64(3, "setcond", + ar->ar_arg_auditon.au_cond); else - tok = au_to_arg32(3, "setcond", - ar->ar_arg_auditon.au_cond); + tok = au_to_arg32(3, "setcond", + ar->ar_arg_auditon.au_cond); kau_write(rec, tok); break; - case A_SETCLASS: + case A_SETCLASS: tok = au_to_arg32(2, "setclass:ec_event", - ar->ar_arg_auditon.au_evclass.ec_number); + ar->ar_arg_auditon.au_evclass.ec_number); kau_write(rec, tok); tok = au_to_arg32(3, "setclass:ec_class", - ar->ar_arg_auditon.au_evclass.ec_class); + ar->ar_arg_auditon.au_evclass.ec_class); kau_write(rec, tok); break; - case A_SETPMASK: - tok = au_to_arg32(2, "setpmask:as_success", - ar->ar_arg_auditon.au_aupinfo.ap_mask.am_success); + case A_SETPMASK: + tok = au_to_arg32(2, "setpmask:as_success", + ar->ar_arg_auditon.au_aupinfo.ap_mask.am_success); kau_write(rec, tok); - tok = au_to_arg32(2, "setpmask:as_failure", - ar->ar_arg_auditon.au_aupinfo.ap_mask.am_failure); + tok = au_to_arg32(2, "setpmask:as_failure", + ar->ar_arg_auditon.au_aupinfo.ap_mask.am_failure); kau_write(rec, tok); break; - case A_SETFSIZE: - tok = au_to_arg32(2, "setfsize:filesize", - ar->ar_arg_auditon.au_fstat.af_filesz); + case A_SETFSIZE: + tok = au_to_arg32(2, "setfsize:filesize", + ar->ar_arg_auditon.au_fstat.af_filesz); kau_write(rec, tok); break; @@ -345,13 +343,14 @@ } /* - * Convert an internal kernel audit record to a BSM record and return - * a success/failure indicator. The BSM record is passed as an out - * parameter to this function. + * Convert an internal kernel audit record to a BSM record and return a + * success/failure indicator. The BSM record is passed as an out parameter to + * this function. + * * Return conditions: * BSM_SUCCESS: The BSM record is valid * BSM_FAILURE: Failure; the BSM record is NULL. - * BSM_NOAUDIT: The event is not auditable for BSM; the BSM record is NULL. + * BSM_NOAUDIT: The event is not auditable for BSM; the BSM record is NULL. */ int kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau) @@ -380,35 +379,35 @@ ar->ar_subj_asid, /* session ID */ &tid); - /* The logic inside each case fills in the tokens required for the - * event, except for the header, trailer, and return tokens. The + /* + * The logic inside each case fills in the tokens required for the + * event, except for the header, trailer, and return tokens. The * header and trailer tokens are added by the kau_close() function. * The return token is added outside of the switch statement. - */ + */ switch(ar->ar_event) { - - /* - * Socket-related events. - */ case AUE_ACCEPT: case AUE_BIND: case AUE_CONNECT: case AUE_RECVFROM: - case AUE_RECVMSG: + case AUE_RECVMSG: case AUE_SENDMSG: case AUE_SENDTO: + /* + * Socket-related events. + */ if (ARG_IS_VALID(kar, ARG_FD)) { tok = au_to_arg32(1, "fd", ar->ar_arg_fd); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_SADDRINET)) { - tok = au_to_sock_inet( - (struct sockaddr_in *)&ar->ar_arg_sockaddr); + tok = au_to_sock_inet((struct sockaddr_in *) + &ar->ar_arg_sockaddr); kau_write(rec, tok); } if (ARG_IS_VALID(kar, ARG_SADDRUNIX)) { - tok = au_to_sock_unix( - (struct sockaddr_un *)&ar->ar_arg_sockaddr); + tok = au_to_sock_unix((struct sockaddr_un *) + &ar->ar_arg_sockaddr); kau_write(rec, tok); UPATH1_TOKENS; } @@ -469,21 +468,23 @@ case AUE_SETAUDIT: if (ARG_IS_VALID(kar, ARG_AUID)) { - tok = au_to_arg32(1, "setaudit:auid", ar->ar_arg_auid); + tok = au_to_arg32(1, "setaudit:auid", + ar->ar_arg_auid); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:port", - ar->ar_arg_termid.port); + tok = au_to_arg32(1, "setaudit:port", + ar->ar_arg_termid.port); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:machine", - ar->ar_arg_termid.machine); + tok = au_to_arg32(1, "setaudit:machine", + ar->ar_arg_termid.machine); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:as_success", - ar->ar_arg_amask.am_success); + tok = au_to_arg32(1, "setaudit:as_success", + ar->ar_arg_amask.am_success); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:as_failure", - ar->ar_arg_amask.am_failure); + tok = au_to_arg32(1, "setaudit:as_failure", + ar->ar_arg_amask.am_failure); kau_write(rec, tok); - tok = au_to_arg32(1, "setaudit:asid", ar->ar_arg_asid); + tok = au_to_arg32(1, "setaudit:asid", + ar->ar_arg_asid); kau_write(rec, tok); } break; @@ -492,7 +493,9 @@ break; /* XXX need to add arguments */ case AUE_AUDITON: - /* For AUDITON commands without own event, audit the cmd */ + /* + * For AUDITON commands without own event, audit the cmd. + */ if (ARG_IS_VALID(kar, ARG_CMD)) { tok = au_to_arg32(1, "cmd", ar->ar_arg_cmd); kau_write(rec, tok); @@ -515,11 +518,10 @@ case AUE_AUDITON_SETUMASK: case AUE_AUDITON_SPOLICY: case AUE_AUDITON_SQCTRL: - if (ARG_IS_VALID(kar, ARG_AUDITON)) { + if (ARG_IS_VALID(kar, ARG_AUDITON)) audit_sys_auditon(ar, rec); - } break; - + case AUE_AUDITCTL: UPATH1_VNODE1_TOKENS; break; @@ -544,7 +546,9 @@ case AUE_SETSID: case AUE_SETTIMEOFDAY: case AUE_NEWSYSTEMSHREG: - /* Header, subject, and return tokens added at end */ + /* + * Header, subject, and return tokens added at end. + */ break; case AUE_MKFIFO: @@ -584,16 +588,17 @@ } UPATH1_VNODE1_TOKENS; break; - + case AUE_CHMOD: case AUE_LCHMOD: if (ARG_IS_VALID(kar, ARG_MODE)) { - tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); + tok = au_to_arg32(2, "new file mode", + ar->ar_arg_mode); kau_write(rec, tok); } UPATH1_VNODE1_TOKENS; break; - + case AUE_CHOWN: case AUE_LCHOWN: if (ARG_IS_VALID(kar, ARG_UID)) { @@ -606,7 +611,7 @@ } UPATH1_VNODE1_TOKENS; break; - + case AUE_EXCHANGEDATA: UPATH1_VNODE1_TOKENS; UPATH2_TOKENS; @@ -622,12 +627,13 @@ case AUE_FCHMOD: if (ARG_IS_VALID(kar, ARG_MODE)) { - tok = au_to_arg32(2, "new file mode", ar->ar_arg_mode); + tok = au_to_arg32(2, "new file mode", + ar->ar_arg_mode); kau_write(rec, tok); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 19 18:25:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D279616A422; Sun, 19 Mar 2006 18:25:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9555316A41F for ; Sun, 19 Mar 2006 18:25:07 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 448B143D48 for ; Sun, 19 Mar 2006 18:25:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JIP79L018997 for ; Sun, 19 Mar 2006 18:25:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JIP6Gn018994 for perforce@freebsd.org; Sun, 19 Mar 2006 18:25:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 18:25:06 GMT Message-Id: <200603191825.k2JIP6Gn018994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93583 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 18:25:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=93583 Change 93583 by rwatson@rwatson_peppercorn on 2006/03/19 18:24:38 Rename audit_cv to audit_worker_cv, as it wakes up the audit worker. Rename audit_commit_cv to audit_watermark_cv, since it is there to wake up threads waiting on hitting the low watermark. Describe properly in comment. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#24 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#24 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#24 (text+ko) ==== @@ -136,16 +136,14 @@ * either new records are in the queue, or a log replacement is taking * place. */ -struct cv audit_cv; +struct cv audit_worker_cv; /* - * Condition variable to signal to the worker that it has work to do: - * either new records are in the queue, or a log replacement is taking - * place. - * - * XXXRW: This description is incorrect. + * Condition variable to flag when crossing the low watermark, meaning that + * threads blocked due to hitting the high watermark can wake up and continue + * to commit records. */ -struct cv audit_commit_cv; +struct cv audit_watermark_cv; /* * Condition variable for auditing threads wait on when in fail-stop mode. @@ -241,8 +239,8 @@ audit_qctrl.aq_minfree = AU_FS_MINFREE; mtx_init(&audit_mtx, "audit_mtx", NULL, MTX_DEF); - cv_init(&audit_cv, "audit_cv"); - cv_init(&audit_commit_cv, "audit_commit_cv"); + cv_init(&audit_worker_cv, "audit_worker_cv"); + cv_init(&audit_watermark_cv, "audit_watermark_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); audit_record_zone = uma_zcreate("audit_record_zone", @@ -429,7 +427,7 @@ while (audit_q_len >= audit_qctrl.aq_hiwater) { AUDIT_PRINTF(("audit_commit: sleeping to wait for " "audit queue to drain below high water mark\n")); - cv_wait(&audit_commit_cv, &audit_mtx); + cv_wait(&audit_watermark_cv, &audit_mtx); AUDIT_PRINTF(("audit_commit: woke up waiting for " "audit queue draining\n")); } @@ -437,7 +435,7 @@ TAILQ_INSERT_TAIL(&audit_q, ar, k_q); audit_q_len++; audit_pre_q_len--; - cv_signal(&audit_cv); + cv_signal(&audit_worker_cv); mtx_unlock(&audit_mtx); } ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_private.h#24 (text+ko) ==== @@ -278,8 +278,8 @@ * be abstracted so that only accessor methods are exposed. */ extern struct mtx audit_mtx; -extern struct cv audit_commit_cv; -extern struct cv audit_cv; +extern struct cv audit_watermark_cv; +extern struct cv audit_worker_cv; extern struct kaudit_queue audit_q; extern int audit_q_len; extern int audit_pre_q_len; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#4 (text+ko) ==== @@ -420,7 +420,7 @@ */ while (!audit_replacement_flag && TAILQ_EMPTY(&audit_q)) { AUDIT_PRINTF(("audit_worker waiting\n")); - cv_wait(&audit_cv, &audit_mtx); + cv_wait(&audit_worker_cv, &audit_mtx); AUDIT_PRINTF(("audit_worker woken up\n")); AUDIT_PRINTF(("audit_worker: new vp = %p; value of " "flag %d\n", audit_replacement_vp, @@ -460,7 +460,7 @@ TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); } if (lowater_signal) - cv_broadcast(&audit_commit_cv); + cv_broadcast(&audit_watermark_cv); mtx_unlock(&audit_mtx); while ((ar = TAILQ_FIRST(&ar_worklist))) { @@ -525,7 +525,7 @@ * Wake up the audit worker to perform the exchange once we * release the mutex. */ - cv_signal(&audit_cv); + cv_signal(&audit_worker_cv); /* * Wait for the audit_worker to broadcast that a replacement has From owner-p4-projects@FreeBSD.ORG Sun Mar 19 19:08:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AF4216A427; Sun, 19 Mar 2006 19:08:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB90416A41F for ; Sun, 19 Mar 2006 19:08:47 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 932F243D48 for ; Sun, 19 Mar 2006 19:08:47 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JJ8lfx020333 for ; Sun, 19 Mar 2006 19:08:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JJ8lEf020330 for perforce@freebsd.org; Sun, 19 Mar 2006 19:08:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 19:08:47 GMT Message-Id: <200603191908.k2JJ8lEf020330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 19:08:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=93587 Change 93587 by rwatson@rwatson_peppercorn on 2006/03/19 19:07:46 Use struct kaudit_queue instead of a hand-crafted queue type for audit records in the audit_worker thread. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#5 (text+ko) ==== @@ -394,7 +394,7 @@ static void audit_worker(void *arg) { - TAILQ_HEAD(, kaudit_record) ar_worklist; + struct kaudit_queue ar_worklist; struct kaudit_record *ar; struct ucred *audit_cred; struct thread *audit_td; From owner-p4-projects@FreeBSD.ORG Sun Mar 19 19:21:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B96216A423; Sun, 19 Mar 2006 19:21:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C17D16A41F for ; Sun, 19 Mar 2006 19:21:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9A3E43D53 for ; Sun, 19 Mar 2006 19:21:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JJL2DD020894 for ; Sun, 19 Mar 2006 19:21:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JJL2Ek020891 for perforce@freebsd.org; Sun, 19 Mar 2006 19:21:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 19:21:02 GMT Message-Id: <200603191921.k2JJL2Ek020891@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93588 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 19:21:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=93588 Change 93588 by rwatson@rwatson_peppercorn on 2006/03/19 19:20:12 Assert audit mtx in audit_worker_drain(). Break out logic to call audit_record_write() and handle error conditions into audit_worker_process_record(). This will be the future home of some logic now present in audit_record_write() also. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#6 (text+ko) ==== @@ -376,6 +376,8 @@ { struct kaudit_record *ar; + mtx_assert(&audit_mtx, MA_OWNED); + while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); audit_free(ar); @@ -384,6 +386,31 @@ } /* + * Given a kernel audit record, process as required. Currently, that means + * passing it to audit_record_write(), but in the future it will mean + * converting it to BSM and then routing it to various possible output + * streams, including the audit trail and audit pipes. The caller will free + * the record. + */ +static void +audit_worker_process_record(struct vnode *audit_vp, struct ucred *audit_cred, + struct thread *audit_td, struct kaudit_record *ar) +{ + int error; + + if (audit_vp == NULL) + return; + + error = audit_record_write(audit_vp, ar, audit_cred, audit_td); + if (error) { + if (audit_panic_on_write_fail) + panic("audit_worker: write error %d\n", error); + else + printf("audit_worker: write error %d\n", error); + } +} + +/* * The audit_worker thread is responsible for watching the event queue, * dequeueing records, converting them to BSM format, and committing them to * disk. In order to minimize lock thrashing, records are dequeued in sets @@ -399,7 +426,7 @@ struct ucred *audit_cred; struct thread *audit_td; struct vnode *audit_vp; - int error, lowater_signal; + int lowater_signal; AUDIT_PRINTF(("audit_worker starting\n")); @@ -465,16 +492,8 @@ mtx_unlock(&audit_mtx); while ((ar = TAILQ_FIRST(&ar_worklist))) { TAILQ_REMOVE(&ar_worklist, ar, k_q); - if (audit_vp != NULL) { - error = audit_record_write(audit_vp, ar, - audit_cred, audit_td); - if (error && audit_panic_on_write_fail) - panic("audit_worker: write error %d\n", - error); - else if (error) - printf("audit_worker: write error %d\n", - error); - } + audit_worker_process_record(audit_vp, audit_cred, + audit_td, ar); audit_free(ar); } mtx_lock(&audit_mtx); From owner-p4-projects@FreeBSD.ORG Sun Mar 19 20:22:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BD6116A423; Sun, 19 Mar 2006 20:22:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17CAE16A420 for ; Sun, 19 Mar 2006 20:22:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB6D243D45 for ; Sun, 19 Mar 2006 20:22:22 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JKMMYI023304 for ; Sun, 19 Mar 2006 20:22:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JKMMg1023301 for perforce@freebsd.org; Sun, 19 Mar 2006 20:22:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 20:22:22 GMT Message-Id: <200603192022.k2JKMMg1023301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 20:22:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=93595 Change 93595 by rwatson@rwatson_peppercorn on 2006/03/19 20:22:12 Pull BSM conversion logic out of audit_record_write(), as well as knowledge of user vs. kernel audit records into audit_worker_process_record(). This largely confines vnode knowledge to audit_record_write(), but avoids that logic knowing about BSM as opposed to byte streams. This will allow us to improve our ability to support real-time audit stream processing by audit pipe consumers while auditing is disabled, but this support is not yet complete. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#7 (text+ko) ==== @@ -109,16 +109,18 @@ * we accounted for. */ static int -audit_record_write(struct vnode *vp, struct kaudit_record *ar, - struct ucred *cred, struct thread *td) +audit_record_write(struct vnode *vp, struct ucred *cred, struct thread *td, + void *data, size_t len) { int ret; long temp; - struct au_record *bsm; struct vattr vattr; struct statfs *mnt_stat = &vp->v_mount->mnt_stat; int vfslocked; + if (vp == NULL) + return (0); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); /* @@ -214,75 +216,9 @@ audit_in_failure = 1; } - /* - * If there is a user audit record attached to the kernel record, - * then write the user record. - * - * XXX Need to decide a few things here: IF the user audit record is - * written, but the write of the kernel record fails, what to do? - * Should the kernel record come before or after the user record? - * For now, we write the user record first, and we ignore errors. - */ - if (ar->k_ar_commit & AR_COMMIT_USER) { - /* - * Try submitting the record to any active audit pipes. - */ - audit_pipe_submit((void *)ar->k_udata, ar->k_ulen); - - /* - * And to disk. - */ - ret = vn_rdwr(UIO_WRITE, vp, (void *)ar->k_udata, ar->k_ulen, - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, - NULL, td); - if (ret) - goto out; - } - - /* - * Convert the internal kernel record to BSM format and write it out - * if everything's OK. - */ - if (!(ar->k_ar_commit & AR_COMMIT_KERNEL)) { - ret = 0; - goto out; - } - - /* - * XXXAUDIT: Should we actually allow this conversion to fail? With - * sleeping memory allocation and invariants checks, perhaps not. - */ - ret = kaudit_to_bsm(ar, &bsm); - if (ret == BSM_NOAUDIT) { - ret = 0; - goto out; - } - - /* - * XXX: We drop the record on BSM conversion failure, but really this - * is an assertion failure. - */ - if (ret == BSM_FAILURE) { - AUDIT_PRINTF(("BSM conversion failure\n")); - ret = EINVAL; - goto out; - } - - /* - * Try submitting the record to any active audit pipes. - */ - audit_pipe_submit((void *)bsm->data, bsm->len); + ret = vn_rdwr(UIO_WRITE, vp, data, len, (off_t)0, UIO_SYSSPACE, + IO_APPEND|IO_UNIT, cred, NULL, NULL, td); - /* - * XXX We should break the write functionality away from the BSM - * record generation and have the BSM generation done before this - * function is called. This function will then take the BSM record as - * a parameter. - */ - ret = (vn_rdwr(UIO_WRITE, vp, (void *)bsm->data, bsm->len, (off_t)0, - UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, NULL, td)); - kau_free(bsm); - out: /* * When we're done processing the current record, we have to check to @@ -386,27 +322,55 @@ } /* - * Given a kernel audit record, process as required. Currently, that means - * passing it to audit_record_write(), but in the future it will mean - * converting it to BSM and then routing it to various possible output - * streams, including the audit trail and audit pipes. The caller will free - * the record. + * Given a kernel audit record, process as required. Kernel audit records + * are converted to one, or possibly two, BSM records, depending on whether + * there is a user audit record present also. Kernel records need be + * converted to BSM before they can be written out. Both types will be + * written to disk, and audit pipes. */ static void audit_worker_process_record(struct vnode *audit_vp, struct ucred *audit_cred, struct thread *audit_td, struct kaudit_record *ar) { - int error; + struct au_record *bsm; + int error, ret; - if (audit_vp == NULL) - return; - - error = audit_record_write(audit_vp, ar, audit_cred, audit_td); - if (error) { - if (audit_panic_on_write_fail) + if (ar->k_ar_commit & AR_COMMIT_USER) { + error = audit_record_write(audit_vp, audit_cred, audit_td, + ar->k_udata, ar->k_ulen); + if (error && audit_panic_on_write_fail) panic("audit_worker: write error %d\n", error); - else + else if (error) printf("audit_worker: write error %d\n", error); + audit_pipe_submit(ar->k_udata, ar->k_ulen); + } + + if (ar->k_ar_commit & AR_COMMIT_KERNEL) { + ret = kaudit_to_bsm(ar, &bsm); + switch (ret) { + case BSM_NOAUDIT: + break; + + case BSM_FAILURE: + printf("audit_worker_process_record: BSM_FAILURE\n"); + break; + + case BSM_SUCCESS: + error = audit_record_write(audit_vp, audit_cred, + audit_td, bsm->data, bsm->len); + if (error && audit_panic_on_write_fail) + panic("audit_worker: write error %d\n", + error); + else if (error) + printf("audit_worker: write error %d\n", + error); + audit_pipe_submit(bsm->data, bsm->len); + kau_free(bsm); + break; + + default: + panic("kaudit_to_bsm returned %d", ret); + } } } From owner-p4-projects@FreeBSD.ORG Sun Mar 19 20:25:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EC3E16A423; Sun, 19 Mar 2006 20:25:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E39A16A401 for ; Sun, 19 Mar 2006 20:25:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D7F443D49 for ; Sun, 19 Mar 2006 20:25:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JKPQHl023422 for ; Sun, 19 Mar 2006 20:25:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JKPQYd023419 for perforce@freebsd.org; Sun, 19 Mar 2006 20:25:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 20:25:26 GMT Message-Id: <200603192025.k2JKPQYd023419@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 20:25:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=93596 Change 93596 by rwatson@rwatson_peppercorn on 2006/03/19 20:24:58 No longer unconditionally drain the audit record queue if there is not an active audit trail: instead, continue to iterate through each record in case an audit pipe is interested. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_worker.c#8 (text+ko) ==== @@ -304,24 +304,6 @@ } /* - * Drain the audit commit queue and free the records. Used if there are - * records present, but no audit log target. - */ -static void -audit_worker_drain(void) -{ - struct kaudit_record *ar; - - mtx_assert(&audit_mtx, MA_OWNED); - - while ((ar = TAILQ_FIRST(&audit_q))) { - TAILQ_REMOVE(&audit_q, ar, k_q); - audit_free(ar); - audit_q_len--; - } -} - -/* * Given a kernel audit record, process as required. Kernel audit records * are converted to one, or possibly two, BSM records, depending on whether * there is a user audit record present also. Kernel records need be @@ -424,23 +406,11 @@ audit_worker_rotate(&audit_cred, &audit_vp, audit_td); /* - * If we have records, but there's no active vnode to write - * to, drain the record queue. Generally, we prevent the - * unnecessary allocation of records elsewhere, but we need - * to allow for races between conditional allocation and - * queueing. Go back to waiting when we're done. - */ - if (audit_vp == NULL) { - audit_worker_drain(); - continue; - } - - /* - * We have both records to write and an active vnode to write - * to. Dequeue a record, and start the write. Eventually, - * it might make sense to dequeue several records and perform - * our own clustering, if the lower layers aren't doing it - * automatically enough. + * If there are records in the global audit record queue, + * transfer them to a thread-local queue and process them + * one by one. If we cross the low watermark threshold, + * signal any waiting processes that they may wake up and + * continue generating records. */ lowater_signal = 0; while ((ar = TAILQ_FIRST(&audit_q))) { From owner-p4-projects@FreeBSD.ORG Sun Mar 19 20:57:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4562216A422; Sun, 19 Mar 2006 20:57:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 205EA16A41F for ; Sun, 19 Mar 2006 20:57:06 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E32D943D49 for ; Sun, 19 Mar 2006 20:57:05 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JKv5jI032505 for ; Sun, 19 Mar 2006 20:57:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JKv5RZ032502 for perforce@freebsd.org; Sun, 19 Mar 2006 20:57:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 20:57:05 GMT Message-Id: <200603192057.k2JKv5RZ032502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 20:57:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=93598 Change 93598 by rwatson@rwatson_peppercorn on 2006/03/19 20:56:21 Shorten audit record zone name. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#25 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#25 (text+ko) ==== @@ -243,7 +243,7 @@ cv_init(&audit_watermark_cv, "audit_watermark_cv"); cv_init(&audit_fail_cv, "audit_fail_cv"); - audit_record_zone = uma_zcreate("audit_record_zone", + audit_record_zone = uma_zcreate("audit_record", sizeof(struct kaudit_record), audit_record_ctor, audit_record_dtor, NULL, NULL, UMA_ALIGN_PTR, 0); From owner-p4-projects@FreeBSD.ORG Sun Mar 19 21:31:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24DC416A423; Sun, 19 Mar 2006 21:31:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F38D716A41F for ; Sun, 19 Mar 2006 21:31:50 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C029743D45 for ; Sun, 19 Mar 2006 21:31:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JLVox0034101 for ; Sun, 19 Mar 2006 21:31:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JLVo0m034098 for perforce@freebsd.org; Sun, 19 Mar 2006 21:31:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 21:31:50 GMT Message-Id: <200603192131.k2JLVo0m034098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93603 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 21:31:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93603 Change 93603 by rwatson@rwatson_peppercorn on 2006/03/19 21:31:14 Rename wait_for_triggers() to wait_for_events(), as it is waiting for both triggers and signals to perform state transitions. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#13 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 $ */ #include @@ -596,10 +596,10 @@ } /* - * Read the control file for triggers and handle appropriately. + * Read the control file for triggers/signals and handle appropriately. */ static int -wait_for_triggers(void) +wait_for_events(void) { int num; unsigned int trigger; @@ -814,7 +814,7 @@ setup(); - rc = wait_for_triggers(); + rc = wait_for_events(); syslog(LOG_INFO, "auditd exiting.\n"); exit(rc); From owner-p4-projects@FreeBSD.ORG Sun Mar 19 21:50:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22CF116A424; Sun, 19 Mar 2006 21:50:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC21F16A422 for ; Sun, 19 Mar 2006 21:50:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFD3A43D68 for ; Sun, 19 Mar 2006 21:50:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JLoDPa034973 for ; Sun, 19 Mar 2006 21:50:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JLoDCQ034970 for perforce@freebsd.org; Sun, 19 Mar 2006 21:50:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 21:50:13 GMT Message-Id: <200603192150.k2JLoDCQ034970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 21:50:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=93605 Change 93605 by rwatson@rwatson_peppercorn on 2006/03/19 21:49:49 Set some syslog() calls to LOG_DEBUG and LOG_ERR instead of LOG_INFO. Remove carriage returns from log messages. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#15 $ */ #include @@ -127,7 +127,7 @@ const char *sep = "/"; curdir = dirent->dirname; - syslog(LOG_INFO, "dir = %s\n", dirent->dirname); + syslog(LOG_DEBUG, "dir = %s", dirent->dirname); fn = malloc(strlen(curdir) + strlen(sep) + (2 * POSTFIX_LEN) + 1); if (fn == NULL) @@ -158,10 +158,10 @@ *ptr = '.'; strcpy(ptr+1, TS); if (rename(oldname, lastfile) != 0) - syslog(LOG_ERR, "Could not rename %s to %s \n", + syslog(LOG_ERR, "Could not rename %s to %s", oldname, lastfile); else - syslog(LOG_INFO, "renamed %s to %s \n", + syslog(LOG_INFO, "renamed %s to %s", oldname, lastfile); } free(lastfile); @@ -241,7 +241,7 @@ /* Try until we succeed. */ while ((dirent = TAILQ_FIRST(&dir_q))) { if ((fn = affixdir(timestr, dirent)) == NULL) { - syslog(LOG_INFO, "Failed to swap log at time %s\n", + syslog(LOG_INFO, "Failed to swap log at time %s", timestr); return (-1); } @@ -250,7 +250,7 @@ * Create and open the file; then close and pass to the * kernel if all went well. */ - syslog(LOG_INFO, "New audit file is %s\n", fn); + syslog(LOG_INFO, "New audit file is %s", fn); #ifdef AUDIT_REVIEW_GROUP fd = open_trail(fn, uid, gid); #else @@ -262,7 +262,7 @@ error = auditctl(fn); if (error) { syslog(LOG_ERR, - "auditctl failed setting log file! : %s\n", + "auditctl failed setting log file! : %s", strerror(errno)); close(fd); } else { @@ -284,7 +284,7 @@ free(dirent->dirname); free(dirent); } - syslog(LOG_INFO, "Log directories exhausted\n"); + syslog(LOG_ERR, "Log directories exhausted\n"); return (-1); } @@ -326,7 +326,7 @@ allhardcount = 0; if (swap_audit_file() == -1) { - syslog(LOG_ERR, "Could not swap audit file\n"); + syslog(LOG_ERR, "Could not swap audit file"); /* * XXX Faulty directory listing? - user should be given * XXX an opportunity to change the audit_control file @@ -341,16 +341,16 @@ * XXX is generated here? */ if (0 == (ret = getacmin(&minval))) { - syslog(LOG_INFO, "min free = %d\n", minval); + syslog(LOG_DEBUG, "min free = %d\n", minval); if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, - "could not get audit queue settings\n"); + "could not get audit queue settings"); return (-1); } qctrl.aq_minfree = minval; if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) { syslog(LOG_ERR, - "could not set audit queue settings\n"); + "could not set audit queue settings"); return (-1); } } @@ -372,20 +372,20 @@ /* Generate an audit record. */ if ((aufd = au_open()) == -1) - syslog(LOG_ERR, "Could not create audit shutdown event.\n"); + syslog(LOG_ERR, "Could not create audit shutdown event."); else { if ((tok = au_to_text("auditd::Audit shutdown")) != NULL) au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_shutdown) == -1) syslog(LOG_ERR, - "Could not close audit shutdown event.\n"); + "Could not close audit shutdown event."); } /* Flush contents. */ cond = AUC_DISABLED; err_ret = auditon(A_SETCOND, &cond, sizeof(cond)); if (err_ret != 0) { - syslog(LOG_ERR, "Disabling audit failed! : %s\n", + syslog(LOG_ERR, "Disabling audit failed! : %s", strerror(errno)); err_ret = 1; } @@ -396,15 +396,15 @@ free_dir_q(); if ((remove(AUDITD_PIDFILE) == -1) || err_ret) { - syslog(LOG_ERR, "Could not unregister\n"); + syslog(LOG_ERR, "Could not unregister"); audit_warn_postsigterm(); return (1); } endac(); if (close(triggerfd) != 0) - syslog(LOG_ERR, "Error closing control file\n"); - syslog(LOG_INFO, "Finished.\n"); + syslog(LOG_ERR, "Error closing control file"); + syslog(LOG_INFO, "Finished"); return (0); } @@ -437,23 +437,22 @@ /* Set up the signal hander. */ if (signal(SIGTERM, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGTERM\n"); + "Could not set signal handler for SIGTERM"); fail_exit(); } if (signal(SIGCHLD, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGCHLD\n"); + "Could not set signal handler for SIGCHLD"); fail_exit(); } if (signal(SIGHUP, relay_signal) == SIG_ERR) { syslog(LOG_ERR, - "Could not set signal handler for SIGHUP\n"); + "Could not set signal handler for SIGHUP"); fail_exit(); } if ((pidfile = fopen(AUDITD_PIDFILE, "a")) == NULL) { - syslog(LOG_ERR, - "Could not open PID file\n"); + syslog(LOG_ERR, "Could not open PID file"); audit_warn_tmpfile(); return (-1); } @@ -462,7 +461,7 @@ fd = fileno(pidfile); if (flock(fd, LOCK_EX | LOCK_NB) < 0) { syslog(LOG_ERR, - "PID file is locked (is another auditd running?).\n"); + "PID file is locked (is another auditd running?)."); audit_warn_ebusy(); return (-1); } @@ -516,7 +515,7 @@ switch(trigger) { case AUDIT_TRIGGER_LOW_SPACE: - syslog(LOG_INFO, "Got low space trigger\n"); + syslog(LOG_INFO, "Got low space trigger"); if (dirent && (dirent->softlim != 1)) { TAILQ_REMOVE(&dir_q, dirent, dirs); /* Add this node to the end of the list. */ @@ -526,7 +525,7 @@ if (TAILQ_NEXT(TAILQ_FIRST(&dir_q), dirs) != NULL && swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); /* * Check if the next dir has already reached its soft @@ -548,7 +547,7 @@ break; case AUDIT_TRIGGER_NO_SPACE: - syslog(LOG_INFO, "Got no space trigger\n"); + syslog(LOG_INFO, "Got no space trigger"); /* Delete current dir, go on to next. */ TAILQ_REMOVE(&dir_q, dirent, dirs); @@ -557,7 +556,7 @@ free(dirent); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); /* We are out of log directories. */ audit_warn_allhard(++allhardcount); @@ -568,21 +567,21 @@ * Create a new file and swap with the one being used in * kernel */ - syslog(LOG_INFO, "Got open new trigger\n"); + syslog(LOG_INFO, "Got open new trigger"); if (swap_audit_file() == -1) - syslog(LOG_ERR, "Error swapping audit file\n"); + syslog(LOG_ERR, "Error swapping audit file"); break; case AUDIT_TRIGGER_READ_FILE: - syslog(LOG_INFO, "Got read file trigger\n"); + syslog(LOG_INFO, "Got read file trigger"); if (read_control_file() == -1) - syslog(LOG_ERR, "Error in audit control file\n"); + syslog(LOG_ERR, "Error in audit control file"); if (config_audit_controls() == -1) - syslog(LOG_ERR, "Error setting audit controls\n"); + syslog(LOG_ERR, "Error setting audit controls"); break; default: - syslog(LOG_ERR, "Got unknown trigger %d\n", trigger); + syslog(LOG_ERR, "Got unknown trigger %d", trigger); break; } } @@ -607,24 +606,24 @@ for (;;) { num = read(triggerfd, &trigger, sizeof(trigger)); if ((num == -1) && (errno != EINTR)) { - syslog(LOG_ERR, "%s: error %d\n", __FUNCTION__, errno); + syslog(LOG_ERR, "%s: error %d", __FUNCTION__, errno); return (-1); } if (sigterms != sigterms_handled) { - syslog(LOG_INFO, "%s: SIGTERM", __FUNCTION__); + syslog(LOG_DEBUG, "%s: SIGTERM", __FUNCTION__); break; } if (sighups != sighups_handled) { - syslog(LOG_INFO, "%s: SIGHUP", __FUNCTION__); + syslog(LOG_DEBUG, "%s: SIGHUP", __FUNCTION__); handle_sighup(); } if ((num == -1) && (errno == EINTR)) continue; if (num == 0) { - syslog(LOG_INFO, "%s: read EOF\n", __FUNCTION__); + syslog(LOG_ERR, "%s: read EOF", __FUNCTION__); return (-1); } - syslog(LOG_INFO, "%s: read %d\n", __FUNCTION__, trigger); + syslog(LOG_DEBUG, "%s: read %d", __FUNCTION__, trigger); if (trigger == AUDIT_TRIGGER_CLOSE_AND_DIE) break; else @@ -645,7 +644,7 @@ while ((child = waitpid(-1, &wstatus, WNOHANG)) > 0) { if (!wstatus) continue; - syslog(LOG_INFO, "warn process [pid=%d] %s %d.\n", child, + syslog(LOG_INFO, "warn process [pid=%d] %s %d.", child, ((WIFEXITED(wstatus)) ? "exited with non-zero status" : "exited as a result of signal"), ((WIFEXITED(wstatus)) ? WEXITSTATUS(wstatus) : @@ -700,7 +699,7 @@ if (ctr == 0) syslog(LOG_ERR, "No events to class mappings registered."); else - syslog(LOG_INFO, "Registered %d event to class mappings.", + syslog(LOG_DEBUG, "Registered %d event to class mappings.", ctr); /* @@ -713,7 +712,7 @@ syslog(LOG_ERR, "Failed to register non-attributable event mask."); else - syslog(LOG_INFO, + syslog(LOG_DEBUG, "Registered non-attributable event mask."); } else syslog(LOG_ERR, @@ -735,31 +734,31 @@ token_t *tok; if ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)) < 0) { - syslog(LOG_ERR, "Error opening trigger file\n"); + syslog(LOG_ERR, "Error opening trigger file"); fail_exit(); } TAILQ_INIT(&dir_q); if (read_control_file() == -1) { - syslog(LOG_ERR, "Error reading control file\n"); + syslog(LOG_ERR, "Error reading control file"); fail_exit(); } /* Generate an audit record. */ if ((aufd = au_open()) == -1) - syslog(LOG_ERR, "Could not create audit startup event.\n"); + syslog(LOG_ERR, "Could not create audit startup event."); else { if ((tok = au_to_text("auditd::Audit startup")) != NULL) au_write(aufd, tok); if (au_close(aufd, 1, AUE_audit_startup) == -1) syslog(LOG_ERR, - "Could not close audit startup event.\n"); + "Could not close audit startup event."); } if (config_audit_controls() == 0) - syslog(LOG_INFO, "Audit controls init successful\n"); + syslog(LOG_INFO, "Audit controls init successful"); else - syslog(LOG_INFO, "Audit controls init failed\n"); + syslog(LOG_ERR, "Audit controls init failed"); } int @@ -800,22 +799,22 @@ #else openlog("auditd", LOG_CONS | LOG_PID, LOG_AUTH); #endif - syslog(LOG_INFO, "starting...\n"); + syslog(LOG_INFO, "starting..."); if (debug == 0 && daemon(0, 0) == -1) { - syslog(LOG_ERR, "Failed to daemonize\n"); + syslog(LOG_ERR, "Failed to daemonize"); exit(1); } if (register_daemon() == -1) { - syslog(LOG_ERR, "Could not register as daemon\n"); + syslog(LOG_ERR, "Could not register as daemon"); exit(1); } setup(); rc = wait_for_events(); - syslog(LOG_INFO, "auditd exiting.\n"); + syslog(LOG_INFO, "auditd exiting."); exit(rc); } From owner-p4-projects@FreeBSD.ORG Sun Mar 19 21:51:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 034FF16A422; Sun, 19 Mar 2006 21:51:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D6ED016A41F for ; Sun, 19 Mar 2006 21:51:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A512A43D48 for ; Sun, 19 Mar 2006 21:51:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2JLpF3g035092 for ; Sun, 19 Mar 2006 21:51:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2JLpFgH035089 for perforce@freebsd.org; Sun, 19 Mar 2006 21:51:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 Mar 2006 21:51:15 GMT Message-Id: <200603192151.k2JLpFgH035089@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 21:51:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=93606 Change 93606 by rwatson@rwatson_peppercorn on 2006/03/19 21:51:06 Update. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#10 (text+ko) ==== @@ -29,6 +29,8 @@ network byte order when decoding. - Beginnings of an OpenBSM test framework can now be found in openbsm/test. This code is not built or installed by default. +- auditd now assigns more appropriate syslog levels to its debugging and + error information. OpenBSM 1.0 alpha 5 @@ -156,4 +158,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#9 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#10 $ From owner-p4-projects@FreeBSD.ORG Mon Mar 20 08:16:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BEEB16A425; Mon, 20 Mar 2006 08:16:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86D9D16A42C for ; Mon, 20 Mar 2006 08:16:49 +0000 (UTC) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 472AB43D45 for ; Mon, 20 Mar 2006 08:16:49 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2K8Gm0Z078391 for ; Mon, 20 Mar 2006 08:16:49 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2K8GmXn078388 for perforce@freebsd.org; Mon, 20 Mar 2006 08:16:48 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 20 Mar 2006 08:16:48 GMT Message-Id: <200603200816.k2K8GmXn078388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 93613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 08:16:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=93613 Change 93613 by soc-bushman@soc-bushman_stinger on 2006/03/20 08:16:31 eid checking is now embraced by the #ifdef macro - and is omitted by default - user need to define NS_CACHED_EID_CHECKING or NS_STRICT_CACHED_EID_CHECKING to make it work Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_rs_query.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_ws_query.c#3 edit .. //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/query.c#3 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_rs_query.c#3 (text+ko) ==== @@ -197,10 +197,12 @@ dec_cache_entry_name = strdup( qstate->config_entry->mp_cache_params.entry_name); else { +#ifdef NS_CACHED_EID_CHECKING if (check_query_eids(qstate) != 0) { c_mp_rs_response->error_code = EPERM; goto fin; } +#endif asprintf(&dec_cache_entry_name, "%s%s", qstate->eid_str, qstate->config_entry->mp_cache_params.entry_name); ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/mp_ws_query.c#3 (text+ko) ==== @@ -199,11 +199,14 @@ "entry '%s' performs lookups by itself: " "can't write to it", c_mp_ws_request->entry); goto fin; - } else + } else { +#ifdef NS_CACHED_EID_CHECKING if (check_query_eids(qstate) != 0) { c_mp_ws_response->error_code = EPERM; goto fin; } +#endif + } /* * All multipart entries are separated by their name decorations. ==== //depot/projects/soc2005/nsswitch_cached/src/usr.sbin/cached/query.c#3 (text+ko) ==== @@ -185,11 +185,12 @@ qstate->uid = cmsg.creds.cmcred_uid; qstate->gid = cmsg.creds.cmcred_gid; - + +#if defined(NS_CACHED_EID_CHECKING) || defined(NS_STRICT_CACHED_EID_CHECKING) /* * This check is probably a bit redundant - per-user cache is always separated * by the euid/egid pair -*/ + */ if (check_query_eids(qstate) != 0) { #ifdef NS_STRICT_CACHED_EID_CHECKING TRACE_OUT(on_query_startup); @@ -204,6 +205,7 @@ } #endif } +#endif switch (elem_type) { case CET_WRITE_REQUEST: @@ -503,11 +505,14 @@ "entry '%s' performs lookups by itself: " "can't write to it", write_request->entry); goto fin; - } else + } else { +#ifdef NS_CACHED_EID_CHECKING if (check_query_eids(qstate) != 0) { write_response->error_code = EPERM; goto fin; } +#endif + } configuration_lock_rdlock(s_configuration); c_entry = find_cache_entry(s_cache, @@ -694,12 +699,15 @@ */ if (qstate->config_entry->perform_actual_lookups != 0) memset(read_request->cache_key, 0, qstate->eid_str_length); - else + else { +#ifdef NS_CACHED_EID_CHECKING if (check_query_eids(qstate) != 0) { /* if the lookup is not self-performing, we check for clients euid/egid */ read_response->error_code = EPERM; goto fin; } +#endif + } configuration_lock_rdlock(s_configuration); c_entry = find_cache_entry(s_cache, From owner-p4-projects@FreeBSD.ORG Mon Mar 20 09:15:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21CB316A426; Mon, 20 Mar 2006 09:15:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D1CDF16A41F for ; Mon, 20 Mar 2006 09:15:03 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73D4043D49 for ; Mon, 20 Mar 2006 09:15:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2K9F3pL088414 for ; Mon, 20 Mar 2006 09:15:03 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2K9F3T0088411 for perforce@freebsd.org; Mon, 20 Mar 2006 09:15:03 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 20 Mar 2006 09:15:03 GMT Message-Id: <200603200915.k2K9F3T0088411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 09:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=93615 Change 93615 by soc-andrew@soc-andrew_serv on 2006/03/20 09:14:33 Add the generic kernel to the staging area Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#37 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#37 (text+ko) ==== @@ -812,6 +812,8 @@ ( for dir in dev mnt proc root tmp var/run ; do \ mkdir -p ${RD}/bsdinstaller/root/$$dir; \ done ) + # Add the kernel + @cp -Rp ${RD}/kernels/GENERIC/ ${RD}/bsdinstaller/root/boot/kernel # Install Lua into the package root # XXX Make the ftp site changeable From owner-p4-projects@FreeBSD.ORG Mon Mar 20 09:43:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE01C16A420; Mon, 20 Mar 2006 09:43:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 64D3F16A401 for ; Mon, 20 Mar 2006 09:43:39 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D72B43D49 for ; Mon, 20 Mar 2006 09:43:39 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2K9hctH089593 for ; Mon, 20 Mar 2006 09:43:39 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2K9hcwa089590 for perforce@freebsd.org; Mon, 20 Mar 2006 09:43:38 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 20 Mar 2006 09:43:38 GMT Message-Id: <200603200943.k2K9hcwa089590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 09:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=93616 Change 93616 by soc-andrew@soc-andrew_serv on 2006/03/20 09:43:27 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#12 integrate .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#10 integrate .. //depot/projects/soc2005/bsdinstaller/src/libexec/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#38 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/login/Makefile#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#6 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#14 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#12 (text+ko) ==== @@ -1,21 +1,10 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.542 2006/03/19 15:36:56 mux Exp $ # # Make command line options: -# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically -# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) -# -DNO_RESCUE do not build rescue binaries # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all -# -DNO_CRYPT will prevent building of crypt versions -# -DNO_MAN do not build the manual pages -# -DNO_NLS do not build Native Language Support files -# -DNO_PROFILE do not build profiled libraries -# -DNO_GAMES do not go into games subdir # -DNO_SHARE do not go into share subdir -# -DNO_INFO do not make or install info files -# -DNO_LIBC_R do not build libc_r. -# -DNO_FORTRAN do not build g77 and related libraries. # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel @@ -34,6 +23,8 @@ # /usr/share/mk. These include: # obj depend all install clean cleandepend cleanobj +.include + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. @@ -46,18 +37,18 @@ # We must do etc last for install/distribute to work. # SUBDIR= share/info include lib libexec bin -.if !defined(NO_GAMES) +.if ${MK_GAMES} != "no" SUBDIR+=games .endif SUBDIR+=gnu -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 .endif -.if !defined(NO_RESCUE) +.if ${MK_RESCUE} != "no" SUBDIR+=rescue .endif SUBDIR+=sbin -.if !defined(NO_CRYPT) +.if ${MK_CRYPT} != "no" SUBDIR+=secure .endif .if !defined(NO_SHARE) @@ -88,8 +79,8 @@ CVS?= cvs CVSFLAGS?= -A -P -d -I! -SUP?= /usr/local/bin/cvsup -SUPFLAGS?= -g -L 2 -P - +SUP?= /usr/bin/csup +SUPFLAGS?= -g -L 2 .if defined(SUPHOST) SUPFLAGS+= -h ${SUPHOST} .endif @@ -186,8 +177,9 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \ - -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS + -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ + -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -196,7 +188,8 @@ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage -XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB +XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ @@ -241,7 +234,8 @@ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML + -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ + -DWITHOUT_HTML LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS .endif @@ -318,7 +312,7 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} -.if defined(WITH_BIND_LIBS) && !defined(NO_BIND) +.if ${MK_BIND_LIBS} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null .endif @@ -375,8 +369,8 @@ @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ - ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN \ - -DNO_NLS -DNO_PROFILE libraries + ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -405,7 +399,7 @@ -p ${LIB32TMP}/usr/include >/dev/null mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t} @@ -418,11 +412,11 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} cd ${.CURDIR}/gnu/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} -.if !defined(NO_CRYPT) +.if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" cd ${.CURDIR}/kerberos5/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif @@ -450,7 +444,7 @@ .endif cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} -.if !defined(NO_CRYPT) +.if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} @@ -466,7 +460,7 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) +.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" WMAKE_TGTS+= build32 .endif @@ -507,11 +501,11 @@ # CHECK_UIDS= CHECK_GIDS= audit -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp .endif -.if !defined(NO_PF) +.if ${MK_PF} != "no" CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif @@ -567,7 +561,7 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) +.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif @@ -576,7 +570,7 @@ @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute -.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) +.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32 .endif @@ -782,11 +776,11 @@ # # bootstrap-tools: Build tools needed for compatibility # -.if !defined(NO_GAMES) +.if ${MK_GAMES} != "no" _strfile= games/fortune/strfile .endif -.if !defined(NO_CXX) +.if ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf .if ${BOOTSTRAPPING} < 700004 _groff= gnu/usr.bin/groff @@ -815,7 +809,7 @@ _mklocale= usr.bin/mklocale .endif -.if !defined(NO_RESCUE) && \ +.if ${MK_RESCUE} != "no" && \ ${BOOTSTRAPPING} < 600008 _crunchgen= usr.sbin/crunch/crunchgen .endif @@ -865,11 +859,11 @@ _share= share/syscons/scrnmaps .endif -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" _kerberos5_tools= kerberos5/tools .endif -.if !defined(NO_RESCUE) +.if ${MK_RESCUE} != "no" _rescue= rescue/rescue .endif @@ -906,7 +900,7 @@ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif -.if !defined(NO_RESCUE) || defined(RELEASEDIR) +.if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif .if ${TARGET_ARCH} == "alpha" @@ -969,7 +963,7 @@ _generic_libs= gnu/lib -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libkrb5 _prebuild_libs+= kerberos5/lib/libroken @@ -987,14 +981,14 @@ _generic_libs+= lib -.if !defined(NO_CRYPT) -.if !defined(NO_OPENSSL) +.if ${MK_CRYPT} != "no" +.if ${MK_OPENSSL} != "no" _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS} != "no" secure/lib/libssh__L: lib/libgssapi__L .endif .endif @@ -1002,17 +996,17 @@ _generic_libs+= secure/lib .endif -.if defined(NO_CRYPT) || defined(NO_OPENSSL) +.if ${MK_OPENSSL} == "no" lib/libradius__L: lib/libmd__L .endif -.if !defined(NO_NIS) +.if ${MK_NIS} != "no" _prebuild_libs+= lib/libypclnt .endif _generic_libs+= usr.bin/lex/lib -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE} == "i386" _generic_libs+= usr.sbin/pcvt/keycap .endif @@ -1180,3 +1174,8 @@ .endif +# +# showconfig - show build configuration. +# +showconfig: + @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#10 (text+ko) ==== @@ -1,5 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.212 2006/03/09 01:03:58 davidxu Exp $ +# $FreeBSD: src/lib/Makefile,v 1.213 2006/03/17 18:54:24 ru Exp $ + +.include # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -45,16 +47,16 @@ _csu=csu .endif -.if !defined(NO_ATM) +.if ${MK_ATM} != "no" _libatm= libatm _libngatm= libngatm .endif -.if !defined(NO_BIND) +.if ${MK_BIND} != "no" _bind= bind .endif -.if !defined(NO_BLUETOOTH) +.if ${MK_BLUETOOTH} != "no" _libbluetooth= libbluetooth _libsdp= libsdp .endif @@ -66,7 +68,7 @@ .endif .if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "powerpc" && !defined(NO_LIBC_R) + ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no" _libc_r= .endif @@ -74,14 +76,14 @@ _libio= libio .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm _libsmdb= libsmdb _libsmutil= libsmutil .endif -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" _libmp= libmp .endif @@ -94,11 +96,11 @@ _libsmb= libsmb .endif -.if !defined(NO_LIBPTHREAD) +.if ${MK_LIBPTHREAD} != "no" _libpthread= libpthread .endif -.if !defined(NO_LIBTHR) +.if ${MK_LIBTHR} != "no" _libthr= libthr .endif @@ -106,15 +108,15 @@ _libthread_db= libthread_db .endif -.if !defined(NO_USB) +.if ${MK_USB} != "no" _libusbhid= libusbhid .endif -.if !defined(NO_NIS) +.if ${MK_NIS} != "no" _libypclnt= libypclnt .endif -.if !defined(NO_GPIB) +.if ${MK_GPIB} != "no" _libgpib= libgpib .endif ==== //depot/projects/soc2005/bsdinstaller/src/libexec/Makefile#3 (text+ko) ==== @@ -1,5 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.75 2005/06/10 20:52:35 nectar Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.76 2006/03/17 18:54:28 ru Exp $ + +.include SUBDIR= atrun \ bootpd \ @@ -33,12 +35,12 @@ tftpd \ ${_ypxfr} -.if !defined(NO_NIS) +.if ${MK_NIS} != "no" _mknetid= mknetid _ypxfr= ypxfr .endif -.if !defined(NO_PF) +.if ${MK_PF} != "no" _ftp-proxy= ftp-proxy .endif @@ -46,12 +48,12 @@ _rtld-elf= rtld-elf .endif -.if !defined(NO_RCMDS) +.if ${MK_RCMDS} != "no" _rlogind= rlogind _rshd= rshd .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _mail.local= mail.local _smrsh= smrsh .endif ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.902 2006/03/09 17:55:08 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.906 2006/03/18 21:37:05 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -177,9 +177,10 @@ # Build and package both GENERIC and SMP kernels if the target # has both configuration files. Otherwise only GENERIC is done. # -KERNELS+= GENERIC .if exists(${.CURDIR}/../sys/${TARGET}/conf/SMP) -KERNELS+= SMP +KERNELS_BASE?= GENERIC SMP +.else +KERNELS_BASE?= GENERIC .endif # mountpoint for filesystems. @@ -374,8 +375,8 @@ .endif mkdir -p ${CHROOTDIR} @echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`" - cd ${WORLDDIR} && ${NATIVEMAKE} -DNO_GAMES -DNO_HTML -DNO_LIB32 \ - -DNO_MAN -DNO_NLS -DNO_PROFILE installworld DESTDIR=${CHROOTDIR} + cd ${WORLDDIR} && ${NATIVEMAKE} -DWITHOUT_GAMES -DWITHOUT_HTML -DWITHOUT_LIB32 \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE installworld DESTDIR=${CHROOTDIR} cd ${WORLDDIR} && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR} if [ -f /etc/resolv.conf ]; then \ cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \ @@ -483,6 +484,7 @@ FTP_PROXY \ HTTP_PROXY \ KERNELS \ + KERNELS_BASE \ KERNEL_FLAGS \ MAKE_ISOS \ NOCDROM \ @@ -493,7 +495,6 @@ NO_CPU_CFLAGS \ NO_CPU_COPTFLAGS \ NO_FLOPPIES \ - NO_SENDMAIL \ RELEASETAG \ RELNOTES_LANG \ SEPARATE_LIVEFS \ @@ -588,8 +589,8 @@ -p ${RD}/trees/$$i/var > /dev/null ; \ done mkdir ${RD}/kernels - for i in ${KERNELS}; do \ - mkdir ${RD}/kernels/$${i}; \ + for i in ${KERNELS_BASE} ${KERNELS}; do \ + mkdir -p ${RD}/kernels/$${i}; \ done touch ${.TARGET} @@ -602,7 +603,7 @@ # Make and install the generic kernel(s). release.3: -.for kernel in ${KERNELS} +.for kernel in ${KERNELS_BASE} ${KERNELS} cd ${.CURDIR}/..; \ ${CROSSMAKE} ${KERNEL_FLAGS} \ KERNCONF=${kernel} kernel \ @@ -665,7 +666,7 @@ echo "$${i} distribution is finished."; \ fi ; \ done - @for i in ${KERNELS} ; \ + @for i in ${KERNELS_BASE} ${KERNELS} ; \ do \ if [ -d ${RD}/kernels/$${i} ] ; then \ cd ${.CURDIR} && $(MAKE) doTARBALL \ ==== //depot/projects/soc2005/bsdinstaller/src/release/pc98/boot_crunch.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.61 2006/03/08 18:02:31 sam Exp $ +# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.62 2006/03/10 12:18:41 nyan Exp $ buildopts -DRELEASE_CRUNCH -Dlint @@ -40,4 +40,4 @@ progs sysinstall libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph -libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo +libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/tinyware/login/Makefile#2 (text+ko) ==== @@ -1,5 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.4 2004/12/21 12:49:24 ru Exp $ +# $FreeBSD: src/release/picobsd/tinyware/login/Makefile,v 1.5 2006/03/17 18:54:30 ru Exp $ + +.include .PATH: ${.CURDIR}/../../../../usr.bin/login @@ -12,7 +14,7 @@ DPADD= ${LIBUTIL} ${LIBCRYPT} LDADD= -lutil -lcrypt -.if !defined(NO_PAM) +.if ${MK_PAM_SUPPORT} != "no" CFLAGS+= -DUSE_PAM DPADD+= ${LIBPAM} LDADD+= ${MINUSLPAM} ==== //depot/projects/soc2005/bsdinstaller/src/release/scripts/package-split.py#4 (text+ko) ==== @@ -7,7 +7,7 @@ # # Usage: package-split.py # -# $FreeBSD: src/release/scripts/package-split.py,v 1.9 2005/12/07 22:25:12 obrien Exp $ +# $FreeBSD: src/release/scripts/package-split.py,v 1.11 2006/03/17 02:05:46 kensmith Exp $ import os import sys @@ -57,8 +57,6 @@ 'devel/gmake', 'editors/emacs', 'editors/vim', - 'editors/vim-lite', - 'editors/xemacs', 'emulators/mtools', 'graphics/png', 'graphics/xv', @@ -70,7 +68,6 @@ 'mail/popd', 'mail/xfmail', 'mail/postfix', - 'net/cvsup', 'net/cvsup-without-gui', 'net/rsync', 'net/samba', @@ -92,9 +89,6 @@ 'x11/rxvt', # Formerly on disc3 'security/portaudit']) - if arch == 'i386': - pkgs.extend(['comms/ltmdm', - 'www/opera']) return pkgs # The list of desired packages ==== //depot/projects/soc2005/bsdinstaller/src/share/Makefile#4 (text+ko) ==== @@ -1,5 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/Makefile,v 1.35 2005/08/05 14:59:50 phk Exp $ +# $FreeBSD: src/share/Makefile,v 1.36 2006/03/17 18:54:32 ru Exp $ + +.include # Do not include `info' in the SUBDIR list, it is handled separately. @@ -26,7 +28,7 @@ ${_timedef} \ zoneinfo -.if !defined(NO_LOCALES) +.if ${MK_LOCALES} != "no" _colldef = colldef _mklocale = mklocale _monetdef = monetdef @@ -35,35 +37,35 @@ _timedef = timedef .endif -.if !defined(NO_SYSCONS) +.if ${MK_SYSCONS} != "no" _syscons= syscons .endif -.if !defined(NO_MAN) +.if ${MK_MAN} != "no" _man= man .endif -.if !defined(NO_GROFF) +.if ${MK_GROFF} != "no" _me= me .endif -.if !defined(NO_EXAMPLES) +.if ${MK_EXAMPLES} != "no" _examples= examples .endif -.if !defined(NO_I4B) +.if ${MK_I4B} != "no" _isdn= isdn .endif -.if !defined(NO_DICT) +.if ${MK_DICT} != "no" _dict= dict .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _sendmail= sendmail .endif -.if !defined(NO_SHAREDOCS) +.if ${MK_SHAREDOCS} != "no" _doc= doc .endif ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#6 (text+ko) ==== @@ -1,5 +1,7 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.289 2006/03/03 21:12:05 mux Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.290 2006/03/17 18:54:38 ru Exp $ + +.include # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -7,6 +9,8 @@ # Moved to secure: bdes # +.include + SUBDIR= alias \ apply \ asa \ @@ -232,59 +236,59 @@ _truss= truss .endif -.if !defined(NO_ATM) +.if ${MK_ATM} != "no" _atm= atm .endif -.if !defined(NO_MAN) +.if ${MK_MAN} != "no" _catman= catman .endif -.if !defined(NO_BIND) && !defined(NO_BIND_UTILS) +.if ${MK_BIND_UTILS} != "no" _dig= dig _host= host _nslookup= nslookup _nsupdate= nsupdate .endif -.if !defined(NO_BLUETOOTH) +.if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth .endif -.if !defined(NO_CALENDAR) +.if ${MK_CALENDAR} != "no" _calendar= calendar .endif -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" _chkey= chkey _newkey= newkey _csup= csup .endif -.if defined(YES_HESIOD) +.if ${MK_HESIOD} != "no" _hesinfo= hesinfo .endif -.if !defined(NO_NETCAT) +.if ${MK_NETCAT} != "no" _nc= nc .endif -.if !defined(NO_NIS) +.if ${MK_NIS} != "no" _ypcat= ypcat _ypmatch= ypmatch _ypwhich= ypwhich .endif -.if !defined(NO_RCMDS) +.if ${MK_RCMDS} != "no" _rlogin= rlogin _rsh= rsh .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _vacation= vacation .endif -.if !defined(NO_TOOLCHAIN) +.if ${MK_TOOLCHAIN} != "no" _c89= c89 _c99= c99 _gprof= gprof @@ -293,7 +297,7 @@ _yacc= yacc .endif -.if !defined(NO_USB) +.if ${MK_USB} != "no" _usbhidaction= usbhidaction _usbhidctl= usbhidctl .endif ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#14 (text+ko) ==== @@ -1,5 +1,7 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.346 2006/02/27 16:17:25 harti Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.347 2006/03/17 18:54:39 ru Exp $ + +.include # XXX MISSING: mkproto SUBDIR= ac \ @@ -196,23 +198,22 @@ _sysinstall= sysinstall .endif -.if !defined(NO_ATM) +.if ${MK_ATM} != "no" _atm= atm .endif -.if !defined(NO_AUDIT) +.if ${MK_AUDIT} != "no" _audit= audit _auditd= auditd _auditreduce= auditreduce _praudit= praudit .endif -.if !defined(NO_BIND) -.if !defined(NO_BIND_DNSSEC) && !defined(NO_CRYPT) +.if ${MK_BIND_DNSSEC} != "no" && ${MK_OPENSSL} != "no" _dnssec-keygen= dnssec-keygen _dnssec-signzone= dnssec-signzone .endif -.if !defined(NO_BIND_NAMED) +.if ${MK_BIND_NAMED} != "no" _named= named _named-checkconf= named-checkconf _named-checkzone= named-checkzone @@ -220,24 +221,23 @@ _rndc= rndc _rndc-confgen= rndc-confgen .endif -.endif -.if !defined(NO_BLUETOOTH) +.if ${MK_BLUETOOTH} != "no" _bluetooth= bluetooth .endif -.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" _keyserv= keyserv .endif -.if !defined(NO_INET6) +.if ${MK_INET6} != "no" _mld6query= mld6query _rip6query= rip6query _route6d= route6d _traceroute6= traceroute6 .endif -.if !defined(NO_NIS) +.if ${MK_NIS} != "no" _rpc.yppasswdd= rpc.yppasswdd _rpc.ypupdated= rpc.ypupdated _rpc.ypxfrd= rpc.ypxfrd @@ -249,15 +249,15 @@ _ypset= ypset .endif -.if !defined(NO_PF) && !defined(NO_AUTHPF) +.if ${MK_AUTHPF} != "no" _authpf= authpf .endif -.if !defined(NO_LPR) +.if ${MK_LPR} != "no" _lpr= lpr .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _editmap= editmap _mailstats= mailstats _makemap= makemap @@ -265,7 +265,7 @@ _sendmail= sendmail .endif -.if !defined(NO_USB) +.if ${MK_USB} != "no" _usbdevs= usbdevs .endif @@ -278,7 +278,7 @@ _apmd= apmd _asf= asf _btxld= btxld -.if !defined(NO_I4B) +.if ${MK_I4B} != "no" _i4b= i4b .endif _kgmon= kgmon @@ -290,19 +290,19 @@ _ndiscvt= ndiscvt _pccard= pccard _pnpinfo= pnpinfo -.if !defined(NO_LIBPTHREAD) +.if ${MK_LIBPTHREAD} != "no" _pppctl= pppctl .endif _sicontrol= sicontrol _spkrtest= spkrtest _zzz= zzz .if ${MACHINE} == "i386" -.if !defined(NO_ACPI) +.if ${MK_ACPI} != "no" _acpi= acpi .endif _arlcontrol= arlcontrol _boot0cfg= boot0cfg -.if !defined(NO_PCVT) +.if ${MK_PCVT} != "no" _pcvt= pcvt .endif _wlconfig= wlconfig @@ -314,7 +314,7 @@ .if ${MACHINE_ARCH} == "alpha" _elf2exe= elf2exe _pnpinfo= pnpinfo -.if !defined(NO_LIBC_R) +.if ${MK_LIBC_R} != "no" _pppctl= pppctl .endif .endif @@ -323,7 +323,7 @@ # mptable: broken (not 64 bit clean) # pnpinfo: crashes (not really useful anyway) .if ${MACHINE_ARCH} == "amd64" -.if !defined(NO_ACPI) +.if ${MK_ACPI} != "no" _acpi= acpi .endif _asf= asf @@ -335,7 +335,7 @@ _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt -.if !defined(NO_LIBPTHREAD) +.if ${MK_LIBPTHREAD} != "no" _pppctl= pppctl .endif _sicontrol= sicontrol @@ -344,11 +344,11 @@ .endif .if ${MACHINE_ARCH} == "ia64" -.if !defined(NO_ACPI) +.if ${MK_ACPI} != "no" _acpi= acpi .endif _kgmon= kgmon -.if !defined(NO_LIBPTHREAD) +.if ${MK_LIBPTHREAD} != "no" _pppctl= pppctl .endif _zzz= zzz @@ -361,7 +361,7 @@ .if ${MACHINE_ARCH} == "sparc64" _eeprom= eeprom _ofwdump= ofwdump -.if !defined(NO_LIBC_R) +.if ${MK_LIBC_R} != "no" _pppctl= pppctl .endif .endif From owner-p4-projects@FreeBSD.ORG Mon Mar 20 15:14:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD72116A429; Mon, 20 Mar 2006 15:14:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5784616A420 for ; Mon, 20 Mar 2006 15:14:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0C6843D48 for ; Mon, 20 Mar 2006 15:14:32 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KFEWAE012069 for ; Mon, 20 Mar 2006 15:14:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KFEWG4012066 for perforce@freebsd.org; Mon, 20 Mar 2006 15:14:32 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 15:14:32 GMT Message-Id: <200603201514.k2KFEWG4012066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:14:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=93625 Change 93625 by millert@millert_p3 on 2006/03/20 15:14:03 comment out KDB_UNATTENDED Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#17 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/i386/conf/MAC#17 (text+ko) ==== @@ -14,7 +14,7 @@ ident MAC options BREAK_TO_DEBUGGER -options KDB_UNATTENDED +#options KDB_UNATTENDED options MAC #options MAC_BIBA # BIBA data integrity policy From owner-p4-projects@FreeBSD.ORG Mon Mar 20 15:25:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89F3F16A423; Mon, 20 Mar 2006 15:25:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6793916A41F for ; Mon, 20 Mar 2006 15:25:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3114D43D45 for ; Mon, 20 Mar 2006 15:25:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KFPlp2012913 for ; Mon, 20 Mar 2006 15:25:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KFPkaO012910 for perforce@freebsd.org; Mon, 20 Mar 2006 15:25:46 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 15:25:46 GMT Message-Id: <200603201525.k2KFPkaO012910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:25:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=93627 Change 93627 by millert@millert_p3 on 2006/03/20 15:25:46 In fdcopy() set newfdp->fd_freefile after the first loop over fdp instead of the loop over newfdp. This means we never enter fdused() with fd_freefile == -1. It also fixes a bug when fdp->fd_lastfile == -1. Previously, if fdp->fd_lastfile was -1 newfdp->fd_freefile would get set to 1 instead of 0 since newfdp->fd_lastfile is initialized to 0 and newfdp->fd_freefile will not have been set in the first loop (which doesn't run at all in this case). It's not clear why newfdp->fd_freefile is -1 at this point. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#18 (text+ko) ==== @@ -1604,17 +1604,15 @@ newfdp->fd_freefile = i; } } + newfdp->fd_cmask = fdp->fd_cmask; FILEDESC_UNLOCK_FAST(fdp); FILEDESC_LOCK(newfdp); + if (newfdp->fd_freefile == -1) + newfdp->fd_freefile = i; for (i = 0; i <= newfdp->fd_lastfile; ++i) if (newfdp->fd_ofiles[i] != NULL) fdused(newfdp, i); FILEDESC_UNLOCK(newfdp); - FILEDESC_LOCK_FAST(fdp); - if (newfdp->fd_freefile == -1) - newfdp->fd_freefile = i; - newfdp->fd_cmask = fdp->fd_cmask; - FILEDESC_UNLOCK_FAST(fdp); return (newfdp); } From owner-p4-projects@FreeBSD.ORG Mon Mar 20 15:28:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF8A616A428; Mon, 20 Mar 2006 15:28:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D90D16A41F for ; Mon, 20 Mar 2006 15:28:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DE1243D68 for ; Mon, 20 Mar 2006 15:28:51 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KFSp2Z013138 for ; Mon, 20 Mar 2006 15:28:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KFSpwT013135 for perforce@freebsd.org; Mon, 20 Mar 2006 15:28:51 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 15:28:51 GMT Message-Id: <200603201528.k2KFSpwT013135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:28:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=93628 Change 93628 by millert@millert_p3 on 2006/03/20 15:28:25 Always zero fdp->fd_ofileflags[idx] when we NULL out fdp->fd_ofiles[idx]. Be more careful with locking fdp in fdcheckstd(). The current behavior is probably safe but a little paranoia goes a long way. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#19 (text+ko) ==== @@ -1832,6 +1832,7 @@ FILEDESC_LOCK(fdp); if (fdp->fd_ofiles[idx] == fp) { fdp->fd_ofiles[idx] = NULL; + fdp->fd_ofileflags[idx] = 0; fdunused(fdp, idx); FILEDESC_UNLOCK(fdp); fdrop(fp, td); @@ -1911,12 +1912,18 @@ fdp = td->td_proc->p_fd; if (fdp == NULL) return (0); + FILEDESC_LOCK_FAST(fdp); KASSERT(fdp->fd_refcnt == 1, ("the fdtable should not be shared")); + FILEDESC_UNLOCK_FAST(fdp); devnull = -1; error = 0; for (i = 0; i < 3; i++) { - if (fdp->fd_ofiles[i] != NULL) + FILEDESC_LOCK_FAST(fdp); + if (fdp->fd_ofiles[i] != NULL) { + FILEDESC_UNLOCK_FAST(fdp); continue; + } + FILEDESC_UNLOCK_FAST(fdp); if (devnull < 0) { int vfslocked; error = falloc(td, &fp, &fd); @@ -1938,6 +1945,7 @@ KASSERT(fdp->fd_ofiles[fd] == fp, ("table not shared, how did it change?")); fdp->fd_ofiles[fd] = NULL; + fdp->fd_ofileflags[fd] = 0; fdunused(fdp, fd); FILEDESC_UNLOCK(fdp); fdrop(fp, td); From owner-p4-projects@FreeBSD.ORG Mon Mar 20 15:50:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1E3216A537; Mon, 20 Mar 2006 15:50:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE11016A4E0; Mon, 20 Mar 2006 15:50:28 +0000 (UTC) (envelope-from Todd.Miller@sparta.com) Received: from M4.sparta.com (M4.sparta.com [157.185.61.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C7D443D66; Mon, 20 Mar 2006 15:50:16 +0000 (GMT) (envelope-from Todd.Miller@sparta.com) Received: from Beta5.sparta.com (beta5.sparta.com [157.185.63.21]) by M4.sparta.com (8.13.5/8.13.5) with ESMTP id k2KFoFkP021340; Mon, 20 Mar 2006 09:50:15 -0600 Received: from nemo.columbia.ads.sparta.com (nemo.columbia.sparta.com [157.185.80.75]) by Beta5.sparta.com (8.12.11/8.13.1) with ESMTP id k2KFoFhH026350; Mon, 20 Mar 2006 09:50:16 -0600 Received: from [127.0.0.1] ([157.185.80.253]) by nemo.columbia.ads.sparta.com with Microsoft SMTPSVC(6.0.3790.1830); Mon, 20 Mar 2006 10:50:15 -0500 In-Reply-To: <200603201525.k2KFPkaO012910@repoman.freebsd.org> References: <200603201525.k2KFPkaO012910@repoman.freebsd.org> Mime-Version: 1.0 (Apple Message framework v746.3) Content-Type: text/plain; charset=US-ASCII; format=flowed Message-Id: Content-Transfer-Encoding: 7bit From: Todd Miller Date: Mon, 20 Mar 2006 10:50:13 -0500 To: Todd Miller X-Mailer: Apple Mail (2.746.3) X-OriginalArrivalTime: 20 Mar 2006 15:50:15.0276 (UTC) FILETIME=[FAE272C0:01C64C35] Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 15:50:30 -0000 On Mar 20, 2006, at 3:25 PM, Todd Miller wrote: > http://perforce.freebsd.org/chv.cgi?CH=93627 > > Change 93627 by millert@millert_p3 on 2006/03/20 15:25:46 > > In fdcopy() set newfdp->fd_freefile after the first loop > over fdp instead of the loop over newfdp. This means we > never enter fdused() with fd_freefile == -1. It also fixes > a bug when fdp->fd_lastfile == -1. Previously, if > fdp->fd_lastfile was -1 newfdp->fd_freefile would get set > to 1 instead of 0 since newfdp->fd_lastfile is initialized > to 0 and newfdp->fd_freefile will not have been set in the > first loop (which doesn't run at all in this case). > It's not clear why newfdp->fd_freefile is -1 at this point. That last line should have read: It's not clear why newfdp->fd_lastfile is -1 at this point. - todd From owner-p4-projects@FreeBSD.ORG Mon Mar 20 17:49:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8E0D16A423; Mon, 20 Mar 2006 17:49:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EE8016A422 for ; Mon, 20 Mar 2006 17:49:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 261BD43D48 for ; Mon, 20 Mar 2006 17:49:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KHnoaU027406 for ; Mon, 20 Mar 2006 17:49:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KHnnLh027403 for perforce@freebsd.org; Mon, 20 Mar 2006 17:49:49 GMT (envelope-from jhb@freebsd.org) Date: Mon, 20 Mar 2006 17:49:49 GMT Message-Id: <200603201749.k2KHnnLh027403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 17:49:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93644 Change 93644 by jhb@jhb_twclab on 2006/03/20 17:48:53 Use the read_cycle_count() function used for cpu_ticks() for get_cycle_count() so that KTR timestamps are monotonic on alpha making schedgraph happier. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#28 edit .. //depot/projects/smpng/sys/alpha/include/cpu.h#15 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#28 (text+ko) ==== @@ -137,7 +137,6 @@ static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); -static uint64_t read_cycle_count(void); void clockattach(device_t dev) ==== //depot/projects/smpng/sys/alpha/include/cpu.h#15 (text+ko) ==== @@ -88,11 +88,12 @@ #define cpu_getstack(td) (alpha_pal_rdusp()) #define cpu_spinwait() /* nothing */ -#define get_cyclecount alpha_rpcc +#define get_cyclecount() read_cycle_count() void cpu_halt(void); void cpu_reset(void); void fork_trampoline(void); /* MAGIC */ +uint64_t read_cycle_count(void); void swi_vm(void *); #endif /* _KERNEL */ From owner-p4-projects@FreeBSD.ORG Mon Mar 20 17:52:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D79C16A426; Mon, 20 Mar 2006 17:52:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D7E716A423 for ; Mon, 20 Mar 2006 17:52:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E4DD43D6D for ; Mon, 20 Mar 2006 17:52:25 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KHqOEH027601 for ; Mon, 20 Mar 2006 17:52:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KHqO5h027598 for perforce@freebsd.org; Mon, 20 Mar 2006 17:52:24 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 17:52:24 GMT Message-Id: <200603201752.k2KHqO5h027598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 17:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=93645 Change 93645 by millert@millert_p3 on 2006/03/20 17:51:24 Arg pointer in mac_thread_syscall_{enter,exit} should be register_t * not int *. Fixes compilation problem on amd64. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 (text+ko) ==== @@ -282,7 +282,7 @@ } int -mac_thread_syscall_enter(struct thread *td, int *args, int code) +mac_thread_syscall_enter(struct thread *td, register_t *args, int code) { int error; @@ -293,7 +293,7 @@ } void -mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) +mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode) { if (!mac_enforce_syscall) From owner-p4-projects@FreeBSD.ORG Mon Mar 20 18:55:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CD0C16A427; Mon, 20 Mar 2006 18:55:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28E8416A401 for ; Mon, 20 Mar 2006 18:55:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 845C943D77 for ; Mon, 20 Mar 2006 18:55:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KItlFw030626 for ; Mon, 20 Mar 2006 18:55:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KItlAt030623 for perforce@freebsd.org; Mon, 20 Mar 2006 18:55:47 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 18:55:47 GMT Message-Id: <200603201855.k2KItlAt030623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 18:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=93652 Change 93652 by millert@millert_p3 on 2006/03/20 18:54:48 Back out fdcopy() changes to ease upcoming integration. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#20 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#20 (text+ko) ==== @@ -1502,6 +1502,8 @@ newfdp->fd_fd.fd_cmask = CMASK; newfdp->fd_fd.fd_ofiles = newfdp->fd_dfiles; newfdp->fd_fd.fd_ofileflags = newfdp->fd_dfileflags; + newfdp->fd_fd.fd_lastfile = 0; /* XXX */ + newfdp->fd_fd.fd_freefile = 0; /* XXX */ newfdp->fd_fd.fd_nfiles = NDFILE; newfdp->fd_fd.fd_map = newfdp->fd_dmap; return (&newfdp->fd_fd); @@ -1592,6 +1594,8 @@ } /* copy everything except kqueue descriptors */ newfdp->fd_freefile = -1; + if (fdp->fd_lastfile < 0) + printf("%s: fd_lastfile is %d\n", __func__, fdp->fd_lastfile); for (i = 0; i <= fdp->fd_lastfile; ++i) { if (fdisused(fdp, i) && fdp->fd_ofiles[i]->f_type != DTYPE_KQUEUE) { @@ -1604,15 +1608,17 @@ newfdp->fd_freefile = i; } } - newfdp->fd_cmask = fdp->fd_cmask; FILEDESC_UNLOCK_FAST(fdp); FILEDESC_LOCK(newfdp); - if (newfdp->fd_freefile == -1) - newfdp->fd_freefile = i; for (i = 0; i <= newfdp->fd_lastfile; ++i) if (newfdp->fd_ofiles[i] != NULL) fdused(newfdp, i); FILEDESC_UNLOCK(newfdp); + FILEDESC_LOCK_FAST(fdp); + if (newfdp->fd_freefile == -1) + newfdp->fd_freefile = i; + newfdp->fd_cmask = fdp->fd_cmask; + FILEDESC_UNLOCK_FAST(fdp); return (newfdp); } From owner-p4-projects@FreeBSD.ORG Mon Mar 20 19:01:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91A8316A427; Mon, 20 Mar 2006 19:01:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7019416A424 for ; Mon, 20 Mar 2006 19:01:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E891143D77 for ; Mon, 20 Mar 2006 19:00:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KJ0sKt030966 for ; Mon, 20 Mar 2006 19:00:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KJ0sbC030963 for perforce@freebsd.org; Mon, 20 Mar 2006 19:00:54 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 19:00:54 GMT Message-Id: <200603201900.k2KJ0sbC030963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:01:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=93654 Change 93654 by millert@millert_p3 on 2006/03/20 19:00:21 Remove debugging code that snuck into the last checkin. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#21 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#21 (text+ko) ==== @@ -1502,8 +1502,6 @@ newfdp->fd_fd.fd_cmask = CMASK; newfdp->fd_fd.fd_ofiles = newfdp->fd_dfiles; newfdp->fd_fd.fd_ofileflags = newfdp->fd_dfileflags; - newfdp->fd_fd.fd_lastfile = 0; /* XXX */ - newfdp->fd_fd.fd_freefile = 0; /* XXX */ newfdp->fd_fd.fd_nfiles = NDFILE; newfdp->fd_fd.fd_map = newfdp->fd_dmap; return (&newfdp->fd_fd); @@ -1594,8 +1592,6 @@ } /* copy everything except kqueue descriptors */ newfdp->fd_freefile = -1; - if (fdp->fd_lastfile < 0) - printf("%s: fd_lastfile is %d\n", __func__, fdp->fd_lastfile); for (i = 0; i <= fdp->fd_lastfile; ++i) { if (fdisused(fdp, i) && fdp->fd_ofiles[i]->f_type != DTYPE_KQUEUE) { From owner-p4-projects@FreeBSD.ORG Mon Mar 20 19:14:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C40916A424; Mon, 20 Mar 2006 19:14:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8A2316A400; Mon, 20 Mar 2006 19:14:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 768E443D4C; Mon, 20 Mar 2006 19:14:43 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k2KJEf6f002247; Mon, 20 Mar 2006 14:14:42 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: Todd Miller Date: Mon, 20 Mar 2006 14:06:41 -0500 User-Agent: KMail/1.9.1 References: <200603201525.k2KFPkaO012910@repoman.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603201406.43861.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1345/Mon Mar 20 07:03:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.6 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Todd Miller , Perforce Change Reviews Subject: Re: PERFORCE change 93627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:14:45 -0000 On Monday 20 March 2006 10:50, Todd Miller wrote: > > On Mar 20, 2006, at 3:25 PM, Todd Miller wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=93627 > > > > Change 93627 by millert@millert_p3 on 2006/03/20 15:25:46 > > > > In fdcopy() set newfdp->fd_freefile after the first loop > > over fdp instead of the loop over newfdp. This means we > > never enter fdused() with fd_freefile == -1. It also fixes > > a bug when fdp->fd_lastfile == -1. Previously, if > > fdp->fd_lastfile was -1 newfdp->fd_freefile would get set > > to 1 instead of 0 since newfdp->fd_lastfile is initialized > > to 0 and newfdp->fd_freefile will not have been set in the > > first loop (which doesn't run at all in this case). > > It's not clear why newfdp->fd_freefile is -1 at this point. > > That last line should have read: > It's not clear why newfdp->fd_lastfile is -1 at this point. csjp@ just fixed this in FreeBSD head. I also had the change to move the setting of cmask up earlier to avoid an extra lock/unlock pair in one of my p4 branches as well. :) You'll probably want to make sure you're changes are in sync with what csjp@ just committed to make the merge in the future less exciting. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Mar 20 19:16:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F3516A401; Mon, 20 Mar 2006 19:16:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8651A16A425 for ; Mon, 20 Mar 2006 19:16:30 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E04643D45 for ; Mon, 20 Mar 2006 19:16:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KJGUbP031464 for ; Mon, 20 Mar 2006 19:16:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KJGRUO031461 for perforce@freebsd.org; Mon, 20 Mar 2006 19:16:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 19:16:27 GMT Message-Id: <200603201916.k2KJGRUO031461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:16:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=93655 Change 93655 by rwatson@rwatson_zoo on 2006/03/20 19:15:26 Integrate TrustedBSD base branch from FreeBSD CVS HEAD: - make showconfig - MK_foo - NETSMBCRYPTO now always built into smbfs - getfacl -q - csup update - hostapd update - wpa_supplicant update - vkbd now default - security/audit include files installed - libc symbol versioning - more jemalloc fixes and optimizations - COMPAT_43 gone - more arm - linux truncate, sethostname calls now explicitly emulated, 32/64-bit work on stat - ATA USB attachment - Audit restructuring, now audit_worker.c; audit pipe ioctls, style fixes, etc. - File descriptor optimization fixes for MAC - m_unshare - SS_PROTOREF - soabort() can't fail - UNIX domain sockets, netatalk, netipx, natm now believe so_pcb != NULL - More auditing of namei() arguments, such as open() - A fair number of UFS/snapshots/soft updates fixes. - Countless device driver fixes/changes/bugs/... Affected files ... .. //depot/projects/trustedbsd/base/Makefile#43 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#70 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#7 integrate .. //depot/projects/trustedbsd/base/UPDATING#64 integrate .. //depot/projects/trustedbsd/base/bin/Makefile#9 integrate .. //depot/projects/trustedbsd/base/bin/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#11 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#13 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#11 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#8 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#22 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/base/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/base/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/base/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/pf/pflogd/pflogd.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#48 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#19 integrate .. //depot/projects/trustedbsd/base/etc/hosts.allow#7 integrate .. //depot/projects/trustedbsd/base/etc/isdn/Makefile#8 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#35 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#12 integrate .. //depot/projects/trustedbsd/base/etc/mtree/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/440.status-mailq#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/800.loginfail#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#36 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/nsswitch#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#11 integrate .. //depot/projects/trustedbsd/base/games/factor/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libg2c/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#16 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/bc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#14 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/trustedbsd/base/include/Makefile#51 integrate .. //depot/projects/trustedbsd/base/include/arpa/nameser.h#3 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#24 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile#10 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libgssapi/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#42 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#6 integrate .. //depot/projects/trustedbsd/base/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/isc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#9 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#13 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#9 delete .. //depot/projects/trustedbsd/base/lib/libc/Makefile#21 integrate .. //depot/projects/trustedbsd/base/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/base/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/arm/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/compat-43/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/db/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#28 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/namespace.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/un-namespace.h#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/quad/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/regex/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/rpc/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#24 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdtime/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/base/lib/libc/sys/recv.2#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/xdr/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc/yp/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/base/lib/libc_r/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libcrypt/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/Makefile#18 integrate .. //depot/projects/trustedbsd/base/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libipsec/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/libmilter/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libncp/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#19 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/modules.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_login_access/pam_login_access.8#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_nologin/pam_nologin.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libpcap/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpmc/pmc.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/pthread.map#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_aio_suspend.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_get_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_init.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setguardsize.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setscope.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrier.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_clean.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_close.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_concurrency.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_connect.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_creat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_detach.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fcntl.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fork.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fsync.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_join.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kill.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_main_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_msync.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_once.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_open.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pause.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_poll.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#25 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pselect.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_raise.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_read.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_readv.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlock.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_select.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_self.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sem.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigpending.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigprocmask.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spec.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_switch_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_symbols.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_system.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_tcdrain.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_vfork.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait4.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_waitpid.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_write.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_writev.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_yield.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libradius/Makefile#12 integrate .. //depot/projects/trustedbsd/base/lib/librpcsvc/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/aio.c#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/sigev_thread.h#2 integrate .. //depot/projects/trustedbsd/base/lib/librt/timer.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libsm/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libsmb/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libstand/printf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libtelnet/Makefile#10 integrate .. //depot/projects/trustedbsd/base/lib/libthr/Makefile#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/pthread.map#5 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_timer.c#3 delete .. //depot/projects/trustedbsd/base/lib/libwrap/Makefile#10 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#20 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#12 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#15 integrate .. //depot/projects/trustedbsd/base/libexec/tcpd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/libexec/telnetd/Makefile#9 integrate .. //depot/projects/trustedbsd/base/release/Makefile#73 integrate .. //depot/projects/trustedbsd/base/release/amd64/boot_crunch.conf#5 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/trustedbsd/base/release/i386/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/base/release/ia64/boot_crunch.conf#9 integrate .. //depot/projects/trustedbsd/base/release/pc98/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/base/release/picobsd/bridge/crunch.conf#10 integrate .. //depot/projects/trustedbsd/base/release/picobsd/tinyware/login/Makefile#5 integrate .. //depot/projects/trustedbsd/base/release/scripts/kernels-install.sh#1 branch .. //depot/projects/trustedbsd/base/release/scripts/package-split.py#6 integrate .. //depot/projects/trustedbsd/base/rescue/librescue/Makefile#5 integrate .. //depot/projects/trustedbsd/base/rescue/rescue/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#33 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#22 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#13 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/mirror/gmirror.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ggate/ggatec/ggatec.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#29 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#44 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#36 integrate .. //depot/projects/trustedbsd/base/secure/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/secure/lib/Makefile#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#25 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#20 integrate .. //depot/projects/trustedbsd/base/secure/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#14 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#19 integrate .. //depot/projects/trustedbsd/base/share/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/Makefile#13 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#42 integrate .. //depot/projects/trustedbsd/base/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/examples/netgraph/ether.bridge#4 integrate .. //depot/projects/trustedbsd/base/share/man/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#19 integrate .. //depot/projects/trustedbsd/base/share/man/man4/cpufreq.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/dcons.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gre.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ipw.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/iwi.4#8 integrate .. //depot/projects/trustedbsd/base/share/man/man4/netgraph.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ral.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sysmouse.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#21 integrate .. //depot/projects/trustedbsd/base/share/man/man5/nsswitch.conf.5#7 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#56 integrate .. //depot/projects/trustedbsd/base/share/man/man7/build.7#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/firmware.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/hash.9#1 branch .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#23 integrate .. //depot/projects/trustedbsd/base/share/mk/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.README#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#28 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#28 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#12 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#24 integrate .. //depot/projects/trustedbsd/base/share/mk/version_gen.awk#1 branch .. //depot/projects/trustedbsd/base/sys/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#15 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_proto.h#17 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_syscall.h#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysent.c#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/linux_sysvec.c#19 integrate .. //depot/projects/trustedbsd/base/sys/alpha/linux/syscalls.master#16 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/apic_vector.S#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/db_trace.c#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/io_apic.c#9 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#25 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/asmacros.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#17 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/trap.h#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/base/sys/amd64/pci/pci_bus.c#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/in_cksum.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/common/Makefile.common#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/libi386.h#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#14 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#53 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#19 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#18 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#34 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_mib.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#38 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_socket.c#21 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#24 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_sysctl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_uid16.c#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#69 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#98 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.alpha#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#26 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#60 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#51 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.powerpc#20 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#45 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#69 integrate .. //depot/projects/trustedbsd/base/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_command.c#20 integrate .. //depot/projects/trustedbsd/base/sys/ddb/ddb.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#41 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-queue.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#37 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#39 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#51 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_cs.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/exca.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ieee488/upd7210.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwi.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwireg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral.c#9 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pccard.c#5 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralreg.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/if_ralvar.h#4 delete .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/vchan.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ehci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#44 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#40 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#30 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/geode.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#57 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#48 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#47 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#28 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_rrip.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_aout.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#62 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#63 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#61 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#30 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#51 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#36 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#33 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#54 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#46 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#38 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#35 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#44 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#73 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#56 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#74 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/acpi_video/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/ce/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/cp/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/dummynet/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_gif/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipfilter/Makefile#11 integrate .. //depot/projects/trustedbsd/base/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/iwi/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/Makefile#16 integrate .. //depot/projects/trustedbsd/base/sys/modules/pf/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/modules/pflog/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/ral/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/smbfs/Makefile#12 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_media.h#17 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#26 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#34 integrate .. //depot/projects/trustedbsd/base/sys/net/route.h#17 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#36 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.c#16 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_node.h#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#19 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_proto.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_usrreq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#31 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#29 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#39 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6.h#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_mbuf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netnatm/natm.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_crypt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_smb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_diskless.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#34 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#35 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#39 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_srvsock.c#19 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/trustedbsd/base/sys/sys/ata.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/cdefs.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/disk.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/event.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/hash.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#46 integrate .. //depot/projects/trustedbsd/base/sys/sys/md5.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#37 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#74 integrate .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#43 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#62 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#18 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#38 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#39 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#48 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_inode.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_lookup.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#26 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#46 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufsmount.h#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#43 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#30 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#43 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#47 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#58 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageq.c#17 integrate .. //depot/projects/trustedbsd/base/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/resolv/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/listenclose/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libxx/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/regression/tls/libyy/Makefile#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/biosmptable.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/ncpus/ncpus.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#47 integrate .. //depot/projects/trustedbsd/base/usr.bin/basename/basename.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/chkey/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/Makefile#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/README#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.access.5#4 delete .. //depot/projects/trustedbsd/base/usr.bin/login/login_access.c#6 delete .. //depot/projects/trustedbsd/base/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/newkey/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/passwd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/systat.1#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/vmstat.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile#10 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/Makefile.am#4 delete .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/bsdtar_platform.h#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/tar/configure.ac.in#7 delete .. //depot/projects/trustedbsd/base/usr.bin/tar/read.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/telnet/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/xinstall/install.1#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/xinstall/xinstall.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#49 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/amd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/amd/include/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/bthidd/Makefile#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 20 19:30:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D63416A434; Mon, 20 Mar 2006 19:30:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0650B16A430 for ; Mon, 20 Mar 2006 19:30:51 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB52F43D70 for ; Mon, 20 Mar 2006 19:30:47 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KJUlOY040919 for ; Mon, 20 Mar 2006 19:30:47 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KJUlA9040916 for perforce@freebsd.org; Mon, 20 Mar 2006 19:30:47 GMT (envelope-from imp@freebsd.org) Date: Mon, 20 Mar 2006 19:30:47 GMT Message-Id: <200603201930.k2KJUlA9040916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93656 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:30:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=93656 Change 93656 by imp@imp_Speedy on 2006/03/20 19:30:04 Nit Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#44 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#44 (text+ko) ==== @@ -760,7 +760,6 @@ * the byte order is big endian, not little endian, so we have some * swapping to do. Again, if we need it (which I don't think we do). */ - ate_setmcast(sc); /* From owner-p4-projects@FreeBSD.ORG Mon Mar 20 19:48:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E28516A427; Mon, 20 Mar 2006 19:48:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D4B216A424 for ; Mon, 20 Mar 2006 19:48:12 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAB1A43D45 for ; Mon, 20 Mar 2006 19:48:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KJmBHC042196 for ; Mon, 20 Mar 2006 19:48:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KJm9UJ042152 for perforce@freebsd.org; Mon, 20 Mar 2006 19:48:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 19:48:09 GMT Message-Id: <200603201948.k2KJm9UJ042152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 19:48:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=93658 Change 93658 by rwatson@rwatson_zoo on 2006/03/20 19:47:17 Integrate TrustedBSD MAC branch from TrustedBSD base branch, bringing in changes described in P4 change 93655. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile#38 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#64 integrate .. //depot/projects/trustedbsd/mac/ObsoleteFiles.inc#5 integrate .. //depot/projects/trustedbsd/mac/UPDATING#54 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#24 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/mac/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openbsm/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#9 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#48 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#17 integrate .. //depot/projects/trustedbsd/mac/etc/hosts.allow#6 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#41 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#12 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/440.status-mailq#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/800.loginfail#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#31 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#12 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/syscons#10 integrate .. //depot/projects/trustedbsd/mac/games/factor/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libg2c/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/bc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#53 integrate .. //depot/projects/trustedbsd/mac/include/arpa/nameser.h#3 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#23 integrate .. //depot/projects/trustedbsd/mac/kerberos5/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libgssapi/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.mk#6 integrate .. //depot/projects/trustedbsd/mac/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/bind/lwres/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libarchive/configure.ac.in#8 delete .. //depot/projects/trustedbsd/mac/lib/libc/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/arm/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/compat-43/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/db/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#24 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#27 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/quad/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/regex/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/rpc/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Makefile.inc#15 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.3#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#22 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/string/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#19 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/sys/recv.2#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/uuid/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/xdr/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/yp/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/mac/lib/libc_r/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libcrypt/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libipsec/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/lib/libmilter/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libncp/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/modules.inc#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_login_access/pam_login_access.8#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_nologin/pam_nologin.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpcap/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpmc/pmc.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/pthread.map#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_aio_suspend.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_get_np.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getstack.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_init.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setguardsize.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setscope.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setstack.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_barrier.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cancel.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_clean.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_close.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_concurrency.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cond.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_condattr_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_connect.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_creat.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_create.c#13 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_detach.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_exit.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fcntl.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fork.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_fsync.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_init.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_join.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kill.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_main_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mattr_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_msync.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex.c#15 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_nanosleep.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_once.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_open.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pause.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_poll.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#21 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pselect.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_raise.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_read.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_readv.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_rwlock.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_select.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_self.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sem.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_setschedparam.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sig.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaction.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigmask.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigpending.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigprocmask.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigsuspend.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sigwait.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_sleep.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spec.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_spinlock.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_switch_np.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_symbols.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_system.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_tcdrain.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_vfork.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_wait.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_wait4.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_waitpid.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_write.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_writev.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_yield.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libradius/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/librpcsvc/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/aio.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/sigev_thread.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/librt/timer.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libsm/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libsmb/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libstand/printf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libtelnet/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/pthread.map#5 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_init.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_timer.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libwrap/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/libexec/tcpd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/libexec/telnetd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#68 integrate .. //depot/projects/trustedbsd/mac/release/amd64/boot_crunch.conf#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/trustedbsd/mac/release/i386/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/mac/release/ia64/boot_crunch.conf#9 integrate .. //depot/projects/trustedbsd/mac/release/pc98/boot_crunch.conf#11 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/bridge/crunch.conf#10 integrate .. //depot/projects/trustedbsd/mac/release/picobsd/tinyware/login/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/release/scripts/kernels-install.sh#1 branch .. //depot/projects/trustedbsd/mac/release/scripts/package-split.py#6 integrate .. //depot/projects/trustedbsd/mac/rescue/librescue/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/rescue/rescue/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#19 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/geom/class/mirror/gmirror.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ggate/ggatec/ggatec.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#29 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifvlan.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#37 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#31 integrate .. //depot/projects/trustedbsd/mac/secure/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/secure/lib/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#24 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/secure/libexec/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/secure/usr.bin/ssh/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/share/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/share/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#38 integrate .. //depot/projects/trustedbsd/mac/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/examples/netgraph/ether.bridge#4 integrate .. //depot/projects/trustedbsd/mac/share/man/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ata.4#18 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/cpufreq.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/dcons.4#8 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gre.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ipw.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/iwi.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/netgraph.4#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ral.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sysmouse.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/nsswitch.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#45 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/build.7#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/firmware.9#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/hash.9#1 branch .. //depot/projects/trustedbsd/mac/share/man/man9/mbuf.9#21 integrate .. //depot/projects/trustedbsd/mac/share/mk/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.README#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.incs.mk#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#24 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#26 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#8 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#12 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#23 integrate .. //depot/projects/trustedbsd/mac/share/mk/version_gen.awk#1 branch .. //depot/projects/trustedbsd/mac/sys/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_proto.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_syscall.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysent.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/linux_sysvec.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/linux/syscalls.master#14 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/apic_vector.S#9 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/db_trace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/io_apic.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/asmacros.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/pmap.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/trap.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/pci/pci_bus.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/arm/arm/in_cksum.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/mac/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/common/Makefile.common#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/libi386.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/sys/boot/powerpc/loader/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/Makefile#15 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/compat/freebsd32/freebsd32_misc.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ipc.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_mib.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#40 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_signal.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_socket.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_sysctl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_uid16.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#71 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#126 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.alpha#27 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.amd64#22 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#52 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#32 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#43 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#19 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#38 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#81 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/pf/net/if_pflog.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_command.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/ddb.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx_osm.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#30 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-queue.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-fd.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ath/ath_rate/sample/sample.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/exca/exca.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hwpmc/hwpmc_mod.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ieee488/upd7210.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipw.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwireg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iwi/if_iwivar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral.c#8 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral_pccard.c#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/if_ralvar.h#4 delete .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/vchan.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/geom/mirror/g_mirror_ctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/geom/raid3/g_raid3_ctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/geode.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#54 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_proto.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_syscall.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_rrip.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#63 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#81 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#453 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mbuf.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#41 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#71 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#82 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#87 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/ce/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/cp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/dummynet/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_gif/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipfilter/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/iwi/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/linux/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/modules/netgraph/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pf/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pflog/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ral/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/smbfs/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridgestp.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_bridgevar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_media.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/net/route.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_input.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_node.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_proto.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_pcb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/xform_ipcomp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_crypt.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_smb.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_diskless.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_pipe.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_private.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/ata.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/sys/cdefs.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/disk.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/event.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/hash.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#48 integrate .. //depot/projects/trustedbsd/mac/sys/sys/md5.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#44 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#69 integrate .. //depot/projects/trustedbsd/mac/sys/sys/protosw.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#46 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#79 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#55 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_inode.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufsmount.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#38 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageq.c#16 integrate .. //depot/projects/trustedbsd/mac/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/resolv/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/listenclose/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/libxx/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/tls/libyy/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/biosmptable.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/ncpus/ncpus.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#39 integrate .. //depot/projects/trustedbsd/mac/usr.bin/basename/basename.1#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/chkey/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/chpass/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fetch/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/usr.bin/ktrace/ktrace.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/README#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/login.1#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/login.access.5#4 delete .. //depot/projects/trustedbsd/mac/usr.bin/login/login_access.c#6 delete .. //depot/projects/trustedbsd/mac/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/newkey/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/passwd/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/systat.1#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/vmstat.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/Makefile.am#4 delete .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/bsdtar_platform.h#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tar/configure.ac.in#7 delete .. //depot/projects/trustedbsd/mac/usr.bin/tar/read.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/telnet/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xinstall/install.1#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xinstall/xinstall.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/amd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/amd/include/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/bthidd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/client.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/bthidd/server.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bootparamd/bootparamd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/bsnmpd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.8#25 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2855/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/koi2alt/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mailwrapper/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/doc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntp-keygen/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpdc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ntp/ntpq/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/main.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/perform.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/pkg_add.1#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/sign/sign.c#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 20 20:06:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0AD716A420; Mon, 20 Mar 2006 20:06:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A1B516A426 for ; Mon, 20 Mar 2006 20:06:22 +0000 (UTC) (envelope-from csjp@FreeBSD.org) Received: from ems01.seccuris.com (ems01.seccuris.com [204.112.0.35]) by mx1.FreeBSD.org (Postfix) with SMTP id 2306643D5A for ; Mon, 20 Mar 2006 20:06:20 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: (qmail 14682 invoked by uid 0); 20 Mar 2006 20:13:14 -0000 Received: from unknown (HELO ?192.168.11.101?) (unknown) by unknown with SMTP; 20 Mar 2006 20:13:14 -0000 Message-ID: <441F0B39.3000406@FreeBSD.org> Date: Mon, 20 Mar 2006 14:06:17 -0600 From: "Christian S.J. Peron" User-Agent: Mozilla Thunderbird 1.0.7 (Macintosh/20050923) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Todd Miller References: <200603201752.k2KHqO5h027598@repoman.freebsd.org> In-Reply-To: <200603201752.k2KHqO5h027598@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 93645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 20:06:23 -0000 Todd Miller wrote: >http://perforce.freebsd.org/chv.cgi?CH=93645 > >Change 93645 by millert@millert_p3 on 2006/03/20 17:51:24 > > Arg pointer in mac_thread_syscall_{enter,exit} should be > register_t * not int *. Fixes compilation problem on amd64. > >Affected files ... > >.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 edit > >Differences ... > >==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 (text+ko) ==== > >@@ -282,7 +282,7 @@ > } > > int >-mac_thread_syscall_enter(struct thread *td, int *args, int code) >+mac_thread_syscall_enter(struct thread *td, register_t *args, int code) > { > int error; > >@@ -293,7 +293,7 @@ > } > > void >-mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) >+mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode) > { > > if (!mac_enforce_syscall) > > > > Does this still build on i386? -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer FreeBSD Security Team From owner-p4-projects@FreeBSD.ORG Mon Mar 20 20:41:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 801BA16A426; Mon, 20 Mar 2006 20:41:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D5EF16A422; Mon, 20 Mar 2006 20:41:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBC2943D53; Mon, 20 Mar 2006 20:41:56 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k2KKfphA003109; Mon, 20 Mar 2006 15:41:54 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: "Christian S.J. Peron" Date: Mon, 20 Mar 2006 15:30:37 -0500 User-Agent: KMail/1.9.1 References: <200603201752.k2KHqO5h027598@repoman.freebsd.org> <441F0B39.3000406@FreeBSD.org> In-Reply-To: <441F0B39.3000406@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603201530.41496.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1345/Mon Mar 20 07:03:16 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-3.6 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: Todd Miller , Perforce Change Reviews Subject: Re: PERFORCE change 93645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 20:41:57 -0000 On Monday 20 March 2006 15:06, Christian S.J. Peron wrote: > Todd Miller wrote: > > >http://perforce.freebsd.org/chv.cgi?CH=93645 > > > >Change 93645 by millert@millert_p3 on 2006/03/20 17:51:24 > > > > Arg pointer in mac_thread_syscall_{enter,exit} should be > > register_t * not int *. Fixes compilation problem on amd64. > > > >Affected files ... > > > >.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 edit > > > >Differences ... > > > >==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_system.c#10 (text+ko) ==== > > > >@@ -282,7 +282,7 @@ > > } > > > > int > >-mac_thread_syscall_enter(struct thread *td, int *args, int code) > >+mac_thread_syscall_enter(struct thread *td, register_t *args, int code) > > { > > int error; > > > >@@ -293,7 +293,7 @@ > > } > > > > void > >-mac_thread_syscall_exit(struct thread *td, int *args, int code, int errcode) > >+mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode) > > { > > > > if (!mac_enforce_syscall) > > > > > > > > > Does this still build on i386? Probably, register_t == int on i386. This is the right change though, syscall arguments are typically passed in registers and/or on the stack, and stack values should fit in registers. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Mon Mar 20 20:47:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 980DF16A43B; Mon, 20 Mar 2006 20:47:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75B2916A434 for ; Mon, 20 Mar 2006 20:47:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18A9743D66 for ; Mon, 20 Mar 2006 20:47:24 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KKlNJQ061704 for ; Mon, 20 Mar 2006 20:47:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KKlNR1061701 for perforce@freebsd.org; Mon, 20 Mar 2006 20:47:23 GMT (envelope-from millert@freebsd.org) Date: Mon, 20 Mar 2006 20:47:23 GMT Message-Id: <200603202047.k2KKlNR1061701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 20:47:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=93661 Change 93661 by millert@millert_p3 on 2006/03/20 20:47:12 Update prototypes for {mac,mpo}_thread_syscall_{enter,exit} Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#24 edit .. //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac.h#24 (text+ko) ==== @@ -441,8 +441,8 @@ int mac_check_system_swapoff(struct ucred *cred, struct vnode *vp); int mac_check_system_sysctl(struct ucred *cred, struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); -int mac_thread_syscall_enter(struct thread *td, int *args, int code); -void mac_thread_syscall_exit(struct thread *td, int *args, int code, +int mac_thread_syscall_enter(struct thread *td, register_t *args, int code); +void mac_thread_syscall_exit(struct thread *td, register_t *args, int code, int errcode); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int acc_mode); ==== //depot/projects/trustedbsd/sebsd/sys/sys/mac_policy.h#19 (text+ko) ==== @@ -544,8 +544,8 @@ struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req); void (*_mpo_placeholder23)(void); - int (*mpo_thread_syscall_enter)(struct thread *td, int *args, int code); - void (*mpo_thread_syscall_exit)(struct thread *td, int *args, int code, + int (*mpo_thread_syscall_enter)(struct thread *td, register_t *args, int code); + void (*mpo_thread_syscall_exit)(struct thread *td, register_t *args, int code, int error); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode); From owner-p4-projects@FreeBSD.ORG Mon Mar 20 21:34:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9E6716A420; Mon, 20 Mar 2006 21:34:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A292A16A41F for ; Mon, 20 Mar 2006 21:34:33 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E733743D66 for ; Mon, 20 Mar 2006 21:34:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KLYNSD068609 for ; Mon, 20 Mar 2006 21:34:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KLYLlU068574 for perforce@freebsd.org; Mon, 20 Mar 2006 21:34:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 21:34:21 GMT Message-Id: <200603202134.k2KLYLlU068574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 21:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=93663 Change 93663 by rwatson@rwatson_zoo on 2006/03/20 21:33:22 Integrate TrustedBSD SEBSD branch from TrustedBSD MAC branch, bringing in changes described in P4 change 93655. Affected files ... .. //depot/projects/trustedbsd/sebsd/Makefile#13 integrate .. //depot/projects/trustedbsd/sebsd/Makefile.inc1#13 integrate .. //depot/projects/trustedbsd/sebsd/ObsoleteFiles.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/UPDATING#13 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/sebsd/bin/chflags/chflags.1#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/csh/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/bin/ed/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.1#6 integrate .. //depot/projects/trustedbsd/sebsd/bin/getfacl/getfacl.c#5 integrate .. //depot/projects/trustedbsd/sebsd/bin/ps/keyword.c#9 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/bsnmp/FREEBSD-Xlist#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/GNUmakefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/TODO#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/csup.1#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/fattr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/globtree.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/idcache.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/idcache.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/csup/lister.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/main.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/misc.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/proto.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/token.l#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/csup/updater.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/accounting.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/aes.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/config_types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/crypto.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/crypto.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/defconfig#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/driver.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/driver_test.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/driver_wired.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_identity.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_pax.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_psk.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_sim_db.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eloop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/eloop.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostap_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.eap_user#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_cli.1#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_cli.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_ctrl.c#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/hostapd_ctrl.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/iapp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_11.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_11_auth.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ieee802_1x.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/logwatch/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/logwatch/hostapd#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/madwifi.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/md5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/radius_server.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/rc4.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/rc4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sha1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sha1.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sta_info.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/sta_info.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/tls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/tls_none.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/version.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wired.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/hostapd/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/netcat/nc.1#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/libngatm.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/uniaddr.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unifunc.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unimsg.3#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unisap.3#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/ngatm/man/unistruct.3#4 integrate .. //depot/projects/trustedbsd/sebsd/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/pf/pflogd/pflogd.c#5 integrate .. //depot/projects/trustedbsd/sebsd/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/aes.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/aes_wrap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/aes_wrap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/base64.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/base64.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config_file.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config_ssid.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/config_types.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/crypto.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/crypto.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/crypto_gnutls.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ctrl_iface.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/defconfig#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/developer.txt#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_hostap.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_ndis.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_ndis.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/driver_wired.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/drivers.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_aka.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_defs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_fast.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_gtc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_leap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_otp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_pax.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_pax_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_pax_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_psk.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_psk_common.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_psk_common.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_sim.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_sim_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_sim_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_testing.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tls_common.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tlv.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_tlv.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eap_ttls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eapol_sm.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eapol_test.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eloop.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/eloop.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/events.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/hostap_common.h#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/hostapd.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/l2_packet.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/main.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/md5.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/md5.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/ms_funcs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/pcsc_funcs.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/preauth.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/preauth.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/preauth_test.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius_client.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/radius_client.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/rc4.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/rc4.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/sha1.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/sha1.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_gnutls.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_none.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/tls_schannel.c#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/todo.txt#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_cli.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_ctrl.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/main.cpp#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/scanresults.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpagui.ui#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_gui/wpamsg.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_i.h#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_passphrase.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant.h#2 integrate .. //depot/projects/trustedbsd/sebsd/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/trustedbsd/sebsd/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/sebsd/etc/Makefile#14 integrate .. //depot/projects/trustedbsd/sebsd/etc/devd.conf#10 integrate .. //depot/projects/trustedbsd/sebsd/etc/hosts.allow#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/isdn/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.include.dist#16 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/trustedbsd/sebsd/etc/mtree/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/periodic/daily/440.status-mailq#3 integrate .. //depot/projects/trustedbsd/sebsd/etc/periodic/security/800.loginfail#4 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/Makefile#12 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/jail#10 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/kernel#1 branch .. //depot/projects/trustedbsd/sebsd/etc/rc.d/nsswitch#2 integrate .. //depot/projects/trustedbsd/sebsd/etc/rc.d/syscons#6 integrate .. //depot/projects/trustedbsd/sebsd/games/factor/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libdialog/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libg2c/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libgcc/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/gnu/lib/libobjc/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/bc/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cc/cc_tools/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/cvs/cvs/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/include/Makefile#16 integrate .. //depot/projects/trustedbsd/sebsd/include/arpa/nameser.h#2 integrate .. //depot/projects/trustedbsd/sebsd/include/stdlib.h#8 integrate .. //depot/projects/trustedbsd/sebsd/kerberos5/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/kerberos5/lib/libgssapi/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/Makefile#18 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/bind/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/bind9/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/config.mk#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/dns/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/isc/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/isccc/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/isccfg/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/bind/lwres/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/INSTALL#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libarchive/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/Makefile.am#4 delete .. //depot/projects/trustedbsd/sebsd/lib/libarchive/archive.h.in#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libarchive/archive_read_support_format_tp.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libarchive/configure.ac.in#4 delete .. //depot/projects/trustedbsd/sebsd/lib/libc/Makefile#11 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/Versions.def#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/db/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/gdtoa/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gen/_spinlock_stub.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gmon/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/gmon/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/i386/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/i386/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/ia64/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/include/libc_private.h#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/include/namespace.h#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/include/un-namespace.h#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/locale/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/locale/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/net/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/net/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/nls/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/nls/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/posix1e/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/powerpc/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/powerpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/quad/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/regex/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/rpc/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/rpc/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/softfloat/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/softfloat/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/sparc64/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdio/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/malloc.3#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/strtonum.3#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdlib/strtonum.c#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/stdtime/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/string/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/string/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/mq.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libc/sys/recv.2#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/uuid/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/xdr/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libc/yp/Symbol.map#1 branch .. //depot/projects/trustedbsd/sebsd/lib/libc_r/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libcrypt/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libfetch/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libgpib/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libio/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libipsec/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libmilter/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libncp/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libncurses/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/modules.inc#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/login.access.5#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_login_access/pam_login_access.8#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpam/modules/pam_unix/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpcap/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpmc/pmc.3#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/pthread.map#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/sys/thr_error.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_accept.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_aio_suspend.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_atfork.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_destroy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_get_np.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getdetachstate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getguardsize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getinheritsched.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getschedparam.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getscope.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getstack.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getstackaddr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_getstacksize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_init.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setdetachstate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setguardsize.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setschedparam.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setschedpolicy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setscope.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setstack.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setstackaddr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_attr_setstacksize.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_barrier.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_barrierattr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_cancel.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_clean.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_close.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_concurrency.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_cond.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_condattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_condattr_init.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_connect.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_creat.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_create.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_detach.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_equal.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_execve.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_exit.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fcntl.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fork.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_fsync.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_getprio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_getschedparam.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_info.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_init.c#10 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_join.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_kill.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_main_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mattr_init.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_msync.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_multi_np.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex.c#11 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutex_protocol.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_mutexattr_destroy.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_nanosleep.c#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_once.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_open.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pause.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_poll.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_private.h#12 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pselect.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_pspinlock.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_raise.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_read.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_readv.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_resume_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_rwlock.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_rwlockattr.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_select.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_self.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sem.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_setprio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_setschedparam.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sig.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigaction.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigaltstack.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigmask.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigpending.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigprocmask.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigsuspend.c#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sigwait.c#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_single_np.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_sleep.c#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_spec.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_spinlock.c#8 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_switch_np.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_symbols.c#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_system.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_tcdrain.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_vfork.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_wait.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_wait4.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_waitpid.c#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_write.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_writev.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libpthread/thread/thr_yield.c#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libradius/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/librpcsvc/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/aio.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/mq.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/sigev_thread.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/sigev_thread.h#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/librt/timer.c#2 integrate .. //depot/projects/trustedbsd/sebsd/lib/libsm/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libsmb/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/lib/libstand/printf.c#4 integrate .. //depot/projects/trustedbsd/sebsd/lib/libtelnet/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/pthread.map#3 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/trustedbsd/sebsd/lib/libthr/thread/thr_timer.c#2 delete .. //depot/projects/trustedbsd/sebsd/lib/libwrap/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/libexec/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/libexec/ftpd/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/libexec/lukemftpd/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/libexec/tcpd/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/libexec/telnetd/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/release/Makefile#16 integrate .. //depot/projects/trustedbsd/sebsd/release/amd64/boot_crunch.conf#6 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/errata/article.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/common/install.sgml#3 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#4 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 integrate .. //depot/projects/trustedbsd/sebsd/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate .. //depot/projects/trustedbsd/sebsd/release/i386/boot_crunch.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/release/ia64/boot_crunch.conf#8 integrate .. //depot/projects/trustedbsd/sebsd/release/pc98/boot_crunch.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/release/picobsd/bridge/crunch.conf#7 integrate .. //depot/projects/trustedbsd/sebsd/release/picobsd/tinyware/login/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/release/scripts/kernels-install.sh#1 branch .. //depot/projects/trustedbsd/sebsd/release/scripts/package-split.py#3 integrate .. //depot/projects/trustedbsd/sebsd/rescue/librescue/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/rescue/rescue/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/sbin/Makefile#14 integrate .. //depot/projects/trustedbsd/sebsd/sbin/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sbin/bsdlabel/bsdlabel.8#8 integrate .. //depot/projects/trustedbsd/sebsd/sbin/geom/class/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ggate/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ggate/ggatec/ggatec.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/trustedbsd/sebsd/sbin/ipfw/ipfw2.c#13 integrate .. //depot/projects/trustedbsd/sebsd/secure/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/secure/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/libcrypto/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/libcrypto/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/secure/lib/libssh/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/secure/libexec/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.bin/ssh/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/secure/usr.sbin/sshd/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/share/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/share/doc/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/share/doc/smm/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/etc/make.conf#10 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/share/examples/netgraph/ether.bridge#2 integrate .. //depot/projects/trustedbsd/sebsd/share/man/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man3/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ata.4#8 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/dcons.4#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/gre.4#4 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ipw.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/iwi.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/netgraph.4#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ng_fec.4#2 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/ral.4#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man4/sysmouse.4#7 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man5/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man5/nsswitch.conf.5#4 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man7/build.7#8 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man9/firmware.9#2 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/trustedbsd/sebsd/share/man/man9/hash.9#1 branch .. //depot/projects/trustedbsd/sebsd/share/man/man9/mbuf.9#11 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.README#8 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.incs.mk#4 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.info.mk#7 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.lib.mk#9 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.libnames.mk#13 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.nls.mk#3 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.own.mk#7 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.prog.mk#9 integrate .. //depot/projects/trustedbsd/sebsd/share/mk/version_gen.awk#1 branch .. //depot/projects/trustedbsd/sebsd/sys/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/alpha/clock.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_proto.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_syscall.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/linux_sysvec.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/alpha/linux/syscalls.master#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/db_trace.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/io_apic.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/pmap.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/asmacros.h#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/bus.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/pmap.h#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/include/trap.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/pci/pci_bus.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/arm/in_cksum.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/at91.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/files.at91#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/arm/include/in_cksum.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/alpha/common/Makefile.common#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/libi386/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/libi386/libi386.h#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/i386/loader/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/ia64/efi/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/pc98/loader/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/powerpc/loader/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/boot/sparc64/loader/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_getcwd.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_ipc.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_signal.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_socket.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_sysctl.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/compat/linux/linux_uid16.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files#19 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.alpha#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.amd64#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.i386#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.ia64#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.pc98#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.powerpc#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/files.sparc64#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/options#17 integrate .. //depot/projects/trustedbsd/sebsd/sys/contrib/pf/net/if_pflog.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/ddb/db_command.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/ddb/ddb.h#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/aic7xxx/aic79xx_osm.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-disk.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-pci.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-raid.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-fd.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-fd.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/cs/if_cs.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/dc/if_dcreg.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/exca/exca.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ipw/if_ipw.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ral.c#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ral_pccard.c#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ral_pci.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/if_ralvar.h#3 delete .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pcm/sound.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/sound/pcm/vchan.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/usb/ehci.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/dev/usb/umass.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/geom_io.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/mirror/g_mirror_ctl.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/geom/raid3/g_raid3_ctl.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/geode.c#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/machdep.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/i386/vm_machdep.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux.h#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_proto.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_syscall.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_sysent.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/i386/linux/syscalls.master#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/isofs/cd9660/cd9660_rrip.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/imgact_aout.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_environment.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_exec.c#18 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_exit.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_fork.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#30 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_resource.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_sig.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_tc.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_thread.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/subr_prf.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_socket2.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_subr.c#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/Makefile#16 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/acpi/acpi_video/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/sys/modules/ce/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/cp/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/if_gif/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ipfilter/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/linux/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/netgraph/Makefile#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/pf/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/pflog/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/ral/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/modules/smbfs/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/bridgestp.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_media.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_tap.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/if_vlan.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/route.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/net/rtsock.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_input.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_node.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_node.h#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_proto.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/net80211/ieee80211_var.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/trustedbsd/sebsd/sys/netatalk/ddp_usrreq.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet/if_ether.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/trustedbsd/sebsd/sys/netinet6/nd6_rtr.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/ipsec_mbuf.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/netnatm/natm.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/netsmb/smb_crypt.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/netsmb/smb_smb.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/nfsserver/nfs_srvsock.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/trustedbsd/sebsd/sys/security/mac_lomac/mac_lomac.c#18 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/ata.h#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/cdefs.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/disk.h#6 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/event.h#8 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/hash.h#1 branch .. //depot/projects/trustedbsd/sebsd/sys/sys/mbuf.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/md5.h#5 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/mount.h#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/proc.h#16 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/protosw.h#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/socketvar.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/sys/vnode.h#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_inode.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_quota.c#12 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufsmount.h#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/swap_pager.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_contig.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_fault.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_map.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_page.c#14 integrate .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_pageq.c#9 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/aio/aiotest/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/trustedbsd/sebsd/tools/regression/lib/libc/resolv/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/tcpfullwindowrst/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/netinet/udpconnectjail/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/listenclose/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/reconnect/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/tls/libxx/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/regression/tls/libyy/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/nanobsd/nanobsd.sh#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/acpi.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/biosmptable.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/ncpus/ncpus.c#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/Makefile#12 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/basename/basename.1#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/chkey/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/chpass/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/csup/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/fetch/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/ktrace/ktrace.c#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#8 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/README#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.1#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.access.5#3 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login_access.c#2 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/netstat/Makefile#9 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/newkey/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/passwd/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/rpcinfo/Makefile#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/systat/systat.1#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/systat/vmstat.c#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/Makefile.am#3 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/bsdtar.c#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/bsdtar_platform.h#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/configure.ac.in#4 delete .. //depot/projects/trustedbsd/sebsd/usr.bin/tar/read.c#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/telnet/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/xinstall/install.1#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.bin/xinstall/xinstall.c#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#15 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/amd/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/amd/amd/Makefile#5 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/amd/include/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/bthidd.c#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/client.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/bthidd/server.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bootparamd/bootparamd/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bsnmpd/bsnmpd/Makefile#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/jail/jail.8#11 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/lpr/filters.ru/koi2855/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/lpr/filters.ru/koi2alt/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/lpr/filters/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/mailwrapper/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/doc/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntp-keygen/Makefile#3 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntpd/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntpdc/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/ntp/ntpq/Makefile#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/Makefile#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/add.h#4 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/main.c#7 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/perform.c#6 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/pkg_install/add/pkg_add.1#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 20 21:43:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60EC016A51F; Mon, 20 Mar 2006 21:43:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 254C216A50E for ; Mon, 20 Mar 2006 21:43:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FED343D73 for ; Mon, 20 Mar 2006 21:43:36 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KLhad0074071 for ; Mon, 20 Mar 2006 21:43:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KLhZTw074065 for perforce@freebsd.org; Mon, 20 Mar 2006 21:43:35 GMT (envelope-from imp@freebsd.org) Date: Mon, 20 Mar 2006 21:43:35 GMT Message-Id: <200603202143.k2KLhZTw074065@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 21:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=93667 Change 93667 by imp@imp_Speedy on 2006/03/20 21:43:31 Save a boatload of mbuf allocation/free pairs. Allocate plain memory for the busdma engine, rather than mbufs. Since we have to copy anyway, it doesn't make sense to bounce them through an allocated mbuf. This appears to give about a 10% boot in NFS performance (~1.45 MB/s -> ~1.60 MB/s for copying /dev/zero to a remove file). Rx performance on FTP is helped by a much larger factor (1.8MB/s -> 3.34MB/s), but I'm less sure about those numbers due to compiler flag changes. Also, keep track of where in the circular RX descriptor buffer we stopped last time. There's no need to scan the list every time. This should have the nice side effect of delivering packets in order more of the time (since we'll no longer deliver the packets recieved after we wrap the 64 entry circular buffer before the ones before the wrap). Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#45 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#45 (text+ko) ==== @@ -86,13 +86,14 @@ struct callout tick_ch; /* Tick callout */ bus_dma_tag_t mtag; /* bus dma tag for mbufs */ bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; + struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ bus_dma_tag_t rxtag; bus_dmamap_t rx_map[ATE_MAX_RX_BUFFERS]; + void *rx_buf[ATE_MAX_RX_BUFFERS]; /* RX buffer space */ + int rx_buf_ptr; bus_dma_tag_t rx_desc_tag; bus_dmamap_t rx_desc_map; int txcur; /* current tx map pointer */ - struct mbuf *sent_mbuf[ATE_MAX_TX_BUFFERS]; /* Sent mbufs */ - struct mbuf *rx_mbuf[ATE_MAX_RX_BUFFERS]; /* RX mbufs */ bus_addr_t rx_desc_phys; eth_rx_desc_t *rx_descs; struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ @@ -241,6 +242,30 @@ sc->rx_desc_phys = segs[0].ds_addr; } +static void +ate_load_rx_buf(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct ate_softc *sc; + int i; + + if (error != 0) + return; + sc = (struct ate_softc *)arg; + i = sc->rx_buf_ptr; + + /* + * For the last buffer, set the wrap bit so the controller + * restarts from the first descriptor. + */ + if (i == ATE_MAX_RX_BUFFERS - 1) + sc->rx_descs[i].addr = segs[0].ds_addr | ETH_WRAP_BIT; + else + sc->rx_descs[i].addr = segs[0].ds_addr; + sc->rx_descs[i].status = 0; + /* Flush the memory in the mbuf */ + bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); +} + /* * Compute the multicast filter for this device using the standard * algorithm. I wonder why this isn't in ether somewhere as a lot @@ -342,33 +367,21 @@ if (bus_dmamem_alloc(sc->rx_desc_tag, (void **)&sc->rx_descs, BUS_DMA_NOWAIT | BUS_DMA_COHERENT, &sc->rx_desc_map) != 0) goto errout; - if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, + if (bus_dmamap_load(sc->rx_desc_tag, sc->rx_desc_map, sc->rx_descs, ATE_MAX_RX_BUFFERS * sizeof(eth_rx_desc_t), ate_getaddr, sc, 0) != 0) goto errout; /* XXX TODO(5) Put this in ateinit_locked? */ for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { - bus_dma_segment_t seg; - int nsegs; - - sc->rx_mbuf[i] = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR); - sc->rx_mbuf[i]->m_len = sc->rx_mbuf[i]->m_pkthdr.len = - MCLBYTES; - if (bus_dmamap_load_mbuf_sg(sc->rxtag, sc->rx_map[i], - sc->rx_mbuf[i], &seg, &nsegs, 0) != 0) + sc->rx_buf_ptr = i; + if (bus_dmamem_alloc(sc->rxtag, (void **)&sc->rx_buf[i], + BUS_DMA_NOWAIT, &sc->rx_map[i]) != 0) + goto errout; + if (bus_dmamap_load(sc->rxtag, sc->rx_map[i], sc->rx_buf[i], + MCLBYTES, ate_load_rx_buf, sc, 0) != 0) goto errout; - /* - * For the last buffer, set the wrap bit so the controller - * restarts from the first descriptor. - */ - if (i == ATE_MAX_RX_BUFFERS - 1) - sc->rx_descs[i].addr = seg.ds_addr | ETH_WRAP_BIT; - else - sc->rx_descs[i].addr = seg.ds_addr; - sc->rx_descs[i].status = 0; - /* Flush the memory in the mbuf */ - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); } + sc->rx_buf_ptr = 0; /* Flush the memory for the EMAC rx descriptor */ bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); /* Write the descriptor queue address. */ @@ -577,10 +590,9 @@ struct ate_softc *sc = xsc; int status; int i; - struct mbuf *mb, *tmp_mbuf; - bus_dma_segment_t seg; - int rx_stat; - int nsegs; + void *bp; + struct mbuf *mb; + uint32_t rx_stat; status = RD4(sc, ETH_ISR); @@ -589,26 +601,14 @@ if (status & ETH_ISR_RCOM) { bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_POSTREAD); - for (i = 0; i < ATE_MAX_RX_BUFFERS; i++) { - if ((sc->rx_descs[i].addr & ETH_CPU_OWNER) == 0) - continue; - - mb = sc->rx_mbuf[i]; + while (sc->rx_descs[sc->rx_buf_ptr].addr & ETH_CPU_OWNER) { + i = sc->rx_buf_ptr; + sc->rx_buf_ptr = (i + 1) % ATE_MAX_RX_BUFFERS; + bp = sc->rx_buf[i]; rx_stat = sc->rx_descs[i].status; if ((rx_stat & ETH_LEN_MASK) == 0) { printf("ignoring bogus 0 len packet\n"); - bus_dmamap_load_mbuf_sg(sc->rxtag, - sc->rx_map[i], sc->rx_mbuf[i], - &seg, &nsegs, 0); - sc->rx_descs[i].status = 0; - sc->rx_descs[i].addr = seg.ds_addr; - if (i == ATE_MAX_RX_BUFFERS - 1) - sc->rx_descs[i].addr |= - ETH_WRAP_BIT; - /* Flush memory for mbuf */ - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); - /* Flush rx dtor table rx_descs */ + sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, BUS_DMASYNC_PREWRITE); continue; @@ -617,64 +617,22 @@ /* Flush memory for mbuf so we don't get stale bytes */ bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_POSTREAD); - WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); + WR4(sc, ETH_RSR, RD4(sc, ETH_RSR)); // XXX WHY? XXX imp /* - * Allocate a new buffer to replace this one. - * if we cannot, then we drop this packet - * and keep the old buffer we had. Once allocated - * the new buffer is loaded for dma. - */ - sc->rx_mbuf[i] = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - if (!sc->rx_mbuf[i]) { - printf("Failed to get another mbuf -- discarding packet\n"); - sc->rx_mbuf[i] = mb; - sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); - continue; - } - sc->rx_mbuf[i]->m_len = - sc->rx_mbuf[i]->m_pkthdr.len = MCLBYTES; - bus_dmamap_unload(sc->rxtag, sc->rx_map[i]); - if (bus_dmamap_load_mbuf_sg(sc->rxtag, sc->rx_map[i], - sc->rx_mbuf[i], &seg, &nsegs, 0) != 0) { - printf("Failed to load mbuf -- discarding packet -- reload old?\n"); - sc->rx_mbuf[i] = mb; - sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; - bus_dmamap_sync(sc->rxtag, sc->rx_map[i], - BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); - continue; - } - /* * The length returned by the device includes the * ethernet CRC calculation for the packet, but * ifnet drivers are supposed to discard it. */ - mb->m_len = (rx_stat & ETH_LEN_MASK) - ETHER_CRC_LEN; - mb->m_pkthdr.len = mb->m_len; - mb->m_pkthdr.rcvif = sc->ifp; - tmp_mbuf = m_devget(mtod(mb, caddr_t), mb->m_len, - ETHER_ALIGN, sc->ifp, NULL); - m_free(mb); - /* - * For the last buffer, set the wrap bit so - * the controller restarts from the first - * descriptor. - */ - sc->rx_descs[i].status = 0; - sc->rx_descs[i].addr = seg.ds_addr; - if (i == ATE_MAX_RX_BUFFERS - 1) - sc->rx_descs[i].addr |= ETH_WRAP_BIT; + mb = m_devget(sc->rx_buf[i], + (rx_stat & ETH_LEN_MASK) - ETHER_CRC_LEN, + ETHER_ALIGN, sc->ifp, NULL); + sc->rx_descs[i].addr &= ~ETH_CPU_OWNER; + bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, + BUS_DMASYNC_PREWRITE); bus_dmamap_sync(sc->rxtag, sc->rx_map[i], BUS_DMASYNC_PREREAD); - bus_dmamap_sync(sc->rx_desc_tag, sc->rx_desc_map, - BUS_DMASYNC_PREWRITE); - if (tmp_mbuf != NULL) - (*sc->ifp->if_input)(sc->ifp, tmp_mbuf); + if (mb != NULL) + (*sc->ifp->if_input)(sc->ifp, mb); } } if (status & ETH_ISR_TCOM) { From owner-p4-projects@FreeBSD.ORG Mon Mar 20 22:13:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1524B16A425; Mon, 20 Mar 2006 22:13:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0D5916A400 for ; Mon, 20 Mar 2006 22:13:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7538443D46 for ; Mon, 20 Mar 2006 22:13:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2KMDD1q075861 for ; Mon, 20 Mar 2006 22:13:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2KMDDH0075858 for perforce@freebsd.org; Mon, 20 Mar 2006 22:13:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 20 Mar 2006 22:13:13 GMT Message-Id: <200603202213.k2KMDDH0075858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 93670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2006 22:13:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=93670 Change 93670 by rwatson@rwatson_zoo on 2006/03/20 22:12:32 Remove Makefile lines not present in CVS. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#9 (text+ko) ==== @@ -8,7 +8,6 @@ CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} LDADD= -lutil ${MINUSLPAM} -lbsm -MAN= login.1 login.access.5 .if ${MK_SETUID_LOGIN} != "no" BINOWN= root From owner-p4-projects@FreeBSD.ORG Tue Mar 21 01:28:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36B9216A424; Tue, 21 Mar 2006 01:28:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E40CD16A401 for ; Tue, 21 Mar 2006 01:28:12 +0000 (UTC) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A20C443D45 for ; Tue, 21 Mar 2006 01:28:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L1SBii090725 for ; Tue, 21 Mar 2006 01:28:12 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L1SBBU090722 for perforce@freebsd.org; Tue, 21 Mar 2006 01:28:11 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 21 Mar 2006 01:28:11 GMT Message-Id: <200603210128.k2L1SBBU090722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 93676 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 01:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=93676 Change 93676 by soc-andrew@soc-andrew_serv on 2006/03/21 01:27:44 IFC Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#13 integrate .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#7 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#11 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#7 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#15 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.542 2006/03/19 15:36:56 mux Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -963,6 +963,10 @@ _generic_libs= gnu/lib +.if ${MK_IPX} != "no" +_prebuild_libs+= lib/libipx +.endif + .if ${MK_KERBEROS} != "no" _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libkrb5 @@ -971,7 +975,7 @@ .endif _prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libipx lib/libkiconv lib/libkvm lib/libmd \ + lib/libkiconv lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#7 (text+ko) ==== @@ -83,6 +83,18 @@ -- App.state.target:cmds_install_srcs(cmds, App.conf.install_items) + --- Install the generic kernel + cmds:add { + cmdline = "${root}${TAR} -x " .. + "-f ${root}usr/${uname}/kernels/generic.tgz " .. + "-C ${root}${base}/usr", + replacements = { + base = base, + uname = POSIX.uname("%r") + } + } + + --- Install the ports tree if App.conf.install_ports == true then cmds:add{ cmdline = "${root}${TAR} -x " .. ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.213 2006/03/17 18:54:24 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.214 2006/03/20 14:24:57 ru Exp $ .include @@ -31,7 +31,7 @@ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ - libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ + ${_libipx} libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ @@ -61,8 +61,14 @@ _libsdp= libsdp .endif +.if ${MK_IPX} != "no" +_libipx= libipx +.endif + .if ${MACHINE_ARCH} == "i386" +.if ${MK_NCP} != "no" _libncp= libncp +.endif _libsmb= libsmb _libvgl= libvgl .endif @@ -88,7 +94,9 @@ .endif .if ${MACHINE_ARCH} == "amd64" +.if ${MK_NCP} != "no" _libncp= libncp +.endif _libsmb= libsmb .endif ==== //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.19 2006/01/31 20:36:01 luigi Exp $ +# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.20 2006/03/20 14:24:57 ru Exp $ # # configuration file for "bridge" floppy. # Depending on your needs, almost surely you will need to @@ -19,6 +19,7 @@ # that to use the most compact possible version of the code. # buildopts -DNO_PAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -DTRACEROUTE_NO_IPSEC -DNO_INET6 +buildopts -DWITHOUT_IPX # directories where to look for sources of various binaries. # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) @@ -179,6 +180,6 @@ libs -lufs # used by mount ### ee uses ncurses instead of curses libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm -libs -lmytinfo -lipx -lz -lpcap -lwrap +libs -lmytinfo -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.290 2006/03/17 18:54:38 ru Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.291 2006/03/20 14:24:58 ru Exp $ .include @@ -303,8 +303,10 @@ .endif .if ${MACHINE_ARCH} == "i386" +.if ${MK_NCP} != "no" _ncplist= ncplist _ncplogin= ncplogin +.endif _smbutil= smbutil .endif @@ -313,8 +315,10 @@ .endif .if ${MACHINE_ARCH} == "amd64" +.if ${MK_NCP} != "no" _ncplist= ncplist _ncplogin= ncplogin +.endif _smbutil= smbutil .endif ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#15 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.347 2006/03/17 18:54:39 ru Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.348 2006/03/20 14:24:58 ru Exp $ .include @@ -66,7 +66,7 @@ iostat \ ip6addrctl \ ipfwpcap \ - IPXrouted \ + ${_IPXrouted} \ jail \ jexec \ jls \ @@ -237,6 +237,10 @@ _traceroute6= traceroute6 .endif +.if ${MK_IPX} != "no" +_IPXrouted= IPXrouted +.endif + .if ${MK_NIS} != "no" _rpc.yppasswdd= rpc.yppasswdd _rpc.ypupdated= rpc.ypupdated @@ -284,7 +288,9 @@ _kgmon= kgmon _kgzip= kgzip _lptcontrol= lptcontrol +.if ${MK_NCP} != "no" _mount_nwfs= mount_nwfs +.endif _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt @@ -331,7 +337,9 @@ _btxld= btxld _kgmon= kgmon _lptcontrol= lptcontrol +.if ${MK_NCP} != "no" _mount_nwfs= mount_nwfs +.endif _mount_smbfs= mount_smbfs _mptable= mptable _ndiscvt= ndiscvt From owner-p4-projects@FreeBSD.ORG Tue Mar 21 02:56:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C460A16A423; Tue, 21 Mar 2006 02:56:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A086C16A422 for ; Tue, 21 Mar 2006 02:56:59 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D93543D46 for ; Tue, 21 Mar 2006 02:56:59 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L2uxGn094162 for ; Tue, 21 Mar 2006 02:56:59 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L2uxFq094159 for perforce@freebsd.org; Tue, 21 Mar 2006 02:56:59 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 02:56:59 GMT Message-Id: <200603210256.k2L2uxFq094159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93677 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 02:57:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=93677 Change 93677 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 02:56:50 handle absence of maxfilesize field on Solaris' UFS Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/ufs/ffs/ffs_vfsops.c#4 (text+ko) ==== @@ -901,7 +901,9 @@ if (fs->fs_magic == FS_UFS1_MAGIC) { ump->um_savedmaxfilesize = fs->fs_maxfilesize; maxfilesize = (uint64_t)0x80000000 * fs->fs_bsize - 1; +#ifndef SIMULATOR if (fs->fs_maxfilesize > maxfilesize) +#endif fs->fs_maxfilesize = maxfilesize; } /* Compatibility for old filesystems */ From owner-p4-projects@FreeBSD.ORG Tue Mar 21 03:00:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3800916A423; Tue, 21 Mar 2006 03:00:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA9E516A420 for ; Tue, 21 Mar 2006 03:00:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 974FF43D45 for ; Tue, 21 Mar 2006 03:00:03 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L303eh094331 for ; Tue, 21 Mar 2006 03:00:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L303kD094328 for perforce@freebsd.org; Tue, 21 Mar 2006 03:00:03 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 03:00:03 GMT Message-Id: <200603210300.k2L303kD094328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 03:00:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=93678 Change 93678 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 02:59:36 handle non page-aligned reads that straddle physical pages Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#3 (text+ko) ==== @@ -89,20 +89,34 @@ hvd_startio(struct hvd_softc *sc, struct bio *bp) { u_int r; - int len; + int len, rlen, wlen; + uint64_t page_off; + r = H_EOK; + len = 0; + + page_off = bp->bio_offset & PAGE_MASK; + switch (bp->bio_cmd) { case BIO_READ: - for (len = 0; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) { - int rlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len; + if (bp->bio_length > (PAGE_SIZE - page_off)) { + len = rlen = (PAGE_SIZE - page_off); + r = hv_sim_read(bp->bio_offset, vtophys((char *)bp->bio_data), rlen); + } + for (; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) { + rlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len; r = hv_sim_read(bp->bio_offset + len, vtophys((char *)bp->bio_data + len), rlen); } break; case BIO_WRITE: - for (len = 0; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) { - int wlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len; + if (bp->bio_length > (PAGE_SIZE - page_off)) { + len = wlen = (PAGE_SIZE - page_off); + r = hv_sim_write(bp->bio_offset, vtophys((char *)bp->bio_data), wlen); + } + for (; len < bp->bio_length && r == H_EOK; len += PAGE_SIZE) { + wlen = (bp->bio_length - len) > PAGE_SIZE ? PAGE_SIZE : bp->bio_length - len; r = hv_sim_write(bp->bio_offset + len, vtophys((char *)bp->bio_data + len), wlen); } break; From owner-p4-projects@FreeBSD.ORG Tue Mar 21 03:02:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7937616A426; Tue, 21 Mar 2006 03:02:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30CD616A424 for ; Tue, 21 Mar 2006 03:02:27 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D02FC43D46 for ; Tue, 21 Mar 2006 03:02:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L32Q9Q094547 for ; Tue, 21 Mar 2006 03:02:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L32QtQ094544 for perforce@freebsd.org; Tue, 21 Mar 2006 03:02:26 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 03:02:26 GMT Message-Id: <200603210302.k2L32QtQ094544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93679 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 03:02:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=93679 Change 93679 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 03:01:25 32-bit store after 64-bit load was causing nsaved to be always read as 0 Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#8 (text+ko) ==== @@ -36,8 +36,17 @@ ENTRY(fault_64bit_sn1) /* XXX need to use physical addresses here */ GET_PCB(%g6) +! MAGIC_TRAP_ON stx %sp, [%g6 + PCB_RWSP] SPILL(stx, %g6 + PCB_RW, 8) +#ifdef PMAP_DEBUG + ldx [%g6 + PCB_NSAVED], %g5 + brz %g5, 1f + nop + MAGIC_TRAP_ON + MAGIC_EXIT +1: +#endif mov 1, %g5 stx %g5, [%g6 + PCB_NSAVED] saved @@ -65,7 +74,8 @@ ENTRY(fault_64bit_so0) GET_PCB(%g6) - ld [%g6 + PCB_NSAVED], %g2 +! MAGIC_TRAP_ON + ldx [%g6 + PCB_NSAVED], %g2 add %g2, 1, %g3 stx %g3, [%g6 + PCB_NSAVED] @@ -82,21 +92,24 @@ ENTRY(fault_64bit_so1) /* XXX need to use physical addresses */ +! MAGIC_TRAP_ON GET_PCB(%g6) - ld [%g6 + PCB_NSAVED], %g2 + ldx [%g6 + PCB_NSAVED], %g2 add %g2, 1, %g3 stx %g3, [%g6 + PCB_NSAVED] sll %g2, PTR_SHIFT, %g4 add %g6, PCB_RWSP, %g3 stx %sp, [%g3 + %g4] - sll %g2, RW_SHIFT, %g4 - add %g4, %g6, %g4 - add %g4, PCB_RW, %g3 + sll %g2, RW_SHIFT, %g4 ! offset + add %g6, PCB_RW, %g3 ! start of wbuf area + add %g3, %g4, %g3 ! offset into wbuf area + SAVE_WINDOW(%g3) saved set tl0_trap, %g5 wrpr %g5, %tnpc + MAGIC_TRAP_OFF done END(fault_64bit_so1) From owner-p4-projects@FreeBSD.ORG Tue Mar 21 03:06:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA3EC16A41F; Tue, 21 Mar 2006 03:06:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 728CE16A401 for ; Tue, 21 Mar 2006 03:06:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F2A743D45 for ; Tue, 21 Mar 2006 03:06:32 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L36WUc094688 for ; Tue, 21 Mar 2006 03:06:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L36Vwm094685 for perforce@freebsd.org; Tue, 21 Mar 2006 03:06:31 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 03:06:31 GMT Message-Id: <200603210306.k2L36Vwm094685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93680 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 03:06:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=93680 Change 93680 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 03:06:07 implement get and clear bit functions Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte.c#3 (text+ko) ==== @@ -117,7 +117,12 @@ void tte_clear_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags) { - UNIMPLEMENTED; + tte_t *tte; + + tte = tte_hash_lookup(pmap->pm_hash, va); + + if (tte) + *tte = *tte & ~flags; } void @@ -129,6 +134,11 @@ boolean_t tte_get_virt_bit(struct pmap *pmap, vm_offset_t va, uint64_t flags) { - UNIMPLEMENTED; - return (FALSE); + tte_t ttedata, *tte; + + tte = tte_hash_lookup(pmap->pm_hash, va); + + ttedata = tte ? *tte : 0; + + return ((ttedata & flags) == flags); } From owner-p4-projects@FreeBSD.ORG Tue Mar 21 03:12:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 117A416A41F; Tue, 21 Mar 2006 03:12:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93BE416A400 for ; Tue, 21 Mar 2006 03:12:40 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F02743D49 for ; Tue, 21 Mar 2006 03:12:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L3Ceo7094956 for ; Tue, 21 Mar 2006 03:12:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L3CeKD094953 for perforce@freebsd.org; Tue, 21 Mar 2006 03:12:40 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 03:12:40 GMT Message-Id: <200603210312.k2L3CeKD094953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93681 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 03:12:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=93681 Change 93681 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 03:11:45 enable signals to be sent to processes set pil to 0 in idle thread "just in case" Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#15 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#15 (text+ko) ==== @@ -326,8 +326,8 @@ * Initialize the console before printing anything. */ cninit(); + tick_init(clock); - tick_init(clock); /* * Panic is there is no metadata. Most likely the kernel was booted * directly, instead of through loader(8). @@ -522,8 +522,6 @@ sf.sf_si.si_addr = (void *)tf->tf_sfar; /* XXX */ #else printf("sendsig %d to %s\n", sig, p->p_comm); - hv_magic_trap_on(); - __asm __volatile("ta 0x71"); #endif /* Copy the sigframe out to the user's stack. */ if (rwindow_save(td) != 0 || copyout(&sf, sfp, sizeof(*sfp)) != 0 || @@ -742,6 +740,7 @@ cpu_idle(void) { /* Insert code to halt (until next interrupt) for the idle loop */ + wrpr(pil, 0, 0); } int From owner-p4-projects@FreeBSD.ORG Tue Mar 21 03:31:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B6EB16A430; Tue, 21 Mar 2006 03:31:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B26116A400 for ; Tue, 21 Mar 2006 03:31:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19C5F43D45 for ; Tue, 21 Mar 2006 03:31:03 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L3V224095820 for ; Tue, 21 Mar 2006 03:31:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L3V289095817 for perforce@freebsd.org; Tue, 21 Mar 2006 03:31:02 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 03:31:02 GMT Message-Id: <200603210331.k2L3V289095817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93682 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 03:31:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=93682 Change 93682 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 03:30:11 avoid stepping on user register implement general case trap handlers don't use %g7 except as PCPU_REG in general trap handlers Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#36 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#36 (text+ko) ==== @@ -211,18 +211,17 @@ .endm .macro tl0_setup type - tl0_split + clr %g3 + mov 0, %g4 + set trap, %g1 ba %xcc, tl0_trap - mov \type, %g1 + mov \type, %g2 .endm /* * Generic trap type. Call trap() with the specified type. */ .macro tl0_gen type - MAGIC_TRAP_ON - MAGIC_TRAP_ON - MAGIC_EXIT tl0_setup \type .align 32 .endm @@ -520,6 +519,8 @@ .macro tl0_pil_entry level, mask #if 1 + wrpr %g0, 1, %tl + wrpr %g0, 1, %gl set \mask, %g1 clr %g2 clr %g3 @@ -573,29 +574,10 @@ INTR_LEVEL(0) .endm - .macro tl0_immu_miss - nop - .align 128 - .endm - - - .macro tl0_spill_bad count - .rept \count - sir - .align 128 - .endr - .endm - - .macro tl0_fill_bad count - .rept \count - sir - .align 128 - .endr - .endm .macro tl0_syscall clr %g3 - mov -1, %g4 + mov 0, %g4 set syscall, %g1 ba %xcc, tl0_trap mov T_SYSCALL, %g2 @@ -927,29 +909,33 @@ ENTRY(utl0) - GET_PCPU_SCRATCH + nop SAVE_GLOBALS(%l7) SAVE_OUTS(%l7) + GET_PCPU_SCRATCH wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints brnz %o1, common_utrap nop call critical_enter nop + wrpr %g0, 0, %pil jmpl %l3, %o7 ! call trap handler mov %l7, %o0 call critical_exit nop b user_rtt nop -common_utrap: +common_utrap: + wrpr %g0, 0, %pil jmpl %l3, %o7 ! call trap handler mov %l7, %o0 - GET_PCB(%g6) + ldx [PCPU_REG + PC_CURPCB], %g6 sub %g6, CCFSZ + SPOFF + TF_SIZEOF, %sp add %sp, REGOFF + SPOFF, %l7 ENTRY(user_rtt) + GET_PCPU_SCRATCH ! pil handling needs to be re-visited wrpr %g0, PIL_TICK, %pil ldx [PCPU(CURTHREAD)], %l0 @@ -966,8 +952,9 @@ ba,a,pt %xcc, user_rtt nop -1: GET_PCB(PCB_REG) - ldx [PCB_REG + PCB_NSAVED], %l1 +1: + ldx [PCPU_REG + PC_CURPCB], %g6 + ldx [%g6 + PCB_NSAVED], %l1 brz,a,pt %l1, 2f nop wrpr %g0, 0, %pil @@ -985,11 +972,9 @@ wrpr %l1, PSTATE_IE, %pstate RESTORE_GLOBALS(%l7) wrpr %g0, 1, %gl - mov %sp, %g6 ! save tf pointer RESTORE_OUTS(%l7) wrpr %g0, 0, %pil ! drop pil to 0 - wrpr %g0, 1, %tl ! raise tl -> 1 before setting pcontext mov MMU_CID_S, %g1 @@ -1005,7 +990,7 @@ ldx [%l7 + TF_TPC], %g1 ldx [%l7 + TF_TNPC], %g2 ldx [%l7 + TF_TSTATE], %l0 - andn %l0, TSTATE_CWP_MASK, %g7 + andn %l0, TSTATE_CWP_MASK, %g6 wrpr %g1, %tpc wrpr %g2, %tnpc @@ -1059,7 +1044,7 @@ brnz %g1, 3f nop ! no trap, use restore directly rdpr %cwp, %g1 - wrpr %g1, %g7, %tstate ! needed by wbuf recovery code + wrpr %g1, %g6, %tstate ! needed by wbuf recovery code ! hand craft the restore to avoid getting to TL > 2 rdpr %wstate, %g1 btst 1, %g1 @@ -1087,16 +1072,17 @@ rdpr %canrestore, %g1 wrpr %g0, %g1, %cleanwin rdpr %cwp, %g1 - wrpr %g1, %g7, %tstate -! MAGIC_TRAP_ON + wrpr %g1, %g6, %tstate +! MAGIC_TRAP_ON retry END(user_rtt) END(utl0) ENTRY(ktl0) + nop + SAVE_GLOBALS(%l7) + SAVE_OUTS(%l7) GET_PCPU_SCRATCH - SAVE_GLOBALS(%l7) - SAVE_OUTS(%l7) ! for the call bug workaround wrpr %g0, PSTATE_KERNEL, %pstate ! enable ints brnz %o1, common_ktrap @@ -1109,7 +1095,7 @@ nop b common_rtt nop -common_ktrap: +common_ktrap: jmpl %l3, %o7 ! call trap handler mov %l7, %o0 @@ -1120,7 +1106,10 @@ ! rdpr %pstate, %l1 wrpr %l1, PSTATE_IE, %pstate + + RESTORE_GLOBALS(%l7) + ! switch to global set 1 wrpr %g0, 1, %gl RESTORE_OUTS(%l7) @@ -1134,23 +1123,29 @@ movg %xcc, %l6, %l0 wrpr %g0, %l0, %pil #endif + GET_PCPU_SCRATCH + /* simulator incorrectly exits if tl != gl */ + ldx [PCPU(CURTHREAD)], %l0 + ldx [%l0 + TD_MD + MD_SAVED_PIL], %l0 + wrpr %g0, %l0, %pil ! ! raise tl ! setup trap regs ! restore to window we originally trapped in ! wrpr %g0, 1, %tl + ldx [%l7 + TF_TPC], %g1 ldx [%l7 + TF_TNPC], %g2 ldx [%l7 + TF_TSTATE], %l0 - andn %l0, TSTATE_CWP_MASK, %g7 + andn %l0, TSTATE_CWP_MASK, %g6 wrpr %g1, %tpc wrpr %g2, %tnpc rdpr %canrestore, %g1 brnz %g1, 3f nop ! can use restore directly rdpr %cwp, %g1 - wrpr %g1, %g7, %tstate ! needed by wbuf recovery code + wrpr %g1, %g6, %tstate ! needed by wbuf recovery code ! avoid going above TL2 fill_64bit_rtt(ASI_N) @@ -1161,7 +1156,7 @@ ! set %tstate to the correct %cwp ! rdpr %cwp, %g1 - wrpr %g1, %g7, %tstate + wrpr %g1, %g6, %tstate retry END(krtt) END(ktl0) @@ -1214,13 +1209,13 @@ ! %l7 trapframe ENTRY(tl0_trap) - MAGIC_TRAP_OFF /* if we're at tl2 we have some extra work to do */ rdpr %tl, %g5 cmp %g5, 2 be,pn %xcc, tl1_trap nop + MAGIC_TRAP_OFF rdpr %tstate, %g5 btst TSTATE_PRIV, %g5 and %g5, TSTATE_CWP_MASK, %g6 @@ -1253,7 +1248,7 @@ mov MMU_CID_P, %l1 sethi %hi(FLUSH_ADDR), %l2 SET_MMU_CONTEXT(%l1, %l0) - flush %l2 ! flush / membar required by immu for + flush %l2 ! flush/membar required by immu for ! consistency guarantee set utl0, %g6 win_saved: @@ -1575,18 +1570,6 @@ * them to the outs. */ ENTRY(fork_trampoline) -#if KTR_COMPILE & KTR_PROC - CATR(KTR_PROC, "fork_trampoline: td=%p (%s) cwp=%#lx" - , %g1, %g2, %g3, 7, 8, 9) - ldx [PCPU(CURTHREAD)], %g2 - stx %g2, [%g1 + KTR_PARM1] - ldx [%g2 + TD_PROC], %g2 - add %g2, P_COMM, %g2 - stx %g2, [%g1 + KTR_PARM2] - rdpr %cwp, %g2 - stx %g2, [%g1 + KTR_PARM3] -9: -#endif mov %l0, %o0 mov %l1, %o1 call fork_exit From owner-p4-projects@FreeBSD.ORG Tue Mar 21 04:23:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A2616A422; Tue, 21 Mar 2006 04:23:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B899616A41F for ; Tue, 21 Mar 2006 04:23:17 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D3FD43D6D for ; Tue, 21 Mar 2006 04:23:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L4NAuZ097724 for ; Tue, 21 Mar 2006 04:23:10 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L4N9Vf097721 for perforce@freebsd.org; Tue, 21 Mar 2006 04:23:09 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 04:23:09 GMT Message-Id: <200603210423.k2L4N9Vf097721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93686 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 04:23:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=93686 Change 93686 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 04:23:06 implement pmap_zero_page_area remove pmap_qenter hack remove tsb_set_tte call from pmap_kenter call invltlb in pmap_invalidate_range() to work around bug evidenced with sf_buf_alloc make DPRINTF a runtime conditional Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#32 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#32 (text+ko) ==== @@ -125,6 +125,7 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +int pmap_debug = 0; /* * Kernel pmap. @@ -169,7 +170,7 @@ #define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) #define IMPLEMENTME printf("don't forget %s not implemented\n", __FUNCTION__) #ifdef PMAP_DEBUG -#define DPRINTF printf +#define DPRINTF if (pmap_debug) printf #else #define DPRINTF(...) #endif @@ -587,10 +588,14 @@ if (error != H_EOK) panic("map_perm_addr returned error=%ld", error); continue; - } else if (translations[i].om_start < VM_MIN_PROM_ADDRESS || + } +#if 1 + else if (translations[i].om_start < VM_MIN_PROM_ADDRESS || translations[i].om_start > VM_MAX_PROM_ADDRESS) { continue; - } else { + } +#endif + else { for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; @@ -633,9 +638,11 @@ pm->pm_hashscratch = tte_hash_set_scratchpad_kernel(pm->pm_hash); for (i = 0; i < sz; i++) { +#if 1 if (translations[i].om_start < VM_MIN_PROM_ADDRESS || translations[i].om_start > VM_MAX_PROM_ADDRESS) continue; +#endif for (off = 0; off < translations[i].om_size; off += PAGE_SIZE) { va = translations[i].om_start + off; pa = TTE_GET_PA(translations[i].om_tte) + off; @@ -705,7 +712,6 @@ { vm_offset_t addr, end_addr; - return; end_addr = src_addr + len; @@ -1065,6 +1071,9 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { vm_offset_t tva; + /* XXX */ + invltlb(); + if (pmap != kernel_pmap) DPRINTF("pmap_invalidate_range(sva=%lx, eva=%lx)\n", sva, eva); /* XXX SUN4V_FIXME - oversimplified logic */ @@ -1122,8 +1131,6 @@ void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { - tsb_set_tte(&kernel_pmap->pm_tsb, va, pa | TTE_KERNEL | VTD_8K, - kernel_pmap->pm_context); tte_hash_insert(kernel_pmap->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } @@ -1154,7 +1161,6 @@ void pmap_kremove(vm_offset_t va) { - tte_hash_delete(kernel_pmap->pm_hash, va); } @@ -1200,6 +1206,7 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_pindex_t index, vm_size_t size) { + printf("pmap_object_init_pt\n"); return; } @@ -1371,36 +1378,14 @@ pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) { vm_offset_t va; - int tcount; - vm_page_t *tm; - - tm = m; - tcount = count; va = sva; - while (tcount-- > 0) { - pmap_kenter(va, VM_PAGE_TO_PHYS(*tm)); + while (count-- > 0) { + pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); va += PAGE_SIZE; - tm++; + m++; } pmap_invalidate_range(kernel_pmap, sva, va); - - /* disgusting hack to avoid TSB misses on kernel pages - * this will need to be fixed some time soon - */ -#if 0 - tm = m; - tcount = count; - - va = sva; - while (tcount-- > 0) { - tsb_set_tte(&kernel_pmap->pm_tsb, va, - VM_PAGE_TO_PHYS(*tm) | TTE_KERNEL | VTD_8K, - kernel_pmap->pm_context); - va += PAGE_SIZE; - tm++; - } -#endif } /* @@ -1711,7 +1696,14 @@ void pmap_zero_page_area(vm_page_t m, int off, int size) { - UNIMPLEMENTED; + vm_paddr_t pa; + vm_offset_t va; + + pa = VM_PAGE_TO_PHYS(m); + va = TLB_PHYS_TO_DIRECT(pa); + + bzero((char *)(va + off), size); + } void From owner-p4-projects@FreeBSD.ORG Tue Mar 21 04:35:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4245816A420; Tue, 21 Mar 2006 04:35:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07C1416A401 for ; Tue, 21 Mar 2006 04:35:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B099943D45 for ; Tue, 21 Mar 2006 04:35:25 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L4ZPX7098205 for ; Tue, 21 Mar 2006 04:35:25 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L4ZPJ3098202 for perforce@freebsd.org; Tue, 21 Mar 2006 04:35:25 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 04:35:25 GMT Message-Id: <200603210435.k2L4ZPJ3098202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93687 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 04:35:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=93687 Change 93687 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 04:34:50 add include needed if pmap.h is included externally Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pmap.h#8 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #define PMAP_CONTEXT_MAX 8192 From owner-p4-projects@FreeBSD.ORG Tue Mar 21 04:58:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38EF216A420; Tue, 21 Mar 2006 04:58:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D82E916A401 for ; Tue, 21 Mar 2006 04:58:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9949743D46 for ; Tue, 21 Mar 2006 04:58:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L4ws4F006827 for ; Tue, 21 Mar 2006 04:58:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L4wsu6006824 for perforce@freebsd.org; Tue, 21 Mar 2006 04:58:54 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 04:58:54 GMT Message-Id: <200603210458.k2L4wsu6006824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93688 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 04:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=93688 Change 93688 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 04:58:03 add non control flow changes for spill/fill exception handlers to use physical addresses Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#13 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#11 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#8 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#16 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#13 (text+ko) ==== @@ -201,9 +201,6 @@ ASSYM(PC_IRTAIL, offsetof(struct pcpu, pc_irtail)); ASSYM(PC_IRFREE, offsetof(struct pcpu, pc_irfree)); ASSYM(PC_MID, offsetof(struct pcpu, pc_mid)); -ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); -ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); -ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); @@ -223,6 +220,9 @@ ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); ASSYM(PC_PMAP, offsetof(struct pcpu, pc_curpmap)); #else +ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); +ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); +ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); ASSYM(PC_PMAP, offsetof(struct pcpu, pc_pmap)); #endif @@ -273,6 +273,9 @@ ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_MD, offsetof(struct thread, td_md)); +ASSYM(MD_SAVED_PIL, offsetof(struct mdthread, md_saved_pil)); + ASSYM(PCB_SIZEOF, sizeof(struct pcb)); ASSYM(PCB_RW, offsetof(struct pcb, pcb_rw)); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/asmacros.h#11 (text+ko) ==== @@ -131,6 +131,14 @@ #define GET_MMFSA_SCRATCH(reg) \ ldxa [%g0 + %g0]ASI_SCRATCHPAD, reg; + +#define GET_PCPU_PHYS_SCRATCH(tmp) \ + sethi %uhi(VM_MIN_DIRECT_ADDRESS), tmp; \ + mov SCRATCH_REG_PCPU, PCPU_REG; \ + sllx tmp, 32, tmp; \ + ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; \ + andn PCPU_REG, tmp, PCPU_REG + #define GET_PCPU_SCRATCH \ mov SCRATCH_REG_PCPU, PCPU_REG; \ ldxa [%g0 + PCPU_REG]ASI_SCRATCHPAD, PCPU_REG; @@ -171,6 +179,13 @@ #define SET_SCRATCH(offsetreg, reg) stxa reg, [%g0 + offsetreg]ASI_SCRATCHPAD + +#define GET_PCB_PHYS(tmp, reg) \ + mov PC_CURPCB_RA, reg; \ + GET_PCPU_PHYS_SCRATCH(tmp); \ + ldxa [PCPU_REG + reg]ASI_REAL, reg; + + #define GET_PCB(reg) \ GET_PCPU_SCRATCH; \ ldx [PCPU_REG + PC_CURPCB], reg; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcb.h#8 (text+ko) ==== @@ -45,7 +45,7 @@ uint64_t pcb_nsaved; /* number of windows saved in pcb_rw */ uint64_t pcb_pc; uint64_t pcb_sp; - uint64_t pcb_pa; /* physical address of pcb */ + uint64_t pcb_ra; /* physical address of pcb */ uint64_t pcb_pad[4]; } __aligned(64); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/pcpu.h#8 (text+ko) ==== @@ -74,10 +74,8 @@ struct rwindow pc_kwbuf; \ u_long pc_kwbuf_sp; \ u_int pc_kwbuf_full; \ - u_int pc_node; \ - u_int pc_tlb_ctx; \ - u_int pc_tlb_ctx_max; \ - u_int pc_tlb_ctx_min + u_int pc_node; \ + u_long pc_curpcb_ra; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#16 (text+ko) ==== @@ -384,9 +384,6 @@ #endif pc->pc_addr = (vm_offset_t)pcpu0; pc->pc_node = child; - pc->pc_tlb_ctx = TLB_CTX_USER_MIN; - pc->pc_tlb_ctx_min = TLB_CTX_USER_MIN; - pc->pc_tlb_ctx_max = TLB_CTX_USER_MAX; /* * Initialize global registers. From owner-p4-projects@FreeBSD.ORG Tue Mar 21 05:21:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ABA816A424; Tue, 21 Mar 2006 05:21:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0342716A401 for ; Tue, 21 Mar 2006 05:21:27 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A649543D45 for ; Tue, 21 Mar 2006 05:21:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L5LQo2007726 for ; Tue, 21 Mar 2006 05:21:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L5LQJ5007723 for perforce@freebsd.org; Tue, 21 Mar 2006 05:21:26 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 05:21:26 GMT Message-Id: <200603210521.k2L5LQJ5007723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 05:21:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=93690 Change 93690 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 05:20:52 track pcb's real address Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#14 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#14 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#14 (text+ko) ==== @@ -219,6 +219,9 @@ ASSYM(PC_KWBUF_SP, offsetof(struct pcpu, pc_kwbuf_sp)); ASSYM(PC_KWBUF, offsetof(struct pcpu, pc_kwbuf)); ASSYM(PC_PMAP, offsetof(struct pcpu, pc_curpmap)); +ASSYM(PC_CURPCB_RA, offsetof(struct pcpu, pc_curpcb_ra)); + +ASSYM(PCB_RA, offsetof(struct pcb, pcb_ra)); #else ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); @@ -286,6 +289,10 @@ ASSYM(PCB_NSAVED, offsetof(struct pcb, pcb_nsaved)); ASSYM(PCB_PC, offsetof(struct pcb, pcb_pc)); ASSYM(PCB_SP, offsetof(struct pcb, pcb_sp)); + + + + ASSYM(PCB_FEF, PCB_FEF); ASSYM(VM_PMAP, offsetof(struct vmspace, vm_pmap)); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#14 (text+ko) ==== @@ -49,6 +49,25 @@ mov %i1, %i0 END(cpu_throw) + +ENTRY(pcb_ra_miss) + call pmap_kextract + mov PCB_REG, %o0 + mov %o0, %l0 +#ifdef DEBUG + ! sanity check lookup + brnz %o0, 1f + nop + MAGIC_TRAP_ON + MAGIC_EXIT +1: +#endif + ba,pt %xcc, pcb_ra_uptodate + stx %l0, [PCB_REG + PCB_RA] +END(pcb_ra_miss) + + + /* * void cpu_switch(struct thread *old, struct thread *new) */ @@ -102,7 +121,7 @@ * the current thread and pcb. */ .Lsw1: -#if KTR_COMPILE & KTR_PROC +#if KTR_COMPILE & KTR_PROC & 0 CATR(KTR_PROC, "cpu_switch: new td=%p pc=%#lx fp=%#lx" , %g1, %g2, %g3, 7, 8, 9) stx %i0, [%g1 + KTR_PARM1] @@ -128,19 +147,24 @@ */ ldx [PCB_REG + PCB_SP], %fp ldx [PCB_REG + PCB_PC], %i7 + ldx [PCB_REG + PCB_RA], %l0 sub %fp, CCFSZ, %sp - + brz %l0, pcb_ra_miss + nop +pcb_ra_uptodate: + /* * Point to the pmaps of the new process, and of the last non-kernel * process to run. */ + stx %l0, [PCPU(CURPCB_RA)] ldx [%i0 + TD_PROC], %i2 ldx [PCPU(PMAP)], %l2 ldx [%i2 + P_VMSPACE], %i5 add %i5, VM_PMAP, %i2 -#if KTR_COMPILE & KTR_PROC +#if KTR_COMPILE & KTR_PROC & 0 CATR(KTR_PROC, "cpu_switch: new pmap=%p old pmap=%p" , %g1, %g2, %g3, 7, 8, 9) stx %i2, [%g1 + KTR_PARM1] From owner-p4-projects@FreeBSD.ORG Tue Mar 21 08:03:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 385C316A426; Tue, 21 Mar 2006 08:03:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 10BAF16A401 for ; Tue, 21 Mar 2006 08:03:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7988843D55 for ; Tue, 21 Mar 2006 08:03:43 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L83hah014529 for ; Tue, 21 Mar 2006 08:03:43 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L83hJQ014524 for perforce@freebsd.org; Tue, 21 Mar 2006 08:03:43 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 08:03:43 GMT Message-Id: <200603210803.k2L83hJQ014524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93697 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 08:03:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=93697 Change 93697 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 08:02:40 convert tl2 register spill / fill exception handlers over to use physical addresses Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#9 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#9 (text+ko) ==== @@ -35,20 +35,13 @@ ENTRY(fault_64bit_sn1) /* XXX need to use physical addresses here */ - GET_PCB(%g6) -! MAGIC_TRAP_ON - stx %sp, [%g6 + PCB_RWSP] - SPILL(stx, %g6 + PCB_RW, 8) -#ifdef PMAP_DEBUG - ldx [%g6 + PCB_NSAVED], %g5 - brz %g5, 1f - nop - MAGIC_TRAP_ON - MAGIC_EXIT -1: -#endif - mov 1, %g5 - stx %g5, [%g6 + PCB_NSAVED] + GET_PCB_PHYS(%g5, %g6) + wr %g0, ASI_REAL, %asi + stxa %sp, [%g6 + PCB_RWSP]%asi + add %g6, PCB_RW, %g5 + SAVE_WINDOW_ASI(%g5) + mov 1, %g5 + stxa %g5, [%g6 + PCB_NSAVED]%asi saved set tl0_trap, %g5 wrpr %g5, %tnpc @@ -61,12 +54,13 @@ END(fault_32bit_sk) ENTRY(fault_64bit_sk) - GET_PCPU_SCRATCH - stx %sp, [PCPU_REG + PC_KWBUF_SP] + GET_PCPU_PHYS_SCRATCH(%g5) + wr %g0, ASI_REAL, %asi + stxa %sp, [PCPU_REG + PC_KWBUF_SP]%asi add PCPU_REG, PC_KWBUF, %g6 - SAVE_WINDOW(%g6) + SAVE_WINDOW_ASI(%g6) mov 1, %g6 - st %g6, [PCPU_REG + PC_KWBUF_FULL] + sta %g6, [PCPU_REG + PC_KWBUF_FULL]%asi saved retry END(fault_64bit_sk) @@ -74,7 +68,6 @@ ENTRY(fault_64bit_so0) GET_PCB(%g6) -! MAGIC_TRAP_ON ldx [%g6 + PCB_NSAVED], %g2 add %g2, 1, %g3 stx %g3, [%g6 + PCB_NSAVED] @@ -91,25 +84,25 @@ END(fault_64bit_so0) ENTRY(fault_64bit_so1) - /* XXX need to use physical addresses */ -! MAGIC_TRAP_ON - GET_PCB(%g6) - ldx [%g6 + PCB_NSAVED], %g2 + GET_PCB_PHYS(%g5, %g6) + wr %g0, ASI_REAL, %asi + ldxa [%g6 + PCB_NSAVED]%asi, %g2 add %g2, 1, %g3 - stx %g3, [%g6 + PCB_NSAVED] + stxa %g3, [%g6 + PCB_NSAVED]%asi sll %g2, PTR_SHIFT, %g4 add %g6, PCB_RWSP, %g3 - stx %sp, [%g3 + %g4] + add %g3, %g4, %g4 + stxa %sp, [%g4]%asi + sll %g2, RW_SHIFT, %g4 ! offset add %g6, PCB_RW, %g3 ! start of wbuf area add %g3, %g4, %g3 ! offset into wbuf area - SAVE_WINDOW(%g3) + SAVE_WINDOW_ASI(%g3) saved set tl0_trap, %g5 wrpr %g5, %tnpc - MAGIC_TRAP_OFF done END(fault_64bit_so1) From owner-p4-projects@FreeBSD.ORG Tue Mar 21 08:04:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C4A016A434; Tue, 21 Mar 2006 08:04:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CBBF16A432 for ; Tue, 21 Mar 2006 08:04:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A3A343D45 for ; Tue, 21 Mar 2006 08:04:45 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2L84ili014587 for ; Tue, 21 Mar 2006 08:04:44 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2L84itB014584 for perforce@freebsd.org; Tue, 21 Mar 2006 08:04:44 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 08:04:44 GMT Message-Id: <200603210804.k2L84itB014584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93698 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 08:04:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=93698 Change 93698 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 08:03:42 update pcb_ra before pcb is used Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#6 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vm_machdep.c#6 (text+ko) ==== @@ -135,9 +135,11 @@ pcb = (struct pcb *)((td->td_kstack + td->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x3fUL); + pcb->pcb_ra = vtophys((vm_offset_t)pcb); pcb->pcb_nsaved = 0; td->td_frame = (struct trapframe *)pcb - 1; td->td_pcb = pcb; + } void @@ -296,6 +298,7 @@ fp->fr_pc = fp->fr_fp = 0; pcb2->pcb_sp = (u_long)fp - SPOFF; pcb2->pcb_pc = (u_long)fork_trampoline - 8; + pcb2->pcb_ra = vtophys((vm_offset_t)pcb2); /* Setup to release sched_lock in fork_exit(). */ td2->td_md.md_spinlock_count = 1; td2->td_md.md_saved_pil = 0; From owner-p4-projects@FreeBSD.ORG Tue Mar 21 15:26:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622D416A422; Tue, 21 Mar 2006 15:26:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0374916A401 for ; Tue, 21 Mar 2006 15:26:53 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F109C43D73 for ; Tue, 21 Mar 2006 15:26:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LFQoiK054175 for ; Tue, 21 Mar 2006 15:26:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LFQoc2054172 for perforce@freebsd.org; Tue, 21 Mar 2006 15:26:50 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Mar 2006 15:26:50 GMT Message-Id: <200603211526.k2LFQoc2054172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93714 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 15:26:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93714 Change 93714 by jhb@jhb_slimer on 2006/03/21 15:25:50 Fix a possible problem with alpha pmap. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#77 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#77 (text+ko) ==== @@ -617,12 +617,14 @@ vm_offset_t va = ((struct pmap_invalidate_page_arg *) arg)->va; #endif + critical_enter(); if (pmap->pm_active & PCPU_GET(cpumask)) { ALPHA_TBIS(va); alpha_pal_imb(); /* XXX overkill? */ } else { pmap_invalidate_asn(pmap); } + critical_exit(); } static void @@ -638,11 +640,13 @@ pmap_t pmap = (pmap_t) arg; #endif + critical_enter(); if (pmap->pm_active & PCPU_GET(cpumask)) { ALPHA_TBIA(); alpha_pal_imb(); /* XXX overkill? */ } else pmap_invalidate_asn(pmap); + critical_exit(); } static void From owner-p4-projects@FreeBSD.ORG Tue Mar 21 15:44:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E00616A423; Tue, 21 Mar 2006 15:44:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 124C716A400 for ; Tue, 21 Mar 2006 15:44:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D0E543D5F for ; Tue, 21 Mar 2006 15:44:13 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LFiCU0055909 for ; Tue, 21 Mar 2006 15:44:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LFiC9F055906 for perforce@freebsd.org; Tue, 21 Mar 2006 15:44:12 GMT (envelope-from millert@freebsd.org) Date: Tue, 21 Mar 2006 15:44:12 GMT Message-Id: <200603211544.k2LFiC9F055906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 15:44:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=93716 Change 93716 by millert@millert_p3 on 2006/03/21 15:43:43 This is linux code so use printk for consistency. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/avc/avc.c#9 (text+ko) ==== @@ -614,11 +614,11 @@ !VOP_GETATTR(vp, &va, curthread->td_ucred, curthread)) { - printf(" inode=%ld, mountpoint=%s, ", + printk(" inode=%ld, mountpoint=%s, ", va.va_fileid, vp->v_mount->mnt_stat.f_mntonname); } else { - printf(" fs/inode info not available"); + printk(" fs/inode info not available"); } } break; From owner-p4-projects@FreeBSD.ORG Tue Mar 21 18:50:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E146D16A420; Tue, 21 Mar 2006 18:50:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5815A16A401 for ; Tue, 21 Mar 2006 18:50:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7AD743D49 for ; Tue, 21 Mar 2006 18:50:03 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LIo3FY073185 for ; Tue, 21 Mar 2006 18:50:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LIo3pg073182 for perforce@freebsd.org; Tue, 21 Mar 2006 18:50:03 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Mar 2006 18:50:03 GMT Message-Id: <200603211850.k2LIo3pg073182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93724 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 18:50:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=93724 Change 93724 by jhb@jhb_slimer on 2006/03/21 18:49:19 Use VFS locking for Giant in coredump(). Actually avoids a Giant leak for coredumps to a non-MPSAFE filesystem. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sig.c#121 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sig.c#121 (text+ko) ==== @@ -3065,6 +3065,7 @@ struct mount *mp; char *name; /* name of corefile */ off_t limit; + int vfslocked; PROC_LOCK_ASSERT(p, MA_OWNED); MPASS((p->p_flag & P_HADTHREADS) == 0 || p->p_singlethread == td); @@ -3088,21 +3089,17 @@ if (limit == 0) return (EFBIG); - mtx_lock(&Giant); restart: name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid); - if (name == NULL) { - mtx_unlock(&Giant); + if (name == NULL) return (EINVAL); - } - NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, name, td); /* XXXKSE */ + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, name, td); flags = O_CREAT | FWRITE | O_NOFOLLOW; error = vn_open(&nd, &flags, S_IRUSR | S_IWUSR, -1); free(name, M_TEMP); - if (error) { - mtx_unlock(&Giant); + if (error) return (error); - } + vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; @@ -3111,7 +3108,7 @@ VOP_GETATTR(vp, &vattr, cred, td) || vattr.va_nlink != 1) { VOP_UNLOCK(vp, 0, td); error = EFAULT; - goto out; + goto close; } VOP_UNLOCK(vp, 0, td); @@ -3126,9 +3123,10 @@ if (locked) VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK); if ((error = vn_close(vp, FWRITE, cred, td)) != 0) - return (error); + goto out; if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) - return (error); + goto out; + VFS_UNLOCK_GIANT(vfslocked); goto restart; } @@ -3153,11 +3151,12 @@ VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK); } vn_finished_write(mp); -out: +close: error1 = vn_close(vp, FWRITE, cred, td); - mtx_unlock(&Giant); if (error == 0) error = error1; +out: + VFS_UNLOCK_GIANT(vfslocked); return (error); } From owner-p4-projects@FreeBSD.ORG Tue Mar 21 19:03:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D911116A448; Tue, 21 Mar 2006 19:03:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6502616A427 for ; Tue, 21 Mar 2006 19:03:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0CF843D76 for ; Tue, 21 Mar 2006 19:03:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LJ3KYf073752 for ; Tue, 21 Mar 2006 19:03:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LJ3K5x073749 for perforce@freebsd.org; Tue, 21 Mar 2006 19:03:20 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Mar 2006 19:03:20 GMT Message-Id: <200603211903.k2LJ3K5x073749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 19:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=93725 Change 93725 by jhb@jhb_slimer on 2006/03/21 19:02:21 Change vn_open() to honor MPSAFE flag in nameidata rather than using fdidx != -1. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sig.c#122 edit .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#101 edit .. //depot/projects/smpng/sys/kern/vfs_vnops.c#68 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sig.c#122 (text+ko) ==== @@ -3093,7 +3093,7 @@ name = expand_name(p->p_comm, td->td_ucred->cr_uid, p->p_pid); if (name == NULL) return (EINVAL); - NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, name, td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, name, td); flags = O_CREAT | FWRITE | O_NOFOLLOW; error = vn_open(&nd, &flags, S_IRUSR | S_IWUSR, -1); free(name, M_TEMP); ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#101 (text+ko) ==== @@ -1005,7 +1005,7 @@ /* An extra reference on `nfp' has been held for us by falloc(). */ fp = nfp; cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT; - NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1, pathseg, path, td); + NDINIT(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg, path, td); td->td_dupfd = -1; /* XXX check for fdopen */ error = vn_open(&nd, &flags, cmode, indx); if (error) { ==== //depot/projects/smpng/sys/kern/vfs_vnops.c#68 (text+ko) ==== @@ -111,8 +111,9 @@ struct vattr vat; struct vattr *vap = &vat; int mode, fmode, error; - int vfslocked; + int vfslocked, mpsafe; + mpsafe = ndp->ni_cnd.cn_flags & MPSAFE; restart: vfslocked = 0; fmode = *flagp; @@ -125,8 +126,9 @@ bwillwrite(); if ((error = namei(ndp)) != 0) return (error); - vfslocked = (ndp->ni_cnd.cn_flags & GIANTHELD) != 0; - ndp->ni_cnd.cn_flags &= ~MPSAFE; + vfslocked = NDHASGIANT(ndp); + if (!mpsafe) + ndp->ni_cnd.cn_flags &= ~MPSAFE; if (ndp->ni_vp == NULL) { VATTR_NULL(vap); vap->va_type = VREG; @@ -182,8 +184,9 @@ LOCKSHARED | LOCKLEAF | MPSAFE | AUDITVNODE1; if ((error = namei(ndp)) != 0) return (error); - ndp->ni_cnd.cn_flags &= ~MPSAFE; - vfslocked = (ndp->ni_cnd.cn_flags & GIANTHELD) != 0; + if (!mpsafe) + ndp->ni_cnd.cn_flags &= ~MPSAFE; + vfslocked = NDHASGIANT(ndp); vp = ndp->ni_vp; } if (vp->v_type == VLNK) { @@ -230,7 +233,7 @@ vp->v_writecount++; *flagp = fmode; ASSERT_VOP_LOCKED(vp, "vn_open_cred"); - if (fdidx == -1) + if (!mpsafe) VFS_UNLOCK_GIANT(vfslocked); return (0); bad: From owner-p4-projects@FreeBSD.ORG Tue Mar 21 20:49:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 279B916A420; Tue, 21 Mar 2006 20:49:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F175516A401 for ; Tue, 21 Mar 2006 20:49:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4A1943D53 for ; Tue, 21 Mar 2006 20:49:41 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LKnfkO086054 for ; Tue, 21 Mar 2006 20:49:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LKnfGL086051 for perforce@freebsd.org; Tue, 21 Mar 2006 20:49:41 GMT (envelope-from millert@freebsd.org) Date: Tue, 21 Mar 2006 20:49:41 GMT Message-Id: <200603212049.k2LKnfGL086051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 20:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=93741 Change 93741 by millert@millert_p3 on 2006/03/21 20:48:41 Fix mis-merge Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#23 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_descrip.c#23 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_compat.h" #include "opt_ddb.h" +#include "opt_mac.h" #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Mar 21 20:55:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C3CC16A427; Tue, 21 Mar 2006 20:55:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAACA16A400 for ; Tue, 21 Mar 2006 20:55:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89F0D43D48 for ; Tue, 21 Mar 2006 20:55:49 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LKtn1Q086491 for ; Tue, 21 Mar 2006 20:55:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LKtnkk086488 for perforce@freebsd.org; Tue, 21 Mar 2006 20:55:49 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 20:55:49 GMT Message-Id: <200603212055.k2LKtnkk086488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93742 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 20:55:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=93742 Change 93742 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 20:55:25 fault in more spill/fill exception handlers as they get executed for the first time Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#10 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/wbuf.S#10 (text+ko) ==== @@ -29,8 +29,24 @@ END(fault_32bit_so1) ENTRY(fault_64bit_sn0) - MAGIC_TRAP_ON - MAGIC_EXIT + MAGIC_TRAP_ON + GET_PCB(%g4) + stx %sp, [%g4 + PCB_RWSP] + add %g4, PCB_RW, %g3 + SAVE_WINDOW(%g3) + mov 1, %g3 + stx %g3, [%g4 + PCB_NSAVED] + set trap, %g1 + mov %g5, %g2 + mov %g6, %g3 + sub %g0, 1, %g4 + + + rdpr %tstate, %g5 + and %g5, TSTATE_CWP_MASK, %g5 + MAGIC_TRAP_OFF + ba,pt %xcc, tl0_utrap + wrpr %g0, %g5, %cwp END(fault_64bit_sn0) ENTRY(fault_64bit_sn1) @@ -86,20 +102,19 @@ ENTRY(fault_64bit_so1) GET_PCB_PHYS(%g5, %g6) wr %g0, ASI_REAL, %asi - ldxa [%g6 + PCB_NSAVED]%asi, %g2 - add %g2, 1, %g3 - stxa %g3, [%g6 + PCB_NSAVED]%asi + ldxa [%g6 + PCB_NSAVED]%asi, %g5 + add %g5, 1, %g7 + stxa %g7, [%g6 + PCB_NSAVED]%asi - sll %g2, PTR_SHIFT, %g4 - add %g6, PCB_RWSP, %g3 - add %g3, %g4, %g4 - stxa %sp, [%g4]%asi + sll %g5, PTR_SHIFT, %g7 + add %g6, %g7, %g7 + stxa %sp, [%g7 + PCB_RWSP]%asi - sll %g2, RW_SHIFT, %g4 ! offset - add %g6, PCB_RW, %g3 ! start of wbuf area - add %g3, %g4, %g3 ! offset into wbuf area + sll %g5, RW_SHIFT, %g7 ! offset + add %g6, %g7, %g7 ! pcb + offset + add %g7, PCB_RW, %g7 ! offset into wbuf area - SAVE_WINDOW_ASI(%g3) + SAVE_WINDOW_ASI(%g7) saved set tl0_trap, %g5 wrpr %g5, %tnpc @@ -127,7 +142,6 @@ ! wrpr %g0, 1, %tl set TSTATE_KERNEL | TSTATE_IE, %g1 - GET_PCPU_SCRATCH wrpr %g0, %g1, %tstate set user_rtt, %g1 wrpr %g0, %g1, %tpc @@ -135,12 +149,9 @@ wrpr %g0, %g1, %tnpc set trap, %g1 - mov T_DATA_MISS, %g2 ! XXX is this always true? + mov %g5, %g2 mov %g6, %g3 - cmp %g5, T_ALIGNMENT - bne %icc, 1f - nop -1: + sub %g0, 1, %g4 rdpr %wstate, %l1 sllx %l1, WSTATE_SHIFT, %l1 @@ -159,8 +170,9 @@ END(fault_64bit_fn0) ENTRY(fault_64bit_fn1) - MAGIC_TRAP_ON - MAGIC_EXIT + wrpr %g0, 1, %gl + b fault_fn1_common + nop END(fault_64bit_fn1) ENTRY(fault_rtt_fn1) From owner-p4-projects@FreeBSD.ORG Tue Mar 21 20:56:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A20716A475; Tue, 21 Mar 2006 20:56:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FC8716A431 for ; Tue, 21 Mar 2006 20:56:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70EE343D60 for ; Tue, 21 Mar 2006 20:56:51 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LKupsB086592 for ; Tue, 21 Mar 2006 20:56:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LKupfd086589 for perforce@freebsd.org; Tue, 21 Mar 2006 20:56:51 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 21 Mar 2006 20:56:51 GMT Message-Id: <200603212056.k2LKupfd086589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93743 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 20:56:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=93743 Change 93743 by kmacy@kmacy_storage:sun4vtmp on 2006/03/21 20:55:52 be more careful about setting %g4 pil Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#37 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#37 (text+ko) ==== @@ -212,7 +212,7 @@ .macro tl0_setup type clr %g3 - mov 0, %g4 + sub %g0, 1, %g4 set trap, %g1 ba %xcc, tl0_trap mov \type, %g2 @@ -539,7 +539,6 @@ .endm .macro tl1_pil_entry level, mask - tl0_split set \mask, %g2 ba %xcc, tl0_intr mov \level, %g1 @@ -577,7 +576,7 @@ .macro tl0_syscall clr %g3 - mov 0, %g4 + sub %g0, 1, %g4 set syscall, %g1 ba %xcc, tl0_trap mov T_SYSCALL, %g2 @@ -1350,12 +1349,6 @@ ! %g4 == fault type %g5 == fault addr %g6 == tag ! XXX only handle normal miss for now (look at fault type in the future) #ifdef PMAP_DEBUG - cmp %g5, %g0 ! NULL ptr deref - bne,pt %xcc, 12f - nop -tsb_miss_null_deref: - MAGIC_TRAP_ON;MAGIC_TRAP_ON;MAGIC_EXIT ! give up -12: cmp %g3, T_INSTRUCTION_MISS bne,pn %xcc, 17f nop @@ -1552,7 +1545,7 @@ sethi %hi(trap), %g1 mov T_DATA_PROTECTION, %g2 mov %g6, %g3 - mov -1, %g4 + sub %g0, 1, %g4 ba %xcc, tl0_trap or %g1, %lo(trap), %g1 END(prot_fault_trap) From owner-p4-projects@FreeBSD.ORG Tue Mar 21 22:05:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B415216A41F; Tue, 21 Mar 2006 22:05:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C31016A422 for ; Tue, 21 Mar 2006 22:05:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FD6B43D75 for ; Tue, 21 Mar 2006 22:05:55 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LM5tOh089729 for ; Tue, 21 Mar 2006 22:05:55 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LM5qe3089726 for perforce@freebsd.org; Tue, 21 Mar 2006 22:05:52 GMT (envelope-from peter@freebsd.org) Date: Tue, 21 Mar 2006 22:05:52 GMT Message-Id: <200603212205.k2LM5qe3089726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 93753 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 22:05:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=93753 Change 93753 by peter@peter_melody on 2006/03/21 22:05:39 IFC @93746 Affected files ... .. //depot/projects/hammer/Makefile#38 integrate .. //depot/projects/hammer/Makefile.inc1#114 integrate .. //depot/projects/hammer/UPDATING#93 integrate .. //depot/projects/hammer/bin/Makefile#5 integrate .. //depot/projects/hammer/bin/Makefile.inc#9 integrate .. //depot/projects/hammer/bin/csh/Makefile#10 integrate .. //depot/projects/hammer/bin/ed/Makefile#10 integrate .. //depot/projects/hammer/contrib/bind9/FREEBSD-Upgrade#8 integrate .. //depot/projects/hammer/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/hammer/contrib/pf/pflogd/pflogd.c#8 integrate .. //depot/projects/hammer/contrib/tcsh/FREEBSD-Xlist#3 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#10 integrate .. //depot/projects/hammer/etc/Makefile#49 integrate .. //depot/projects/hammer/etc/devd.conf#26 integrate .. //depot/projects/hammer/etc/hosts.allow#5 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#39 integrate .. //depot/projects/hammer/etc/mtree/Makefile#5 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#47 integrate .. //depot/projects/hammer/etc/rc.d/kernel#1 branch .. //depot/projects/hammer/etc/rc.d/nsswitch#5 integrate .. //depot/projects/hammer/etc/rc.d/syscons#9 integrate .. //depot/projects/hammer/games/factor/Makefile#8 integrate .. //depot/projects/hammer/gnu/lib/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libdialog/Makefile#9 integrate .. //depot/projects/hammer/gnu/lib/libg2c/Makefile#9 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#13 integrate .. //depot/projects/hammer/gnu/lib/libgcov/Makefile#4 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#15 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#14 integrate .. //depot/projects/hammer/gnu/usr.bin/bc/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile#5 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#20 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#13 integrate .. //depot/projects/hammer/gnu/usr.bin/dialog/Makefile#4 integrate .. //depot/projects/hammer/include/Makefile#55 integrate .. //depot/projects/hammer/include/arpa/inet.h#3 integrate .. //depot/projects/hammer/include/arpa/nameser.h#3 integrate .. //depot/projects/hammer/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/hammer/include/netdb.h#15 integrate .. //depot/projects/hammer/include/resolv.h#9 integrate .. //depot/projects/hammer/kerberos5/Makefile#7 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#7 integrate .. //depot/projects/hammer/lib/Makefile#57 integrate .. //depot/projects/hammer/lib/bind/bind/Makefile#5 integrate .. //depot/projects/hammer/lib/bind/bind9/Makefile#5 integrate .. //depot/projects/hammer/lib/bind/config.mk#8 integrate .. //depot/projects/hammer/lib/bind/dns/Makefile#6 integrate .. //depot/projects/hammer/lib/bind/isc/Makefile#6 integrate .. //depot/projects/hammer/lib/bind/isccc/Makefile#5 integrate .. //depot/projects/hammer/lib/bind/isccfg/Makefile#5 integrate .. //depot/projects/hammer/lib/bind/lwres/Makefile#6 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#33 integrate .. //depot/projects/hammer/lib/libarchive/archive.h.in#11 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#23 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#16 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_cpio.c#15 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#26 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#26 integrate .. //depot/projects/hammer/lib/libarchive/tar.5#12 integrate .. //depot/projects/hammer/lib/libc/Makefile#24 integrate .. //depot/projects/hammer/lib/libc/alpha/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/amd64/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/ia64/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/include/isc/eventlib.h#1 branch .. //depot/projects/hammer/lib/libc/include/port_after.h#1 branch .. //depot/projects/hammer/lib/libc/include/port_before.h#1 branch .. //depot/projects/hammer/lib/libc/include/resolv_mt.h#1 branch .. //depot/projects/hammer/lib/libc/inet/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/inet/Symbol.map#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_addr.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_cidr_pton.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_lnaof.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_makeaddr.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_net_ntop.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_net_pton.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_neta.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_netof.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_network.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_ntoa.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_ntop.c#1 branch .. //depot/projects/hammer/lib/libc/inet/inet_pton.c#1 branch .. //depot/projects/hammer/lib/libc/inet/nsap_addr.c#1 branch .. //depot/projects/hammer/lib/libc/isc/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/isc/ev_streams.c#1 branch .. //depot/projects/hammer/lib/libc/isc/ev_timers.c#1 branch .. //depot/projects/hammer/lib/libc/isc/eventlib_p.h#1 branch .. //depot/projects/hammer/lib/libc/nameser/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/nameser/Symbol.map#1 branch .. //depot/projects/hammer/lib/libc/nameser/ns_name.c#1 branch .. //depot/projects/hammer/lib/libc/nameser/ns_netint.c#1 branch .. //depot/projects/hammer/lib/libc/nameser/ns_parse.c#1 branch .. //depot/projects/hammer/lib/libc/nameser/ns_print.c#1 branch .. //depot/projects/hammer/lib/libc/nameser/ns_samedomain.c#1 branch .. //depot/projects/hammer/lib/libc/nameser/ns_ttl.c#1 branch .. //depot/projects/hammer/lib/libc/net/Makefile.inc#14 integrate .. //depot/projects/hammer/lib/libc/net/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#26 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#12 integrate .. //depot/projects/hammer/lib/libc/net/gethostbyht.c#4 integrate .. //depot/projects/hammer/lib/libc/net/gethostbynis.c#6 integrate .. //depot/projects/hammer/lib/libc/net/gethostnamadr.c#5 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#8 integrate .. //depot/projects/hammer/lib/libc/net/getnetbyht.c#6 integrate .. //depot/projects/hammer/lib/libc/net/getnetbynis.c#5 integrate .. //depot/projects/hammer/lib/libc/net/herror.c#3 delete .. //depot/projects/hammer/lib/libc/net/inet_addr.c#2 delete .. //depot/projects/hammer/lib/libc/net/inet_lnaof.c#2 delete .. //depot/projects/hammer/lib/libc/net/inet_makeaddr.c#2 delete .. //depot/projects/hammer/lib/libc/net/inet_net_ntop.c#3 delete .. //depot/projects/hammer/lib/libc/net/inet_net_pton.c#4 delete .. //depot/projects/hammer/lib/libc/net/inet_neta.c#3 delete .. //depot/projects/hammer/lib/libc/net/inet_netof.c#2 delete .. //depot/projects/hammer/lib/libc/net/inet_network.c#2 delete .. //depot/projects/hammer/lib/libc/net/inet_ntoa.c#2 delete .. //depot/projects/hammer/lib/libc/net/inet_ntop.c#3 delete .. //depot/projects/hammer/lib/libc/net/inet_pton.c#4 delete .. //depot/projects/hammer/lib/libc/net/name6.c#20 integrate .. //depot/projects/hammer/lib/libc/net/netdb_private.h#5 integrate .. //depot/projects/hammer/lib/libc/net/ns_name.c#3 delete .. //depot/projects/hammer/lib/libc/net/ns_netint.c#2 delete .. //depot/projects/hammer/lib/libc/net/ns_parse.c#2 delete .. //depot/projects/hammer/lib/libc/net/ns_print.c#2 delete .. //depot/projects/hammer/lib/libc/net/ns_ttl.c#3 delete .. //depot/projects/hammer/lib/libc/net/nsap_addr.c#2 delete .. //depot/projects/hammer/lib/libc/net/res_comp.c#4 delete .. //depot/projects/hammer/lib/libc/net/res_config.h#2 integrate .. //depot/projects/hammer/lib/libc/net/res_data.c#2 delete .. //depot/projects/hammer/lib/libc/net/res_debug.c#4 delete .. //depot/projects/hammer/lib/libc/net/res_init.c#6 delete .. //depot/projects/hammer/lib/libc/net/res_mkquery.c#3 delete .. //depot/projects/hammer/lib/libc/net/res_mkupdate.c#4 integrate .. //depot/projects/hammer/lib/libc/net/res_query.c#7 delete .. //depot/projects/hammer/lib/libc/net/res_send.c#8 delete .. //depot/projects/hammer/lib/libc/net/res_send_private.h#2 delete .. //depot/projects/hammer/lib/libc/net/res_update.c#3 integrate .. //depot/projects/hammer/lib/libc/net/res_update.h#1 branch .. //depot/projects/hammer/lib/libc/resolv/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/resolv/Symbol.map#1 branch .. //depot/projects/hammer/lib/libc/resolv/h_errno.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/herror.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/mtctxres.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_comp.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_data.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_debug.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_debug.h#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_init.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_mkquery.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_private.h#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_query.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_send.c#1 branch .. //depot/projects/hammer/lib/libc/resolv/res_state.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.3#9 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#24 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtonum.3#2 integrate .. //depot/projects/hammer/lib/libc_r/Makefile#12 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#9 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#13 integrate .. //depot/projects/hammer/lib/libgpib/Makefile#4 integrate .. //depot/projects/hammer/lib/libio/Makefile#4 integrate .. //depot/projects/hammer/lib/libipsec/Makefile#8 integrate .. //depot/projects/hammer/lib/libmilter/Makefile#5 integrate .. //depot/projects/hammer/lib/libncp/Makefile#7 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#18 integrate .. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libpam/modules/modules.inc#11 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/Makefile#4 integrate .. //depot/projects/hammer/lib/libpcap/Makefile#9 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#6 integrate .. //depot/projects/hammer/lib/libpmc/pmc.3#9 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#20 integrate .. //depot/projects/hammer/lib/libradius/Makefile#11 integrate .. //depot/projects/hammer/lib/librpcsvc/Makefile#9 integrate .. //depot/projects/hammer/lib/librt/Makefile#2 integrate .. //depot/projects/hammer/lib/libsm/Makefile#9 integrate .. //depot/projects/hammer/lib/libsmb/Makefile#9 integrate .. //depot/projects/hammer/lib/libtelnet/Makefile#7 integrate .. //depot/projects/hammer/lib/libthr/Makefile#16 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#21 integrate .. //depot/projects/hammer/lib/libwrap/Makefile#10 integrate .. //depot/projects/hammer/libexec/Makefile#31 integrate .. //depot/projects/hammer/libexec/ftpd/Makefile#7 integrate .. //depot/projects/hammer/libexec/lukemftpd/Makefile#11 integrate .. //depot/projects/hammer/libexec/tcpd/Makefile#6 integrate .. //depot/projects/hammer/libexec/telnetd/Makefile#7 integrate .. //depot/projects/hammer/release/Makefile#84 integrate .. //depot/projects/hammer/release/picobsd/bridge/crunch.conf#7 integrate .. //depot/projects/hammer/release/picobsd/tinyware/login/Makefile#5 integrate .. //depot/projects/hammer/release/scripts/kernels-install.sh#2 integrate .. //depot/projects/hammer/release/scripts/package-split.py#7 integrate .. //depot/projects/hammer/rescue/librescue/Makefile#7 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#28 integrate .. //depot/projects/hammer/sbin/Makefile#40 integrate .. //depot/projects/hammer/sbin/Makefile.inc#8 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#22 integrate .. //depot/projects/hammer/sbin/geom/class/Makefile#8 integrate .. //depot/projects/hammer/sbin/ggate/Makefile#3 integrate .. //depot/projects/hammer/sbin/ifconfig/Makefile#8 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#11 integrate .. //depot/projects/hammer/secure/Makefile#7 integrate .. //depot/projects/hammer/secure/Makefile.inc#5 integrate .. //depot/projects/hammer/secure/lib/Makefile#8 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#19 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#10 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#15 integrate .. //depot/projects/hammer/secure/libexec/Makefile#6 integrate .. //depot/projects/hammer/secure/usr.bin/Makefile#7 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#11 integrate .. //depot/projects/hammer/secure/usr.sbin/Makefile#2 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#14 integrate .. //depot/projects/hammer/share/Makefile#9 integrate .. //depot/projects/hammer/share/doc/Makefile#4 integrate .. //depot/projects/hammer/share/doc/smm/Makefile#3 integrate .. //depot/projects/hammer/share/examples/Makefile#11 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#46 integrate .. //depot/projects/hammer/share/examples/kld/syscall/test/Makefile#4 integrate .. //depot/projects/hammer/share/man/Makefile#5 integrate .. //depot/projects/hammer/share/man/man3/Makefile#15 integrate .. //depot/projects/hammer/share/man/man4/ata.4#25 integrate .. //depot/projects/hammer/share/man/man4/dcons.4#7 integrate .. //depot/projects/hammer/share/man/man4/gre.4#6 integrate .. //depot/projects/hammer/share/man/man4/ipw.4#10 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#12 integrate .. //depot/projects/hammer/share/man/man5/Makefile#18 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#44 integrate .. //depot/projects/hammer/share/man/man5/nsswitch.conf.5#7 integrate .. //depot/projects/hammer/share/man/man5/src.conf.5#1 branch .. //depot/projects/hammer/share/man/man7/build.7#14 integrate .. //depot/projects/hammer/share/man/man9/g_consumer.9#7 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#25 integrate .. //depot/projects/hammer/share/mk/Makefile#8 integrate .. //depot/projects/hammer/share/mk/bsd.README#10 integrate .. //depot/projects/hammer/share/mk/bsd.incs.mk#5 integrate .. //depot/projects/hammer/share/mk/bsd.info.mk#8 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#27 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#30 integrate .. //depot/projects/hammer/share/mk/bsd.nls.mk#5 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#8 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#17 integrate .. //depot/projects/hammer/share/mk/version_gen.awk#1 branch .. //depot/projects/hammer/sys/Makefile#11 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_dummy.c#5 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#15 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#15 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#15 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysvec.c#15 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#49 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#67 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#119 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#144 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#6 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#6 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#6 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#6 integrate .. //depot/projects/hammer/sys/arm/at91/at91.c#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/files.at91#2 integrate .. //depot/projects/hammer/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#2 integrate .. //depot/projects/hammer/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/hammer/sys/boot/Makefile#16 integrate .. //depot/projects/hammer/sys/boot/alpha/common/Makefile.common#6 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#13 integrate .. //depot/projects/hammer/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/pc98/loader/Makefile#11 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/Makefile#10 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#9 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#34 integrate .. //depot/projects/hammer/sys/compat/linux/linux_file.c#15 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#14 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#28 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#14 integrate .. //depot/projects/hammer/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#33 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#13 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#23 integrate .. //depot/projects/hammer/sys/compat/linux/linux_stats.c#25 integrate .. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#10 integrate .. //depot/projects/hammer/sys/conf/files#139 integrate .. //depot/projects/hammer/sys/conf/files.alpha#25 integrate .. //depot/projects/hammer/sys/conf/files.sparc64#36 integrate .. //depot/projects/hammer/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#19 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#66 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#8 integrate .. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#4 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#25 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#15 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#27 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#13 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#6 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#11 integrate .. //depot/projects/hammer/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#14 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#27 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#20 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#17 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#18 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#39 integrate .. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#17 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#35 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#30 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.h#11 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror_ctl.c#9 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#23 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.h#12 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3_ctl.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/io_apic.c#20 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#81 integrate .. //depot/projects/hammer/sys/i386/linux/linux.h#5 integrate .. //depot/projects/hammer/sys/i386/linux/linux_dummy.c#6 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#18 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#18 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#19 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#26 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#89 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#40 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#65 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#40 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#40 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#32 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#102 integrate .. //depot/projects/hammer/sys/modules/Makefile#97 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_video/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/ce/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/cp/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/dummynet/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/if_gif/Makefile#8 integrate .. //depot/projects/hammer/sys/modules/ipfilter/Makefile#9 integrate .. //depot/projects/hammer/sys/modules/ipfw/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/linux/Makefile#8 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#19 integrate .. //depot/projects/hammer/sys/modules/pf/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/pflog/Makefile#6 integrate .. //depot/projects/hammer/sys/net/if.c#62 integrate .. //depot/projects/hammer/sys/net/if_media.h#14 integrate .. //depot/projects/hammer/sys/net/if_tap.c#28 integrate .. //depot/projects/hammer/sys/net/route.h#15 integrate .. //depot/projects/hammer/sys/net/rtsock.c#30 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#24 integrate .. //depot/projects/hammer/sys/netatalk/ddp_pcb.c#7 integrate .. //depot/projects/hammer/sys/netatalk/ddp_usrreq.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#25 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#19 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#34 integrate .. //depot/projects/hammer/sys/netinet6/in6.h#14 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#22 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#14 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#9 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_mbuf.c#7 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#7 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#8 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#8 integrate .. //depot/projects/hammer/sys/netnatm/natm.c#18 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#35 integrate .. //depot/projects/hammer/sys/security/audit/audit.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit.h#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/hammer/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_private.h#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/hammer/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/hammer/sys/sys/event.h#14 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#52 integrate .. //depot/projects/hammer/sys/sys/md5.h#5 integrate .. //depot/projects/hammer/sys/sys/protosw.h#11 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#32 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#42 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#58 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#41 integrate .. //depot/projects/hammer/tools/build/options/WITHOUT_ACPI#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_ATM#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_AUDIT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_AUTHPF#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_DNSSEC#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_ETC#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_LIBS_LWRES#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_MTREE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_NAMED#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BIND_UTILS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BLUETOOTH#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_BOOT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_CALENDAR#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_CPP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_CRYPT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_CXX#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_DICT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_DYNAMICROOT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_EXAMPLES#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_FORTH#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_FORTRAN#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_FP_LIBC#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GAMES#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GCOV#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GDB#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GNU_SUPPORT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GPIB#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_GROFF#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_HTML#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_I4B#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_INET6#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_INET6_SUPPORT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_INFO#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_IPFILTER#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_IPX#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_IPX_SUPPORT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_KERBEROS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_KERBEROS_SUPPORT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LIB32#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LIBC_R#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LIBPTHREAD#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LIBTHR#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LOCALES#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_LPR#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_MAILWRAPPER#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_MAN#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NCP#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NETCAT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NIS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NLS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_NLS_CATALOGS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_OBJC#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_OPENSSH#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_OPENSSL#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PAM_SUPPORT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PCVT#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PF#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_PROFILE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_RCMDS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_RCS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_RESCUE#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_SENDMAIL#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_SETUID_LOGIN#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_SHAREDOCS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_SYSCONS#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_TCSH#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_TOOLCHAIN#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_USB#1 branch .. //depot/projects/hammer/tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL#1 branch .. //depot/projects/hammer/tools/build/options/WITH_BIND_LIBS#1 branch .. //depot/projects/hammer/tools/build/options/WITH_HESIOD#1 branch .. //depot/projects/hammer/tools/build/options/WITH_IDEA#1 branch .. //depot/projects/hammer/tools/build/options/makeman#1 branch .. //depot/projects/hammer/tools/lib32/README#3 delete .. //depot/projects/hammer/tools/regression/aio/aiotest/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/aio/kqueue/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/aio/kqueue/lio/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/hammer/tools/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/resolv/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/mlock/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netatalk/simple_send/simple_send.c#2 integrate .. //depot/projects/hammer/tools/regression/netinet/msocket/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/msocket_ifnet_remove/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/netinet/tcpfullwindowrst/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/netinet/udpconnectjail/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/sockets/listenclose/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/sockets/reconnect/Makefile#3 integrate .. //depot/projects/hammer/tools/regression/sockets/shutdown/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/sockets/sigpipe/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tls/libxx/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/tls/libyy/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/ath/athdebug/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/iwi/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/net80211/wlandebug/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/net80211/wlanwatch/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/netrate/juggle/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#28 integrate .. //depot/projects/hammer/tools/tools/umastat/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#48 integrate .. //depot/projects/hammer/usr.bin/basename/basename.1#4 integrate .. //depot/projects/hammer/usr.bin/chkey/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/chpass/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/fetch/Makefile#8 integrate .. //depot/projects/hammer/usr.bin/lex/lib/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/login/Makefile#6 integrate .. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.8#3 integrate .. //depot/projects/hammer/usr.bin/netstat/Makefile#11 integrate .. //depot/projects/hammer/usr.bin/newkey/Makefile#5 integrate .. //depot/projects/hammer/usr.bin/passwd/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/systat/systat.1#8 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#8 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#16 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#27 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#14 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#12 integrate .. //depot/projects/hammer/usr.bin/tar/getdate.y#4 integrate .. //depot/projects/hammer/usr.bin/tar/read.c#16 integrate .. //depot/projects/hammer/usr.bin/tar/tree.c#4 integrate .. //depot/projects/hammer/usr.bin/tar/util.c#9 integrate .. //depot/projects/hammer/usr.bin/tar/write.c#20 integrate .. //depot/projects/hammer/usr.bin/telnet/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/Makefile#73 integrate .. //depot/projects/hammer/usr.sbin/amd/Makefile.inc#7 integrate .. //depot/projects/hammer/usr.sbin/amd/amd/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/amd/include/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/client.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/hid.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bthidd/server.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.c#3 integrate .. //depot/projects/hammer/usr.sbin/bootparamd/bootparamd/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#29 integrate .. //depot/projects/hammer/usr.sbin/mailwrapper/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/ntp/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/ntp/Makefile.inc#8 integrate .. //depot/projects/hammer/usr.sbin/ntp/doc/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntp-keygen/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpd/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpdc/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/ntp/ntpq/Makefile#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile.inc#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/sign/sign.c#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/sign/x509.c#4 integrate .. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#5 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#11 integrate .. //depot/projects/hammer/usr.sbin/pppd/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/rpcbind/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#15 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/keymap.c#3 integrate .. //depot/projects/hammer/usr.sbin/tcpdchk/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/tcpdmatch/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#11 integrate .. //depot/projects/hammer/usr.sbin/vnconfig/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate Differences ... ==== //depot/projects/hammer/Makefile#38 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.326 2006/03/01 13:07:17 yar Exp $ +# $FreeBSD: src/Makefile,v 1.328 2006/03/18 14:30:23 ru Exp $ # # The user-driven targets are: # @@ -73,10 +73,11 @@ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ kernel-toolchain libraries lint maninstall \ - obj objlink regress rerelease tags toolchain update \ + obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 distribute32 install32 +TGTS+= ${SUBDIR_TARGETS} BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/hammer/Makefile.inc1#114 (text+ko) ==== @@ -1,21 +1,10 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.537 2006/03/09 12:55:02 keramida Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.543 2006/03/20 14:24:56 ru Exp $ # # Make command line options: -# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically -# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) -# -DNO_RESCUE do not build rescue binaries # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all -# -DNO_CRYPT will prevent building of crypt versions -# -DNO_MAN do not build the manual pages -# -DNO_NLS do not build Native Language Support files -# -DNO_PROFILE do not build profiled libraries -# -DNO_GAMES do not go into games subdir # -DNO_SHARE do not go into share subdir -# -DNO_INFO do not make or install info files -# -DNO_LIBC_R do not build libc_r. -# -DNO_FORTRAN do not build g77 and related libraries. # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel @@ -34,6 +23,8 @@ # /usr/share/mk. These include: # obj depend all install clean cleandepend cleanobj +.include + # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. @@ -46,18 +37,18 @@ # We must do etc last for install/distribute to work. # SUBDIR= share/info include lib libexec bin -.if !defined(NO_GAMES) +.if ${MK_GAMES} != "no" SUBDIR+=games .endif SUBDIR+=gnu -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 .endif -.if !defined(NO_RESCUE) +.if ${MK_RESCUE} != "no" SUBDIR+=rescue .endif SUBDIR+=sbin -.if !defined(NO_CRYPT) +.if ${MK_CRYPT} != "no" SUBDIR+=secure .endif .if !defined(NO_SHARE) @@ -88,8 +79,8 @@ CVS?= cvs CVSFLAGS?= -A -P -d -I! -SUP?= /usr/local/bin/cvsup -SUPFLAGS?= -g -L 2 -P - +SUP?= /usr/bin/csup +SUPFLAGS?= -g -L 2 .if defined(SUPHOST) SUPFLAGS+= -h ${SUPHOST} .endif @@ -186,8 +177,9 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \ - -DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS + -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ + -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -196,7 +188,8 @@ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage -XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB +XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage WMAKEENV= ${CROSSENV} \ @@ -241,7 +234,8 @@ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML + -DWITHOUT_BIND -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_INFO \ + -DWITHOUT_HTML LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS .endif @@ -318,7 +312,7 @@ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null ln -sf ${.CURDIR}/sys ${WORLDTMP} -.if defined(WITH_BIND_LIBS) && !defined(NO_BIND) +.if ${MK_BIND_LIBS} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \ -p ${WORLDTMP}/usr/include >/dev/null .endif @@ -375,8 +369,8 @@ @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ - ${WMAKE} -DNO_FSCHG -DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN \ - -DNO_NLS -DNO_PROFILE libraries + ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ + -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE libraries _depend: @echo @echo "--------------------------------------------------------------" @@ -405,7 +399,7 @@ -p ${LIB32TMP}/usr/include >/dev/null mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t} @@ -422,11 +416,11 @@ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} cd ${.CURDIR}/usr.bin/gcore; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} -.if !defined(NO_CRYPT) +.if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" cd ${.CURDIR}/kerberos5/lib; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t} .endif @@ -460,7 +454,7 @@ .endif cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} -.if !defined(NO_CRYPT) +.if ${MK_CRYPT} != "no" cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} @@ -478,7 +472,7 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything -.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) +.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" WMAKE_TGTS+= build32 .endif @@ -519,11 +513,11 @@ # CHECK_UIDS= CHECK_GIDS= audit -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" CHECK_UIDS+= smmsp CHECK_GIDS+= smmsp .endif -.if !defined(NO_PF) +.if ${MK_PF} != "no" CHECK_UIDS+= proxy CHECK_GIDS+= proxy authpf .endif @@ -579,7 +573,7 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) +.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif @@ -588,7 +582,7 @@ @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute -.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32) +.if ${TARGET_ARCH} == "amd64" && ${MK_LIB32} != "no" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 DISTRIBUTION=lib32 .endif @@ -794,11 +788,11 @@ # # bootstrap-tools: Build tools needed for compatibility # -.if !defined(NO_GAMES) +.if ${MK_GAMES} != "no" _strfile= games/fortune/strfile .endif -.if !defined(NO_CXX) +.if ${MK_CXX} != "no" _gperf= gnu/usr.bin/gperf .if ${BOOTSTRAPPING} < 700004 _groff= gnu/usr.bin/groff @@ -827,7 +821,7 @@ _mklocale= usr.bin/mklocale .endif -.if !defined(NO_RESCUE) && \ +.if ${MK_RESCUE} != "no" && \ ${BOOTSTRAPPING} < 600008 _crunchgen= usr.sbin/crunch/crunchgen .endif @@ -877,11 +871,11 @@ _share= share/syscons/scrnmaps .endif -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_KERBEROS} != "no" _kerberos5_tools= kerberos5/tools .endif -.if !defined(NO_RESCUE) +.if ${MK_RESCUE} != "no" _rescue= rescue/rescue .endif @@ -918,7 +912,7 @@ .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif -.if !defined(NO_RESCUE) || defined(RELEASEDIR) +.if ${MK_RESCUE} != "no" || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif .if ${TARGET_ARCH} == "alpha" @@ -981,7 +975,11 @@ _generic_libs= gnu/lib -.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) +.if ${MK_IPX} != "no" +_prebuild_libs+= lib/libipx +.endif + +.if ${MK_KERBEROS} != "no" _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libkrb5 _prebuild_libs+= kerberos5/lib/libroken @@ -989,7 +987,7 @@ .endif _prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ - lib/libipx lib/libkiconv lib/libkvm lib/libmd \ + lib/libkiconv lib/libkvm lib/libmd \ lib/libncurses lib/libnetgraph lib/libopie lib/libpam \ lib/libradius \ lib/libsbuf lib/libtacplus lib/libutil \ @@ -999,14 +997,14 @@ _generic_libs+= lib -.if !defined(NO_CRYPT) -.if !defined(NO_OPENSSL) +.if ${MK_CRYPT} != "no" +.if ${MK_OPENSSL} != "no" _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS} != "no" secure/lib/libssh__L: lib/libgssapi__L .endif .endif @@ -1014,17 +1012,17 @@ _generic_libs+= secure/lib .endif -.if defined(NO_CRYPT) || defined(NO_OPENSSL) +.if ${MK_OPENSSL} == "no" lib/libradius__L: lib/libmd__L .endif -.if !defined(NO_NIS) +.if ${MK_NIS} != "no" _prebuild_libs+= lib/libypclnt .endif _generic_libs+= usr.bin/lex/lib -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE} == "i386" _generic_libs+= usr.sbin/pcvt/keycap .endif @@ -1192,3 +1190,8 @@ .endif +# +# showconfig - show build configuration. +# +showconfig: + @${MAKE} -n -f bsd.own.mk -V dummy -dg1 | grep ^MK_ | sort ==== //depot/projects/hammer/UPDATING#93 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20060317: + Most world/kernel related NO_* build options changed names. + New knobs have common prefixes WITHOUT_*/WITH_* (modelled + after FreeBSD ports) and should be set in /etc/src.conf + (the src.conf(5) manpage is provided). Full backwards + compatibility is maintained for the time being though it's + highly recommended to start moving old options out of the + system-wide /etc/make.conf file into the new /etc/src.conf + while also properly renaming them. More conversions will + likely follow. Posting to current@: + + http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html + 20060305: The NETSMBCRYPTO kernel option has been retired because its functionality is always included in NETSMB and smbfs.ko now. @@ -530,4 +543,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.443 2006/03/10 18:40:31 imp Exp $ +$FreeBSD: src/UPDATING,v 1.444 2006/03/21 10:10:05 ru Exp $ ==== //depot/projects/hammer/bin/Makefile#5 (text+ko) ==== @@ -1,5 +1,7 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.25 2005/03/02 11:53:21 trhodes Exp $ +# $FreeBSD: src/bin/Makefile,v 1.26 2006/03/17 18:54:20 ru Exp $ + +.include SUBDIR= cat \ chflags \ @@ -37,15 +39,15 @@ sync \ test -.if !defined(NO_RCMDS) +.if ${MK_RCMDS} != "no" _rcp= rcp .endif -.if !defined(NO_SENDMAIL) +.if ${MK_SENDMAIL} != "no" _rmail= rmail .endif -.if !defined(NO_TCSH) +.if ${MK_TCSH} != "no" _csh= csh .endif ==== //depot/projects/hammer/bin/Makefile.inc#9 (text+ko) ==== @@ -1,9 +1,11 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile.inc,v 1.22 2004/12/21 09:59:40 ru Exp $ +# $FreeBSD: src/bin/Makefile.inc,v 1.23 2006/03/17 18:54:20 ru Exp $ + +.include BINDIR?= /bin WARNS?= 6 -.if defined(NO_DYNAMICROOT) +.if ${MK_DYNAMICROOT} == "no" NO_SHARED?= YES .endif ==== //depot/projects/hammer/bin/csh/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.38 2006/02/19 06:40:29 ume Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.40 2006/03/19 19:10:39 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -6,6 +6,8 @@ # # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile. +.include + TCSHDIR= ${.CURDIR}/../../contrib/tcsh .PATH: ${TCSHDIR} @@ -45,7 +47,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 21 22:18:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 101B516A425; Tue, 21 Mar 2006 22:18:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E463C16A423 for ; Tue, 21 Mar 2006 22:18:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B51A43D48 for ; Tue, 21 Mar 2006 22:18:11 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LMIB3i090262 for ; Tue, 21 Mar 2006 22:18:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LMIBGA090259 for perforce@freebsd.org; Tue, 21 Mar 2006 22:18:11 GMT (envelope-from millert@freebsd.org) Date: Tue, 21 Mar 2006 22:18:11 GMT Message-Id: <200603212218.k2LMIBGA090259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 22:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=93757 Change 93757 by millert@millert_p3 on 2006/03/21 22:17:29 Remove unused define and variable. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/init.c#5 (text+ko) ==== @@ -23,10 +23,6 @@ #include #include -#define POLICYDB_PATHPREFIX "/etc/security/sebsd/policy" - -char policyfile[MAXPATHLEN]; - int security_init(void) { int rc; From owner-p4-projects@FreeBSD.ORG Tue Mar 21 22:19:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B50E16A42F; Tue, 21 Mar 2006 22:19:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7F8916A400 for ; Tue, 21 Mar 2006 22:19:13 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BB5343D62 for ; Tue, 21 Mar 2006 22:19:13 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LMJDA8090298 for ; Tue, 21 Mar 2006 22:19:13 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LMJDfO090295 for perforce@freebsd.org; Tue, 21 Mar 2006 22:19:13 GMT (envelope-from peter@freebsd.org) Date: Tue, 21 Mar 2006 22:19:13 GMT Message-Id: <200603212219.k2LMJDfO090295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 93758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2006 22:19:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=93758 Change 93758 by peter@peter_melody on 2006/03/21 22:18:42 integrate i386_hammer branch. Mostly a NOP, except for a cosmetic convergence sync in machdep.c for debug regs. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#50 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#68 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#154 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#50 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#68 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#154 (text+ko) ==== @@ -1766,17 +1766,20 @@ if (dbregs->dr[0] >= VM_MAXUSER_ADDRESS) return (EINVAL); } - if (dbregs->dr[7] & 0x3<<2) { + + if (dbregs->dr[7] & (0x3<<2)) { /* dr1 is enabled */ if (dbregs->dr[1] >= VM_MAXUSER_ADDRESS) return (EINVAL); } - if (dbregs->dr[7] & 0x3<<4) { + + if (dbregs->dr[7] & (0x3<<4)) { /* dr2 is enabled */ if (dbregs->dr[2] >= VM_MAXUSER_ADDRESS) return (EINVAL); } - if (dbregs->dr[7] & 0x3<<6) { + + if (dbregs->dr[7] & (0x3<<6)) { /* dr3 is enabled */ if (dbregs->dr[3] >= VM_MAXUSER_ADDRESS) return (EINVAL); From owner-p4-projects@FreeBSD.ORG Wed Mar 22 01:43:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D28D16A422; Wed, 22 Mar 2006 01:43:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 53C6416A41F for ; Wed, 22 Mar 2006 01:43:30 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21C9F43D48 for ; Wed, 22 Mar 2006 01:43:30 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2M1hUQO008481 for ; Wed, 22 Mar 2006 01:43:30 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2M1hTiK008478 for perforce@freebsd.org; Wed, 22 Mar 2006 01:43:29 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 01:43:29 GMT Message-Id: <200603220143.k2M1hTiK008478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 01:43:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=93775 Change 93775 by cognet@cognet on 2006/03/22 01:42:57 Handle break interrupts (DBGU doesn't seem to support them). Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#12 (text+ko) ==== @@ -177,12 +177,16 @@ at91_usart_init(struct uart_bas *bas, int baudrate, int databits, int stopbits, int parity) { + int cr; + at91_usart_param(bas, baudrate, databits, stopbits, parity); /* Turn on rx and tx */ - uart_setreg(bas, USART_CR, USART_CR_RSTRX | USART_CR_RSTTX); + cr = USART_CR_RSTSTA | USART_CR_RSTRX | USART_CR_RSTTX; + uart_setreg(bas, USART_CR, cr); uart_setreg(bas, USART_CR, USART_CR_RXEN | USART_CR_TXEN); - uart_setreg(bas, USART_IER, USART_CSR_TXRDY | USART_CSR_RXRDY); + uart_setreg(bas, USART_IER, USART_CSR_TXRDY | USART_CSR_RXRDY | + USART_CSR_RXBRK); } /* @@ -362,6 +366,8 @@ ipend |= SER_INT_TXIDLE; if (csr & USART_CSR_RXRDY) ipend |= SER_INT_RXREADY; + if (csr & USART_CSR_RXBRK) + ipend |= SER_INT_BREAK; mtx_unlock_spin(&sc->sc_hwmtx); return (ipend); } From owner-p4-projects@FreeBSD.ORG Wed Mar 22 01:44:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7DE416A422; Wed, 22 Mar 2006 01:44:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86BB516A424 for ; Wed, 22 Mar 2006 01:44:35 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15D8243D69 for ; Wed, 22 Mar 2006 01:44:31 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2M1iVtl008502 for ; Wed, 22 Mar 2006 01:44:31 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2M1iVZu008499 for perforce@freebsd.org; Wed, 22 Mar 2006 01:44:31 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 01:44:31 GMT Message-Id: <200603220144.k2M1iVZu008499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 01:44:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=93776 Change 93776 by cognet@cognet on 2006/03/22 01:44:26 Make the KB920x bits aware on where the ELF trampoline puts the symtab and the strtab, to get more meaningful backtraces. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#17 (text+ko) ==== @@ -47,7 +47,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/arm/at91/kb920x_machdep.c,v 1.2 2006/03/18 01:43:54 imp Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -195,6 +195,10 @@ int i = 0; uint32_t fake_preload[35]; uint32_t memsize = 32 * 1024 * 1024; + vm_offset_t lastaddr; +#ifdef DDB + vm_offset_t zstart = 0, zend = 0; +#endif i = 0; @@ -215,6 +219,23 @@ fake_preload[i++] = MODINFO_SIZE; fake_preload[i++] = sizeof(uint32_t); fake_preload[i++] = (uint32_t)&end - KERNBASE; +#ifdef DDB + if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) { + fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM; + fake_preload[i++] = sizeof(vm_offset_t); + fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4); + fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM; + fake_preload[i++] = sizeof(vm_offset_t); + fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8); + lastaddr = *(uint32_t *)(KERNVIRTADDR + 8); + zend = lastaddr; + zstart = *(uint32_t *)(KERNVIRTADDR + 4); + ksym_start = zstart; + ksym_end = zend; + } else +#endif + lastaddr = (vm_offset_t)&end; + fake_preload[i++] = 0; fake_preload[i] = 0; preload_metadata = (void *)fake_preload; @@ -224,7 +245,7 @@ PCPU_SET(curthread, &thread0); #define KERNEL_TEXT_BASE (KERNBASE) - freemempos = ((vm_offset_t)&end + PAGE_MASK) & ~PAGE_MASK; + freemempos = (lastaddr + PAGE_MASK) & ~PAGE_MASK; /* Define a macro to simplify memory allocation */ #define valloc_pages(var, np) \ alloc_pages((var).pv_va, (np)); \ @@ -280,9 +301,9 @@ pmap_link_l2pt(l1pagetable, KERNBASE + i * 0x100000, &kernel_pt_table[KERNEL_PT_KERN + i]); pmap_map_chunk(l1pagetable, KERNBASE, KERNPHYSADDR, - (((uint32_t)(&end) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), + (((uint32_t)(lastaddr) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - afterkern = round_page(((vm_offset_t)&end + L1_S_SIZE) & ~(L1_S_SIZE + afterkern = round_page((lastaddr + L1_S_SIZE) & ~(L1_S_SIZE - 1)); for (i = 0; i < KERNEL_PT_AFKERNEL_NUM; i++) { pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000, From owner-p4-projects@FreeBSD.ORG Wed Mar 22 12:34:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3717B16A423; Wed, 22 Mar 2006 12:34:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D00D616A400 for ; Wed, 22 Mar 2006 12:34:47 +0000 (UTC) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7465343D45 for ; Wed, 22 Mar 2006 12:34:47 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MCYl77050528 for ; Wed, 22 Mar 2006 12:34:47 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MCYPFo050525 for perforce@freebsd.org; Wed, 22 Mar 2006 12:34:25 GMT (envelope-from gnn@neville-neil.com) Date: Wed, 22 Mar 2006 12:34:25 GMT Message-Id: <200603221234.k2MCYPFo050525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 93786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 12:34:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=93786 Change 93786 by gnn@gnn_devbox_fast_ipsec on 2006/03/22 12:34:04 Bring my working view up to date. Affected files ... .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_set_policy.3#2 integrate .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_strerror.3#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sbin/setkey/setkey.8#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/pcpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/osf1/osf1_misc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/tsc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/mptable.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/undefined.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_spiio.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/in_cksum.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_aau.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_dma.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/module.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/ia64/efi/start.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit_kevents.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/coda/coda.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.i386#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.alpha#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.amd64#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.i386#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.ia64#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.pc98#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.i386#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.pc98#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/COPYRIGHT#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/README#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_if.m#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_osdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.inc#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/if_pflog.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/ddb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpi_support/acpi_asus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pci_link.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_smbat.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr_linux.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amrreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-usb.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ce/ceddk.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ce/ceddk.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ce/if_ce.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ce/ng_ce.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ce/tau32-ddk.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ce/tau32-ddk.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cs/if_csvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/de/dc21040reg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/de/if_de.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/de/if_devar.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_novell.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_sic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_ed_wd80x3.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ic/z8530.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ichwd/ichwd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ieee488/pcii.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipmi/ipmi.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipmi/ipmi_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipmi/ipmi_smbios.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipmi/ipmivars.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipw/if_ipwreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_inline.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_library.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_library.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/ispreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwireg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/am7990.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/am79900.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/am79900reg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/am79900var.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/am7990reg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/am7990var.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/if_le_ledma.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/if_le_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/lance.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/lancereg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/le/lancevar.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/md/md.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/fc_log.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_inb.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_sas.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_tool.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_reg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/myri10ge/eth_z8e.dat.gz.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/myri10ge/ethp_z8e.dat.gz.uu#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/myri10ge/if_myri10ge.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/myri10ge/if_myri10ge_var.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/myri10ge/mcp_gen_header.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/myri10ge/myri10ge_mcp.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pcf/envctrl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pcf/pcf_ebus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pcf/pcf_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_ebus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/if_ral.c#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/if_ral_pccard.c#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/if_ralreg.h#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/if_ralvar.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2560.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2560reg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2560var.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2661.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2661_ucode.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2661reg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ral/rt2661var.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rp/rp_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/si/si.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/si/si2_z280.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/si/si3_t225.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sio/sio.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/driver.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/atiixp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/atiixp.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sr/if_sr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/tdfx/tdfx_linux.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_tty.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_rue.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_udav.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ohci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ohcivar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ufoma.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/umass.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_port.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_quirks.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdivar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/msdosfs/direntry.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/procfs/procfs_ctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/concat/g_concat.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/concat/g_concat.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/g_eli_key.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/pkcs5v2.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/eli/pkcs5v2.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/gate/g_gate.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/gate/g_gate.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_slice.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/label/g_label_ufs.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/nop/g_nop.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/shsec/g_shsec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/stripe/g_stripe.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/stripe/g_stripe.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/uzip/g_uzip.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_drive.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/zero/g_zero.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/cpufreq/est.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/busdma_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/geode.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/cserial.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/mptable.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/xbox.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/conf/SKI#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/elf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/isofs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_main.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_sysent.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_acct.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_alq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_kse.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_rwlock.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sx.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/md5c.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_disk.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_firmware.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_lock.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_witness.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.master#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty_compat.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty_pts.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/libkern/fnmatch.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/libkern/gets.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/3dfx/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/3dfx_linux/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/Makefile#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/amr/amr_linux/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/arcnet/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ata/atausb/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/bktr/bktr/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ce/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/coda5/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/de/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/firewire/firewire/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/firewire/fwe/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/firewire/sbp/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/firewire/sbp_targ/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/firmware/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/geom/geom_eli/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_vlan/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ipmi/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/iwi/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/kbdmux/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/le/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/myri10ge/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/myri10ge/myri10ge/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/myri10ge/myri10ge_eth_z8e/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/myri10ge/myri10ge_ethp_z8e/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bluetooth/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/nfs4client/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/nwfs/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/pf/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/pflog/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ral/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/twa/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ufoma/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_arcsubr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ef.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gif.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gif.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gre.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_media.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_media.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/pfil.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/pfil.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/ppp_deflate.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/radix.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_signal.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/ipatm/ipatm_vcm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_base.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_ipfw.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_lmi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_message.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fastfwd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_gre.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_ipsec.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_ipsec.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keydb.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/keysock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netkey/keysock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netkey/keysock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_crypt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_smb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netsmb/smb_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_serv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/opencrypto/crypto.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/pckbd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/ppc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/cardinfo.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/driver.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/i82365.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/meciareg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/pccard_nbk.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/pcic_pci.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/pcicvar.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pccard/slot.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_i810.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_intel.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/dc21040reg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_de.c#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_devar.h#4 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_pcn.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_sf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_sis.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_sk.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_skreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_ste.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_vr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_wb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_xl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_arg.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_pipe.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_private.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_syscalls.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/audit/audit_trigger.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/central/central.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/fhc/fhc_central.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/fhc/fhc_nexus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/utrap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sbus/lsi64854.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sbus/lsi64854var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/_lock.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/_rwlock.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/sys/_types.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ata.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/bio.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/disk.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/firmware.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/sys/hash.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/sys/imgact.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ipmi.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ktr.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/lock.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/md5.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mount.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mutex.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/namei.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/proc.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ptrace.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/queue.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/rwlock.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/sys/select.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/serial.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/signalvar.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/socketvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sockio.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.mk#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysctl.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysproto.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/systm.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/taskqueue.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/thr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/timers.h#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/tree.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ttychars.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ttycom.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ttydev.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/turnstile.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/user.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/vnode.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/tools/fw_stub.awk#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_alloc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/softdep.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/redzone.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/vm/redzone.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/vm/swap_pager.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_object.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_set_policy.3#2 (text+ko) ==== @@ -27,16 +27,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 22 16:53:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AFEE16A427; Wed, 22 Mar 2006 16:53:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB13416A41F for ; Wed, 22 Mar 2006 16:53:43 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8841443DC1 for ; Wed, 22 Mar 2006 16:53:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MGqeLx077964 for ; Wed, 22 Mar 2006 16:52:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MGqe9F077961 for perforce@freebsd.org; Wed, 22 Mar 2006 16:52:40 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 22 Mar 2006 16:52:40 GMT Message-Id: <200603221652.k2MGqe9F077961@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 16:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=93796 Change 93796 by kmacy@kmacy_storage:sun4vtmp on 2006/03/22 16:52:12 fix pmap_activate Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#33 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#33 (text+ko) ==== @@ -126,6 +126,7 @@ static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; int pmap_debug = 0; +static int context = 1; /* XXX */ /* * Kernel pmap. @@ -364,9 +365,18 @@ oldpmap->pm_active &= ~1; pmap->pm_active |= 1; #endif - pmap->pm_hashscratch = tte_hash_set_scratchpad_user(pmap->pm_hash); +#if 0 + tsb_clear(&pmap->pm_tsb); + tte_hash_clear(pmap->pm_hash); +#endif + + pmap->pm_context = context++; + pmap->pm_hashscratch = tte_hash_set_scratchpad_user(pmap->pm_hash, pmap->pm_context); pmap->pm_tsbscratch = tsb_set_scratchpad_user(&pmap->pm_tsb); PCPU_SET(curpmap, pmap); + hv_set_ctxnon0(1, pmap->pm_tsb_ra); + stxa(MMU_CID_S, ASI_MMU_CONTEXTID, pmap->pm_context); + membar(Sync); critical_exit(); } @@ -1289,7 +1299,6 @@ void pmap_pinit(pmap_t pmap) { - static int context = 1; /* XXX */ pmap->pm_context = context++; From owner-p4-projects@FreeBSD.ORG Wed Mar 22 17:07:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F3FE16A423; Wed, 22 Mar 2006 17:07:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C85316A420 for ; Wed, 22 Mar 2006 17:07:45 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F0A343D86 for ; Wed, 22 Mar 2006 17:03:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MH1qQQ078596 for ; Wed, 22 Mar 2006 17:01:52 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MH1qat078593 for perforce@freebsd.org; Wed, 22 Mar 2006 17:01:52 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 22 Mar 2006 17:01:52 GMT Message-Id: <200603221701.k2MH1qat078593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 17:07:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=93798 Change 93798 by kmacy@kmacy_storage:sun4vtmp on 2006/03/22 17:01:36 dependencies for previous pmap_activate fix Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#7 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#11 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/tte_hash.h#7 (text+ko) ==== @@ -8,6 +8,8 @@ void tte_hash_init(vm_paddr_t); +void tte_hash_clear(tte_hash_t hash); + tte_hash_t tte_hash_kernel_create(vm_offset_t, uint64_t); tte_hash_t tte_hash_create(uint64_t context, uint64_t *scratchval); @@ -22,7 +24,7 @@ uint64_t tte_hash_set_scratchpad_kernel(tte_hash_t th); -uint64_t tte_hash_set_scratchpad_user(tte_hash_t th); +uint64_t tte_hash_set_scratchpad_user(tte_hash_t th, uint64_t context); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#11 (text+ko) ==== @@ -189,6 +189,12 @@ } void +tte_hash_clear(tte_hash_t th) +{ + bzero(th->th_hashtable, th->th_size*PAGE_SIZE); +} + +void tte_hash_destroy(tte_hash_t th) { vm_page_t m, hash_pages[MAX_HASH_SIZE]; @@ -322,16 +328,15 @@ } uint64_t -tte_hash_set_scratchpad_user(tte_hash_t th) +tte_hash_set_scratchpad_user(tte_hash_t th, uint64_t context) { uint64_t hash_scratch; /* This will break if a hash table ever grows above 64MB * 2^(13+13) */ - + th->th_context = (uint16_t)context; hash_scratch = ((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size); - printf("hash_scratch=0x%lx\n", hash_scratch); set_hash_user_scratchpad(hash_scratch); return hash_scratch; From owner-p4-projects@FreeBSD.ORG Wed Mar 22 17:11:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A9BF16A431; Wed, 22 Mar 2006 17:11:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 07BD216A426 for ; Wed, 22 Mar 2006 17:11:44 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB0EE43E4A for ; Wed, 22 Mar 2006 17:10:29 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MH2smx078637 for ; Wed, 22 Mar 2006 17:02:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MH2sUG078634 for perforce@freebsd.org; Wed, 22 Mar 2006 17:02:54 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 22 Mar 2006 17:02:54 GMT Message-Id: <200603221702.k2MH2sUG078634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 17:11:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=93799 Change 93799 by kmacy@kmacy_storage:sun4vtmp on 2006/03/22 17:02:49 fix signal handling - trapframe and mcontext need to match up si_addr should point to trap pc Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/frame.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#17 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/frame.h#3 (text+ko) ==== @@ -39,16 +39,22 @@ struct trapframe { uint64_t tf_global[8]; uint64_t tf_out[8]; - uint64_t tf_pad[8]; uint64_t tf_fprs; uint64_t tf_fsr; uint64_t tf_gsr; + uint64_t tf_pad0[1]; uint64_t tf_pil; + uint64_t tf_pad1[3]; + uint64_t tf_tnpc; uint64_t tf_tpc; - uint64_t tf_tnpc; uint64_t tf_tstate; + uint64_t tf_pad2[2]; uint64_t tf_wstate; + uint64_t tf_pad3[2]; }; +/* extra padding can go away once we re-shuffle user-land mcontext + */ + #define tf_sp tf_out[6] #define TF_DONE(tf) do { \ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#17 (text+ko) ==== @@ -515,11 +515,8 @@ tf->tf_out[4] = (register_t)catcher; /* Fill siginfo structure. */ sf.sf_si = ksi->ksi_info; -#ifdef notyet - sf.sf_si.si_addr = (void *)tf->tf_sfar; /* XXX */ -#else - printf("sendsig %d to %s\n", sig, p->p_comm); -#endif + sf.sf_si.si_addr = (void *)tf->tf_tpc; + /* Copy the sigframe out to the user's stack. */ if (rwindow_save(td) != 0 || copyout(&sf, sfp, sizeof(*sfp)) != 0 || suword(&fp->fr_in[6], tf->tf_out[6]) != 0) { From owner-p4-projects@FreeBSD.ORG Wed Mar 22 20:48:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD34116A428; Wed, 22 Mar 2006 20:48:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9946D16A401 for ; Wed, 22 Mar 2006 20:48:30 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FA9543D45 for ; Wed, 22 Mar 2006 20:48:30 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MKmUQI097010 for ; Wed, 22 Mar 2006 20:48:30 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MKmUSH097007 for perforce@freebsd.org; Wed, 22 Mar 2006 20:48:30 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 20:48:30 GMT Message-Id: <200603222048.k2MKmUSH097007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93808 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 20:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=93808 Change 93808 by cognet@cognet on 2006/03/22 20:48:25 Use the unit instead of 0 as minor for devices which has multiple instances. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#7 edit .. //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#7 (text+ko) ==== @@ -130,8 +130,8 @@ AT91_PIO_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_pio_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "pio%d", device_get_unit(dev)); + sc->cdev = make_dev(&at91_pio_cdevsw, device_get_unit(dev), UID_ROOT + , GID_WHEEL, 0600, "pio%d", device_get_unit(dev)); if (sc->cdev == NULL) { err = ENOMEM; goto out; ==== //depot/projects/arm/src/sys/arm/at91/at91_ssc.c#2 (text+ko) ==== @@ -129,8 +129,8 @@ AT91_SSC_LOCK_DESTROY(sc); goto out; } - sc->cdev = make_dev(&at91_ssc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "ssc%d", device_get_unit(dev)); + sc->cdev = make_dev(&at91_ssc_cdevsw, device_get_unit(dev), UID_ROOT, + GID_WHEEL, 0600, "ssc%d", device_get_unit(dev)); if (sc->cdev == NULL) { err = ENOMEM; goto out; From owner-p4-projects@FreeBSD.ORG Wed Mar 22 20:53:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DE3A16A424; Wed, 22 Mar 2006 20:53:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1D1BC16A422 for ; Wed, 22 Mar 2006 20:53:38 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A70E243D4C for ; Wed, 22 Mar 2006 20:53:37 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MKrbqe097397 for ; Wed, 22 Mar 2006 20:53:37 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MKrbkK097394 for perforce@freebsd.org; Wed, 22 Mar 2006 20:53:37 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 20:53:37 GMT Message-Id: <200603222053.k2MKrbkK097394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 20:53:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=93810 Change 93810 by cognet@cognet on 2006/03/22 20:53:19 Change locking so that ate_setmcast() has to be called with the ATE_LOCK. Doing the lock inside ate_setmcast would lead to lock recursion, because ifinit_locked() calls it. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#46 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#46 (text+ko) ==== @@ -300,10 +300,8 @@ * advantage of that. Locks here are to avoid LOR with the * IF_ADDR_LOCK, but might not be strictly necessary. */ - ATE_LOCK(sc); WR4(sc, ETH_HSL, mcaf[0]); WR4(sc, ETH_HSH, mcaf[1]); - ATE_UNLOCK(sc); } static int @@ -902,7 +900,9 @@ case SIOCADDMULTI: case SIOCDELMULTI: /* update multicast filter list. */ + ATE_LOCK(sc); ate_setmcast(sc); + ATE_UNLOCK(sc); error = 0; break; From owner-p4-projects@FreeBSD.ORG Wed Mar 22 21:09:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3517216A422; Wed, 22 Mar 2006 21:09:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED25216A401 for ; Wed, 22 Mar 2006 21:09:57 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A22B943D6A for ; Wed, 22 Mar 2006 21:09:57 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2ML9vGi097980 for ; Wed, 22 Mar 2006 21:09:57 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2ML9vUo097977 for perforce@freebsd.org; Wed, 22 Mar 2006 21:09:57 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 21:09:57 GMT Message-Id: <200603222109.k2ML9vUo097977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93811 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 21:09:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=93811 Change 93811 by cognet@cognet on 2006/03/22 21:09:31 We have to reset the error bits once we handled the break. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#13 (text+ko) ==== @@ -366,8 +366,12 @@ ipend |= SER_INT_TXIDLE; if (csr & USART_CSR_RXRDY) ipend |= SER_INT_RXREADY; - if (csr & USART_CSR_RXBRK) + if (csr & USART_CSR_RXBRK) { + unsigned int cr = USART_CR_RSTSTA; + ipend |= SER_INT_BREAK; + uart_setreg(&sc->sc_bas, USART_CR, cr); + } mtx_unlock_spin(&sc->sc_hwmtx); return (ipend); } From owner-p4-projects@FreeBSD.ORG Wed Mar 22 21:12:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44CB016A427; Wed, 22 Mar 2006 21:12:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C15516A400 for ; Wed, 22 Mar 2006 21:12:18 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFB4143D5F for ; Wed, 22 Mar 2006 21:12:17 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MLCHOc098142 for ; Wed, 22 Mar 2006 21:12:17 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MLCHJr098137 for perforce@freebsd.org; Wed, 22 Mar 2006 21:12:17 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 21:12:17 GMT Message-Id: <200603222112.k2MLCHJr098137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93812 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 21:12:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=93812 Change 93812 by cognet@cognet on 2006/03/22 21:10:59 If we're mapping the vector page (this will happen if we didn't relocate it), do not attempt to call pmap_vac_me_harder() on the page. At this point m will be NULL, and we know we won't have any cache issues with this page. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/pmap.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#10 (text+ko) ==== @@ -3535,7 +3535,8 @@ pmap_tlb_flushD_SE(pmap, va); - pmap_vac_me_harder(m, pmap, va); + if (m) + pmap_vac_me_harder(m, pmap, va); } vm_page_unlock_queues(); } From owner-p4-projects@FreeBSD.ORG Wed Mar 22 22:07:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B853E16A422; Wed, 22 Mar 2006 22:07:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9506B16A400 for ; Wed, 22 Mar 2006 22:07:00 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7009B43D46 for ; Wed, 22 Mar 2006 22:06:59 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MM6xRk003344 for ; Wed, 22 Mar 2006 22:06:59 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MM6xH0003341 for perforce@freebsd.org; Wed, 22 Mar 2006 22:06:59 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 22:06:59 GMT Message-Id: <200603222206.k2MM6xH0003341@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 22:07:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=93822 Change 93822 by cognet@cognet on 2006/03/22 22:06:17 More special casing of when vector_page == 0x00000000 : catch attempts to write to vector_page earlier in pmap_fault_fixup(), and deny it. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/pmap.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#11 (text+ko) ==== @@ -2021,6 +2021,8 @@ */ if (user && (pte & L2_S_PROT_U) == 0) goto out; + if (va == vector_page) + goto out; pa = l2pte_pa(pte); From owner-p4-projects@FreeBSD.ORG Wed Mar 22 22:08:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B114B16A422; Wed, 22 Mar 2006 22:08:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77CD116A420 for ; Wed, 22 Mar 2006 22:08:01 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BB8343D45 for ; Wed, 22 Mar 2006 22:08:01 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MM81Av003405 for ; Wed, 22 Mar 2006 22:08:01 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MM80DD003401 for perforce@freebsd.org; Wed, 22 Mar 2006 22:08:00 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 22:08:00 GMT Message-Id: <200603222208.k2MM80DD003401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 22:08:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=93823 Change 93823 by cognet@cognet on 2006/03/22 22:07:10 Don't force single user mode, we can now go multi-user. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#18 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#18 (text+ko) ==== @@ -415,7 +415,6 @@ init_param2(memsize / PAGE_SIZE); avail_end = KERNPHYSADDR + memsize - 1; kdb_init(); - boothowto = RB_SINGLE; return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } From owner-p4-projects@FreeBSD.ORG Wed Mar 22 22:28:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CC9816A420; Wed, 22 Mar 2006 22:28:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2AA3916A400 for ; Wed, 22 Mar 2006 22:28:28 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA53E43D45 for ; Wed, 22 Mar 2006 22:28:27 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MMSRD7005832 for ; Wed, 22 Mar 2006 22:28:27 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MMSRBP005829 for perforce@freebsd.org; Wed, 22 Mar 2006 22:28:27 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 22:28:27 GMT Message-Id: <200603222228.k2MMSRBP005829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 22:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=93827 Change 93827 by cognet@cognet on 2006/03/22 22:28:05 Now that all goes way, don't add a special case in locore.S to map the KB9202 devices. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/locore.S#19 edit .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#19 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/locore.S#19 (text+ko) ==== @@ -199,8 +199,6 @@ MMU_INIT(PHYSADDR, PHYSADDR , 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) /* map VA 0xc0000000..0xc3ffffff to PA */ MMU_INIT(KERNBASE, PHYSADDR, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) - /* Map in the system devices */ - MMU_INIT(0xfff00000, 0xfff00000, 1, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) .word 0 /* end of table */ #endif ==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#19 (text+ko) ==== @@ -203,7 +203,6 @@ i = 0; set_cpufuncs(); - cninit(); fake_preload[i++] = MODINFO_NAME; fake_preload[i++] = strlen("elf kernel") + 1; @@ -343,6 +342,7 @@ setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)); + cninit(); /* * Pages were allocated during the secondary bootstrap for the From owner-p4-projects@FreeBSD.ORG Wed Mar 22 23:05:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0A916A427; Wed, 22 Mar 2006 23:05:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F402D16A424 for ; Wed, 22 Mar 2006 23:05:16 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFD8A43D49 for ; Wed, 22 Mar 2006 23:05:16 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MN5GdB007563 for ; Wed, 22 Mar 2006 23:05:16 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MN5GXH007560 for perforce@freebsd.org; Wed, 22 Mar 2006 23:05:16 GMT (envelope-from cognet@freebsd.org) Date: Wed, 22 Mar 2006 23:05:16 GMT Message-Id: <200603222305.k2MN5GXH007560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2006 23:05:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=93831 Change 93831 by cognet@cognet on 2006/03/22 23:04:34 Handle SIOCSIFMEDIA / SIOCGIFMEDIA Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#47 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#47 (text+ko) ==== @@ -881,6 +881,8 @@ ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ate_softc *sc = ifp->if_softc; + struct mii_data *mii; + struct ifreq *ifr = (struct ifreq *)data; int error = 0; switch (cmd) { @@ -906,6 +908,11 @@ error = 0; break; + case SIOCSIFMEDIA: + case SIOCGIFMEDIA: + mii = device_get_softc(sc->miibus); + error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd); + break; default: error = ether_ioctl(ifp, cmd, data); break; From owner-p4-projects@FreeBSD.ORG Thu Mar 23 00:16:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8364516A466; Thu, 23 Mar 2006 00:16:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 473DB16A462 for ; Thu, 23 Mar 2006 00:16:48 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 294F443D4C for ; Thu, 23 Mar 2006 00:16:47 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2N0GkLF010223 for ; Thu, 23 Mar 2006 00:16:47 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2N0GjlC010220 for perforce@freebsd.org; Thu, 23 Mar 2006 00:16:45 GMT (envelope-from cognet@freebsd.org) Date: Thu, 23 Mar 2006 00:16:45 GMT Message-Id: <200603230016.k2N0GjlC010220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 93836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 00:16:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=93836 Change 93836 by cognet@cognet on 2006/03/23 00:16:41 Increase the TX FIFO size to make nethack run at an acceptable speed via serial. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#14 (text+ko) ==== @@ -274,7 +274,7 @@ static int at91_usart_bus_attach(struct uart_softc *sc) { - sc->sc_txfifosz = 1; + sc->sc_txfifosz = 32; sc->sc_rxfifosz = 1; sc->sc_hwiflow = 0; return (0); From owner-p4-projects@FreeBSD.ORG Thu Mar 23 03:29:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C451916A425; Thu, 23 Mar 2006 03:29:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9E51216A423 for ; Thu, 23 Mar 2006 03:29:38 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 570AA43D46 for ; Thu, 23 Mar 2006 03:29:38 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2N3Tc4w024868 for ; Thu, 23 Mar 2006 03:29:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2N3Tcqj024865 for perforce@freebsd.org; Thu, 23 Mar 2006 03:29:38 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 23 Mar 2006 03:29:38 GMT Message-Id: <200603230329.k2N3Tcqj024865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 03:29:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=93837 Change 93837 by kmacy@kmacy_storage:sun4vtmp on 2006/03/23 03:28:39 integrate roto-tilled nexus driver from Marius Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/nexusvar.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/ofw_nexus.h#1 add .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/nexusvar.h#2 (text+ko) ==== @@ -28,31 +28,8 @@ #ifndef _MACHINE_NEXUSVAR_H_ #define _MACHINE_NEXUSVAR_H_ -enum nexus_ivars { - NEXUS_IVAR_NODE, - NEXUS_IVAR_NAME, - NEXUS_IVAR_DEVICE_TYPE, - NEXUS_IVAR_MODEL, - NEXUS_IVAR_REG, - NEXUS_IVAR_NREG, - NEXUS_IVAR_INTERRUPTS, - NEXUS_IVAR_NINTERRUPTS, - NEXUS_IVAR_DMATAG, -}; +extern struct bus_dma_tag nexus_dmatag; -#define NEXUS_ACCESSOR(var, ivar, type) \ - __BUS_ACCESSOR(nexus, var, NEXUS, ivar, type) +#endif /* _MACHINE_NEXUSVAR_H_ */ -NEXUS_ACCESSOR(node, NODE, phandle_t) -NEXUS_ACCESSOR(name, NAME, char *) -NEXUS_ACCESSOR(device_type, DEVICE_TYPE, char *) -NEXUS_ACCESSOR(model, MODEL, char *) -NEXUS_ACCESSOR(reg, REG, struct upa_regs *) -NEXUS_ACCESSOR(nreg, NREG, int) -NEXUS_ACCESSOR(interrupts, INTERRUPTS, u_int *) -NEXUS_ACCESSOR(ninterrupts, NINTERRUPTS, int) -NEXUS_ACCESSOR(dmatag, DMATAG, bus_dma_tag_t) -#undef NEXUS_ACCESSOR - -#endif /* _MACHINE_NEXUSVAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/nexus.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright 1998 Massachusetts Institute of Technology * Copyright 2001 by Thomas Moestl . + * Copyright 2006 by Marius Strobl . * All rights reserved. * * Permission to use, copy, modify, and distribute this software and @@ -37,20 +38,21 @@ #include #include #include -#include #include #include #include +#include +#include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include @@ -67,18 +69,13 @@ * work for all Open Firmware based machines... */ -static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information"); +struct nexus_devinfo { + struct ofw_bus_devinfo ndi_obdinfo; + struct resource_list ndi_rl; -struct nexus_devinfo { - phandle_t ndi_node; /* Some common properties. */ - char *ndi_name; - char *ndi_device_type; - char *ndi_model; - struct upa_regs *ndi_reg; + struct nexus_regs *ndi_reg; int ndi_nreg; - u_int *ndi_interrupts; - int ndi_ninterrupts; }; struct nexus_softc { @@ -88,16 +85,23 @@ static device_probe_t nexus_probe; static device_attach_t nexus_attach; +static bus_print_child_t nexus_print_child; static bus_add_child_t nexus_add_child; static bus_probe_nomatch_t nexus_probe_nomatch; -static bus_read_ivar_t nexus_read_ivar; static bus_setup_intr_t nexus_setup_intr; static bus_teardown_intr_t nexus_teardown_intr; static bus_alloc_resource_t nexus_alloc_resource; +static bus_get_resource_list_t nexus_get_resource_list; static bus_activate_resource_t nexus_activate_resource; static bus_deactivate_resource_t nexus_deactivate_resource; static bus_release_resource_t nexus_release_resource; +static ofw_bus_get_devinfo_t nexus_get_devinfo; +static int nexus_inlist(const char *, const char **); +static struct nexus_devinfo * nexus_setup_dinfo(device_t, phandle_t); +static void nexus_destroy_dinfo(struct nexus_devinfo *); +static int nexus_print_res(struct nexus_devinfo *); + static device_method_t nexus_methods[] = { /* Device interface */ DEVMETHOD(device_probe, nexus_probe), @@ -107,56 +111,65 @@ DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, bus_generic_resume), - /* Bus interface. */ + /* Bus interface */ + DEVMETHOD(bus_print_child, nexus_print_child), + DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch), + DEVMETHOD(bus_read_ivar, bus_generic_read_ivar), + DEVMETHOD(bus_write_ivar, bus_generic_write_ivar), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch), - DEVMETHOD(bus_read_ivar, nexus_read_ivar), - DEVMETHOD(bus_setup_intr, nexus_setup_intr), - DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), DEVMETHOD(bus_deactivate_resource, nexus_deactivate_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), + DEVMETHOD(bus_setup_intr, nexus_setup_intr), + DEVMETHOD(bus_teardown_intr, nexus_teardown_intr), + DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), + DEVMETHOD(bus_get_resource_list, nexus_get_resource_list), + + /* ofw_bus interface */ + DEVMETHOD(ofw_bus_get_devinfo, nexus_get_devinfo), + DEVMETHOD(ofw_bus_get_compat, ofw_bus_gen_get_compat), + DEVMETHOD(ofw_bus_get_model, ofw_bus_gen_get_model), + DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name), + DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node), + DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type), { 0, 0 } }; -static driver_t nexus_driver = { - "nexus", - nexus_methods, - sizeof(struct nexus_softc), -}; - static devclass_t nexus_devclass; +DEFINE_CLASS_0(nexus, nexus_driver, nexus_methods, sizeof(struct nexus_softc)); DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); -static char *nexus_excl_name[] = { +static const char *nexus_excl_name[] = { "aliases", + "associations", "chosen", "counter-timer", /* No separate device; handled by psycho/sbus */ "memory", "openprom", "options", "packages", + "rsc", "virtual-memory", NULL }; -static char *nexus_excl_type[] = { +static const char *nexus_excl_type[] = { "cpu", NULL }; extern struct bus_space_tag nexus_bustag; -extern struct bus_dma_tag nexus_dmatag; static int -nexus_inlist(char *name, char *list[]) +nexus_inlist(const char *name, const char **list) { int i; + if (name == NULL) + return (0); for (i = 0; list[i] != NULL; i++) if (strcmp(name, list[i]) == 0) return (1); @@ -179,26 +192,25 @@ static int nexus_attach(device_t dev) { - phandle_t root; - phandle_t child; + struct nexus_devinfo *ndi; + struct nexus_softc *sc; device_t cdev; - struct nexus_devinfo *dinfo; - struct nexus_softc *sc; - char *name, *type; + phandle_t node; - if ((root = OF_peer(0)) == -1) - panic("nexus_probe: OF_peer failed."); + node = OF_peer(0); + if (node == -1) + panic("%s: OF_peer failed.", __func__); sc = device_get_softc(dev); sc->sc_intr_rman.rm_type = RMAN_ARRAY; sc->sc_intr_rman.rm_descr = "Interrupts"; sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "UPA Device Memory"; + sc->sc_mem_rman.rm_descr = "Device Memory"; if (rman_init(&sc->sc_intr_rman) != 0 || rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_intr_rman, 0, IV_MAX - 1) != 0 || - rman_manage_region(&sc->sc_mem_rman, UPA_MEMSTART, UPA_MEMEND) != 0) - panic("nexus_attach(): failed to set up rmans"); + rman_manage_region(&sc->sc_mem_rman, 0ULL, ~0ULL) != 0) + panic("%s: failed to set up rmans.", __func__); /* * Allow devices to identify. @@ -208,32 +220,17 @@ /* * Now walk the OFW tree and attach top-level devices. */ - for (child = OF_child(root); child != 0; child = OF_peer(child)) { - if (child == -1) - panic("nexus_attach(): OF_child() failed."); - if (OF_getprop_alloc(child, "name", 1, (void **)&name) == -1) + for (node = OF_child(node); node > 0; node = OF_peer(node)) { + if ((ndi = nexus_setup_dinfo(dev, node)) == NULL) continue; - OF_getprop_alloc(child, "device_type", 1, (void **)&type); - if (NEXUS_EXCLUDED(name, type)) { - free(name, M_OFWPROP); - free(type, M_OFWPROP); + cdev = device_add_child(dev, NULL, -1); + if (cdev == NULL) { + device_printf(dev, "<%s>: device_add_child failed\n", + ndi->ndi_obdinfo.obd_name); + nexus_destroy_dinfo(ndi); continue; } - cdev = device_add_child(dev, NULL, -1); - if (cdev == NULL) - panic("nexus_attach(): device_add_child() failed."); - dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK); - dinfo->ndi_node = child; - dinfo->ndi_name = name; - dinfo->ndi_device_type = type; - OF_getprop_alloc(child, "model", 1, - (void **)&dinfo->ndi_model); - dinfo->ndi_nreg = OF_getprop_alloc(child, "reg", - sizeof(*dinfo->ndi_reg), (void **)&dinfo->ndi_reg); - dinfo->ndi_ninterrupts = OF_getprop_alloc(child, - "interrupts", sizeof(*dinfo->ndi_interrupts), - (void **)&dinfo->ndi_interrupts); - device_set_ivars(cdev, dinfo); + device_set_ivars(cdev, ndi); } return (bus_generic_attach(dev)); } @@ -242,73 +239,42 @@ nexus_add_child(device_t dev, int order, const char *name, int unit) { device_t cdev; - struct nexus_devinfo *dinfo; + struct nexus_devinfo *ndi; cdev = device_add_child_ordered(dev, order, name, unit); if (cdev == NULL) return (NULL); - dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_NOWAIT | M_ZERO); - if (dinfo == NULL) - return (NULL); + ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO); + ndi->ndi_obdinfo.obd_node = -1; + ndi->ndi_obdinfo.obd_name = strdup(name, M_OFWPROP); + resource_list_init(&ndi->ndi_rl); + device_set_ivars(cdev, ndi); - dinfo->ndi_node = -1; - dinfo->ndi_name = strdup(name, M_OFWPROP); - device_set_ivars(cdev, dinfo); - return (cdev); } -static void -nexus_probe_nomatch(device_t dev, device_t child) +static int +nexus_print_child(device_t dev, device_t child) { - char *type; + int rv; - if ((type = nexus_get_device_type(child)) == NULL) - type = "(unknown)"; - device_printf(dev, "<%s>, type %s (no driver attached)\n", - nexus_get_name(child), type); + rv = bus_print_child_header(dev, child); + rv += nexus_print_res(device_get_ivars(child)); + rv += bus_print_child_footer(dev, child); + return (rv); } -static int -nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +static void +nexus_probe_nomatch(device_t dev, device_t child) { - struct nexus_devinfo *dinfo; + const char *type; - if ((dinfo = device_get_ivars(child)) == 0) - return (ENOENT); - switch (which) { - case NEXUS_IVAR_NODE: - *result = dinfo->ndi_node; - break; - case NEXUS_IVAR_NAME: - *result = (uintptr_t)dinfo->ndi_name; - break; - case NEXUS_IVAR_DEVICE_TYPE: - *result = (uintptr_t)dinfo->ndi_device_type; - break; - case NEXUS_IVAR_MODEL: - *result = (uintptr_t)dinfo->ndi_model; - break; - case NEXUS_IVAR_REG: - *result = (uintptr_t)dinfo->ndi_reg; - break; - case NEXUS_IVAR_NREG: - *result = dinfo->ndi_nreg; - break; - case NEXUS_IVAR_INTERRUPTS: - *result = (uintptr_t)dinfo->ndi_interrupts; - break; - case NEXUS_IVAR_NINTERRUPTS: - *result = dinfo->ndi_ninterrupts; - break; - case NEXUS_IVAR_DMATAG: - *result = (uintptr_t)&nexus_dmatag; - break; - default: - return (ENOENT); - } - return 0; + device_printf(dev, "<%s>", ofw_bus_get_name(child)); + nexus_print_res(device_get_ivars(child)); + type = ofw_bus_get_type(child); + printf(" type %s (no driver attached)\n", + type != NULL ? type : "unknown"); } static int @@ -318,7 +284,7 @@ int error; if (res == NULL) - panic("nexus_setup_intr: NULL interrupt resource!"); + panic("%s: NULL interrupt resource!", __func__); if ((rman_get_flags(res) & RF_SHAREABLE) == 0) flags |= INTR_EXCL; @@ -346,12 +312,31 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - struct nexus_softc *sc = device_get_softc(bus); - struct resource *rv; - struct rman *rm; - int needactivate = flags & RF_ACTIVE; + struct nexus_softc *sc; + struct rman *rm; + struct resource *rv; + struct resource_list_entry *rle; + int isdefault, needactivate, passthrough; + + isdefault = (start == 0UL && end == ~0UL); + needactivate = flags & RF_ACTIVE; + passthrough = (device_get_parent(child) != bus); + sc = device_get_softc(bus); + rle = NULL; - flags &= ~RF_ACTIVE; + if (!passthrough) { + rle = resource_list_find(BUS_GET_RESOURCE_LIST(bus, child), + type, *rid); + if (rle == NULL) + return (NULL); + if (rle->res != NULL) + panic("%s: resource entry is busy", __func__); + if (isdefault) { + start = rle->start; + count = ulmax(count, rle->count); + end = ulmax(rle->end, start + count - 1); + } + } switch (type) { case SYS_RES_IRQ: @@ -364,6 +349,7 @@ return (NULL); } + flags &= ~RF_ACTIVE; rv = rman_reserve_resource(rm, start, end, count, flags, child); if (rv == NULL) return (NULL); @@ -379,6 +365,9 @@ } } + if (!passthrough) + rle->res = rv; + return (rv); } @@ -413,3 +402,113 @@ } return (rman_release_resource(r)); } + +static struct resource_list * +nexus_get_resource_list(device_t dev, device_t child) +{ + struct nexus_devinfo *ndi; + + ndi = device_get_ivars(child); + return (&ndi->ndi_rl); +} + +static const struct ofw_bus_devinfo * +nexus_get_devinfo(device_t dev, device_t child) +{ + struct nexus_devinfo *ndi; + + ndi = device_get_ivars(child); + return (&ndi->ndi_obdinfo); +} + +static struct nexus_devinfo * +nexus_setup_dinfo(device_t dev, phandle_t node) +{ + struct nexus_devinfo *ndi; + struct nexus_regs *reg; + bus_addr_t phys; + bus_size_t size; + uint32_t ign; + uint32_t *intr; + int i; + int nintr; + int nreg; + + ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO); + if (ofw_bus_gen_setup_devinfo(&ndi->ndi_obdinfo, node) != 0) { + free(ndi, M_DEVBUF); + return (NULL); + } + if (NEXUS_EXCLUDED(ndi->ndi_obdinfo.obd_name, + ndi->ndi_obdinfo.obd_type)) { + ofw_bus_gen_destroy_devinfo(&ndi->ndi_obdinfo); + free(ndi, M_DEVBUF); + return (NULL); + } + resource_list_init(&ndi->ndi_rl); + nreg = OF_getprop_alloc(node, "reg", sizeof(*reg), (void **)®); + if (nreg == -1) { + device_printf(dev, "<%s>: incomplete\n", + ndi->ndi_obdinfo.obd_name); + nexus_destroy_dinfo(ndi); + return (NULL); + } + for (i = 0; i < nreg; i++) { + phys = NEXUS_REG_PHYS(®[i]); + size = NEXUS_REG_SIZE(®[i]); + resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, i, phys, + phys + size - 1, size); + } + free(reg, M_OFWPROP); + + nintr = OF_getprop_alloc(node, "interrupts", sizeof(*intr), + (void **)&intr); + if (nintr > 0) { +#ifndef SUN4V + if (OF_getprop(node, cpu_impl < CPU_IMPL_ULTRASPARCIII ? + "upa-portid" : "portid", &ign, sizeof(ign)) <= 0) { + device_printf(dev, "<%s>: could not determine portid\n", + ndi->ndi_obdinfo.obd_name); + nexus_destroy_dinfo(ndi); + return (NULL); + } + + /* XXX Starfire */ + ign = (ign << INTMAP_IGN_SHIFT) & INTMAP_IGN_MASK; +#else + ign = 0; +#endif + for (i = 0; i < nintr; i++) { + intr[i] |= ign; + resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i], + intr[i], 1); + } + free(intr, M_OFWPROP); + } + + return (ndi); +} + +static void +nexus_destroy_dinfo(struct nexus_devinfo *ndi) +{ + + resource_list_free(&ndi->ndi_rl); + ofw_bus_gen_destroy_devinfo(&ndi->ndi_obdinfo); + free(ndi, M_DEVBUF); +} + +static int +nexus_print_res(struct nexus_devinfo *ndi) +{ + int rv; + + rv = 0; + rv += resource_list_print_type(&ndi->ndi_rl, "mem", SYS_RES_MEMORY, + "%#lx"); + rv += resource_list_print_type(&ndi->ndi_rl, "irq", SYS_RES_IRQ, + "%ld"); + return (rv); +} + + From owner-p4-projects@FreeBSD.ORG Thu Mar 23 18:27:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7457116A420; Thu, 23 Mar 2006 18:27:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3981816A401 for ; Thu, 23 Mar 2006 18:27:43 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF0BC43D48 for ; Thu, 23 Mar 2006 18:27:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2NIRg5d097465 for ; Thu, 23 Mar 2006 18:27:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NIRgWJ097462 for perforce@freebsd.org; Thu, 23 Mar 2006 18:27:42 GMT (envelope-from imp@freebsd.org) Date: Thu, 23 Mar 2006 18:27:42 GMT Message-Id: <200603231827.k2NIRgWJ097462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 18:27:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=93860 Change 93860 by imp@imp_harmony on 2006/03/23 18:27:15 IFC/Merge @93856 Affected files ... .. //depot/projects/arm/src/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#5 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#5 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#5 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysvec.c#5 integrate .. //depot/projects/arm/src/sys/alpha/linux/syscalls.master#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#9 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#12 integrate .. //depot/projects/arm/src/sys/arm/at91/at91.c#13 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#7 integrate .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#17 integrate .. //depot/projects/arm/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#48 integrate .. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#20 integrate .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#15 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/arm/src/sys/conf/files#22 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.c#5 integrate .. //depot/projects/arm/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/arm/src/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#6 integrate .. //depot/projects/arm/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/arm/src/sys/dev/mii/miidevs#3 integrate .. //depot/projects/arm/src/sys/dev/patm/if_patm_attach.c#4 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/arm/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/arm/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/arm/src/sys/dev/sound/isa/ad1816.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#6 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/hid.c#2 integrate .. //depot/projects/arm/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#10 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.h#7 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#12 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3_ctl.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#8 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#5 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_mac.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#9 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#10 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#11 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/arm/src/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/arm/src/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/arm/src/sys/modules/Makefile#16 integrate .. //depot/projects/arm/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/if.c#8 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/arm/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/arm/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/arm/src/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit.c#7 integrate .. //depot/projects/arm/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit_arg.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit_ioctl.h#1 branch .. //depot/projects/arm/src/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/arm/src/sys/security/audit/audit_private.h#4 integrate .. //depot/projects/arm/src/sys/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/arm/src/sys/security/audit/audit_worker.c#1 branch .. //depot/projects/arm/src/sys/sys/aio.h#3 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#10 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#10 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#10 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#10 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_vnops.c#5 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/linux/linux_dummy.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.38 2004/03/29 02:19:43 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.39 2006/03/21 21:08:02 netchild Exp $"); #include #include @@ -72,11 +72,8 @@ DUMMY(pciconfig_read); DUMMY(pciconfig_write); DUMMY(pivot_root); -DUMMY(recvmsg); -DUMMY(sendmsg); DUMMY(sethae); DUMMY(sigaltstack); DUMMY(sigpending); -DUMMY(socketpair); DUMMY(utimes); ==== //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.24 2006/02/06 01:16:00 rwatson Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.27 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -170,6 +170,10 @@ struct linux_gethostname_args { register_t dummy; }; +struct linux_sethostname_args { + char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)]; + char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)]; +}; struct linux_getdtablesize_args { register_t dummy; }; @@ -199,10 +203,22 @@ char name_l_[PADL_(struct l_sockaddr *)]; struct l_sockaddr * name; char name_r_[PADR_(struct l_sockaddr *)]; char namelen_l_[PADL_(l_int)]; l_int namelen; char namelen_r_[PADR_(l_int)]; }; +struct linux_accept_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_accept_args *)]; struct linux_accept_args * args; char args_r_[PADR_(struct linux_accept_args *)]; +}; struct linux_getpriority_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; }; +struct linux_send_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_send_args *)]; struct linux_send_args * args; char args_r_[PADR_(struct linux_send_args *)]; +}; +struct linux_recv_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_recv_args *)]; struct linux_recv_args * args; char args_r_[PADR_(struct linux_recv_args *)]; +}; struct osf1_sigreturn_args { char sigcntxp_l_[PADL_(struct osigcontext *)]; struct osigcontext * sigcntxp; char sigcntxp_r_[PADR_(struct osigcontext *)]; }; @@ -223,6 +239,10 @@ char who_l_[PADL_(long)]; long who; char who_r_[PADR_(long)]; char rusage_l_[PADL_(void *)]; void * rusage; char rusage_r_[PADR_(void *)]; }; +struct linux_recvfrom_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_recvfrom_args *)]; struct linux_recvfrom_args * args; char args_r_[PADR_(struct linux_recvfrom_args *)]; +}; struct linux_rename_args { char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)]; char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; @@ -231,6 +251,10 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)]; }; +struct linux_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)]; +}; struct osf1_sendto_args { char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; @@ -249,6 +273,10 @@ struct linux_rmdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; }; +struct linux_getpeername_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_getpeername_args *)]; struct linux_getpeername_args * args; char args_r_[PADR_(struct linux_getpeername_args *)]; +}; struct linux_getrlimit_args { char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)]; char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)]; @@ -260,6 +288,10 @@ struct linux_quotactl_args { register_t dummy; }; +struct linux_getsockname_args { + char s_l_[PADL_(l_int)]; l_int s; char s_r_[PADR_(l_int)]; + char args_l_[PADL_(struct linux_getsockname_args *)]; struct linux_getsockname_args * args; char args_r_[PADR_(struct linux_getsockname_args *)]; +}; struct osf1_sigaction_args { char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; char nsa_l_[PADL_(struct osf1_sigaction *)]; struct osf1_sigaction * nsa; char nsa_r_[PADR_(struct osf1_sigaction *)]; @@ -620,28 +652,36 @@ int linux_getgroups(struct thread *, struct linux_getgroups_args *); int osf1_setitimer(struct thread *, struct osf1_setitimer_args *); int linux_gethostname(struct thread *, struct linux_gethostname_args *); +int linux_sethostname(struct thread *, struct linux_sethostname_args *); int linux_getdtablesize(struct thread *, struct linux_getdtablesize_args *); int linux_newfstat(struct thread *, struct linux_newfstat_args *); int linux_fcntl(struct thread *, struct linux_fcntl_args *); int osf1_select(struct thread *, struct osf1_select_args *); int osf1_socket(struct thread *, struct osf1_socket_args *); int linux_connect(struct thread *, struct linux_connect_args *); +int linux_accept(struct thread *, struct linux_accept_args *); int linux_getpriority(struct thread *, struct linux_getpriority_args *); +int linux_send(struct thread *, struct linux_send_args *); +int linux_recv(struct thread *, struct linux_recv_args *); int osf1_sigreturn(struct thread *, struct osf1_sigreturn_args *); int osf1_sigsuspend(struct thread *, struct osf1_sigsuspend_args *); int linux_recvmsg(struct thread *, struct linux_recvmsg_args *); int linux_sendmsg(struct thread *, struct linux_sendmsg_args *); int osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *); int osf1_getrusage(struct thread *, struct osf1_getrusage_args *); +int linux_recvfrom(struct thread *, struct linux_recvfrom_args *); int linux_rename(struct thread *, struct linux_rename_args *); int linux_truncate(struct thread *, struct linux_truncate_args *); +int linux_ftruncate(struct thread *, struct linux_ftruncate_args *); int osf1_sendto(struct thread *, struct osf1_sendto_args *); int linux_socketpair(struct thread *, struct linux_socketpair_args *); int linux_mkdir(struct thread *, struct linux_mkdir_args *); int linux_rmdir(struct thread *, struct linux_rmdir_args *); +int linux_getpeername(struct thread *, struct linux_getpeername_args *); int linux_getrlimit(struct thread *, struct linux_getrlimit_args *); int linux_setrlimit(struct thread *, struct linux_setrlimit_args *); int linux_quotactl(struct thread *, struct linux_quotactl_args *); +int linux_getsockname(struct thread *, struct linux_getsockname_args *); int osf1_sigaction(struct thread *, struct osf1_sigaction_args *); int linux_msgctl(struct thread *, struct linux_msgctl_args *); int linux_msgget(struct thread *, struct linux_msgget_args *); ==== //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.22 2006/02/06 01:16:00 rwatson Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.25 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #define LINUX_SYS_exit 1 @@ -57,7 +57,7 @@ #define LINUX_SYS_linux_getgroups 80 #define LINUX_SYS_osf1_setitimer 83 #define LINUX_SYS_linux_gethostname 87 -#define LINUX_SYS_osethostname 88 +#define LINUX_SYS_linux_sethostname 88 #define LINUX_SYS_linux_getdtablesize 89 #define LINUX_SYS_dup2 90 #define LINUX_SYS_linux_newfstat 91 @@ -68,10 +68,10 @@ #define LINUX_SYS_setpriority 96 #define LINUX_SYS_osf1_socket 97 #define LINUX_SYS_linux_connect 98 -#define LINUX_SYS_accept 99 +#define LINUX_SYS_linux_accept 99 #define LINUX_SYS_linux_getpriority 100 -#define LINUX_SYS_osend 101 -#define LINUX_SYS_orecv 102 +#define LINUX_SYS_linux_send 101 +#define LINUX_SYS_linux_recv 102 #define LINUX_SYS_osf1_sigreturn 103 #define LINUX_SYS_bind 104 #define LINUX_SYS_setsockopt 105 @@ -86,12 +86,12 @@ #define LINUX_SYS_writev 121 #define LINUX_SYS_fchown 123 #define LINUX_SYS_fchmod 124 -#define LINUX_SYS_recvfrom 125 +#define LINUX_SYS_linux_recvfrom 125 #define LINUX_SYS_setreuid 126 #define LINUX_SYS_setregid 127 #define LINUX_SYS_linux_rename 128 #define LINUX_SYS_linux_truncate 129 -#define LINUX_SYS_oftruncate 130 +#define LINUX_SYS_linux_ftruncate 130 #define LINUX_SYS_flock 131 #define LINUX_SYS_setgid 132 #define LINUX_SYS_osf1_sendto 133 @@ -100,12 +100,12 @@ #define LINUX_SYS_linux_mkdir 136 #define LINUX_SYS_linux_rmdir 137 #define LINUX_SYS_utimes 138 -#define LINUX_SYS_ogetpeername 141 +#define LINUX_SYS_linux_getpeername 141 #define LINUX_SYS_linux_getrlimit 144 #define LINUX_SYS_linux_setrlimit 145 #define LINUX_SYS_setsid 147 #define LINUX_SYS_linux_quotactl 148 -#define LINUX_SYS_getsockname 150 +#define LINUX_SYS_linux_getsockname 150 #define LINUX_SYS_osf1_sigaction 156 #define LINUX_SYS_setdomainname 166 #define LINUX_SYS_linux_msgctl 200 ==== //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#5 (text+ko) ==== @@ -2,12 +2,11 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.22 2006/02/06 01:16:00 rwatson Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.25 2006/03/20 19:48:02 netchild Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp */ #include -#include "opt_compat.h" #include #include #include @@ -108,7 +107,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL }, /* 88 = osethostname */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 88 = linux_sethostname */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ @@ -119,10 +118,10 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ - { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ + { SYF_MPSAFE | AS(linux_accept_args), (sy_call_t *)linux_accept, AUE_ACCEPT }, /* 99 = linux_accept */ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 100 = linux_getpriority */ - { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ - { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ + { SYF_MPSAFE | AS(linux_send_args), (sy_call_t *)linux_send, AUE_SEND }, /* 101 = linux_send */ + { SYF_MPSAFE | AS(linux_recv_args), (sy_call_t *)linux_recv, AUE_RECV }, /* 102 = linux_recv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ @@ -145,12 +144,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(linux_recvfrom_args), (sy_call_t *)linux_recvfrom, AUE_RECVFROM }, /* 125 = linux_recvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 130 = linux_ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ @@ -161,7 +160,7 @@ { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(linux_getpeername_args), (sy_call_t *)linux_getpeername, AUE_GETPEERNAME }, /* 141 = linux_getpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ @@ -170,7 +169,7 @@ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(linux_getsockname_args), (sy_call_t *)linux_getsockname, AUE_GETSOCKNAME }, /* 150 = linux_getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ ==== //depot/projects/arm/src/sys/alpha/linux/linux_sysvec.c#5 (text+ko) ==== @@ -27,14 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.98 2005/12/26 21:23:56 sobomax Exp $"); - -/* XXX we use functions that might not exist. */ -#include "opt_compat.h" - -#ifndef COMPAT_43 -#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!" -#endif +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.99 2006/03/18 18:24:38 netchild Exp $"); #include #include ==== //depot/projects/arm/src/sys/alpha/linux/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.66 2006/02/06 01:13:47 rwatson Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.69 2006/03/20 19:46:56 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -11,8 +11,7 @@ ; there is no audit event for the call at this time. For the ; case where the event exists, but we don't want auditing, the ; event should be #defined to AUE_NULL in audit_kevents.h. -; type one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT, -; NODEF, NOARGS, NOPROTO +; type one of STD, OBSOL, UNIMPL, NODEF, NOARGS, NOPROTO ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -22,9 +21,6 @@ ; types: ; STD always included -; COMPAT included on COMPAT #ifdef -; CPT_NOA combines COMPAT with NOARGS -; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; NOARGS same as STD except do not create structure in sys/sysproto.h ; NODEF ?? ; NOPROTO same as STD except do not create structure or function in @@ -32,7 +28,6 @@ ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only -#include "opt_compat.h" #include #include #include @@ -158,9 +153,7 @@ 85 AUE_NULL UNIMPL 86 AUE_GETITIMER UNIMPL osf_getitimer 87 AUE_SYSCTL MSTD { int linux_gethostname(void); } -88 AUE_SYSCTL MNOPROTO { int osethostname(char *hostname, \ - u_int len); } osethostname \ - sethostname_args int +88 AUE_SYSCTL MSTD { int linux_sethostname(char *hostname, u_int len); } 89 AUE_GETDTABLESIZE MSTD { int linux_getdtablesize(void); } 90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } 91 AUE_FSTAT MSTD { int linux_newfstat(l_uint fd, \ @@ -179,13 +172,13 @@ int protocol); } 98 AUE_CONNECT MSTD { int linux_connect(l_int s, \ struct l_sockaddr *name, l_int namelen); } -99 AUE_ACCEPT MNOPROTO { int oaccept(int s, caddr_t name, \ - int *anamelen); } accept accept_args int +99 AUE_ACCEPT MSTD { int linux_accept(l_int s, \ + struct linux_accept_args *args); } 100 AUE_GETPRIORITY MSTD { int linux_getpriority(int which, int who); } -101 AUE_SEND MNOPROTO { int osend(int s, caddr_t buf, int len, \ - int flags); } -102 AUE_RECV MNOPROTO { int orecv(int s, caddr_t buf, int len, \ - int flags); } +101 AUE_SEND MSTD { int linux_send(l_int s, \ + struct linux_send_args *args); } +102 AUE_RECV MSTD { int linux_recv(l_int s, \ + struct linux_recv_args *args); } 103 AUE_NULL MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } 104 AUE_BIND MNOPROTO { int bind(int s, caddr_t name, \ @@ -217,16 +210,14 @@ 122 AUE_SETTIMEOFDAY UNIMPL osf_settimeofday 123 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); } 124 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); } -125 AUE_RECVFROM NOPROTO { int orecvfrom(int s, caddr_t buf, \ - size_t len, int flags, caddr_t from, \ - int *fromlenaddr); } recvfrom \ - recvfrom_args int +125 AUE_RECVFROM MSTD { int linux_recvfrom(l_int s, \ + struct linux_recvfrom_args *args); } 126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } 127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); } 128 AUE_RENAME MSTD { int linux_rename(char *from, char *to); } 129 AUE_TRUNCATE MSTD { int linux_truncate(char *path, \ l_ulong length); } -130 AUE_FTRUNCATE MNOPROTO { int oftruncate(int fd, long length); } +130 AUE_FTRUNCATE MSTD { int linux_ftruncate(int fd, long length); } 131 AUE_FLOCK MNOPROTO { int flock(int fd, int how); } 132 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } 133 AUE_SENDTO MSTD { int osf1_sendto(int s, caddr_t buf, \ @@ -240,8 +231,8 @@ struct timeval *tptr); } 139 AUE_NULL UNIMPL 140 AUE_NULL UNIMPL -141 AUE_GETPEERNAME MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \ - int *alen); } +141 AUE_GETPEERNAME MSTD { int linux_getpeername(l_int s, \ + struct linux_getpeername_args *args); } 142 AUE_NULL UNIMPL 143 AUE_NULL UNIMPL 144 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ @@ -252,9 +243,8 @@ 147 AUE_SETSID MNOPROTO { int setsid(void); } 148 AUE_QUOTACTL MSTD { int linux_quotactl(void); } 149 AUE_NULL UNIMPL -150 AUE_GETSOCKNAME MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \ - int *alen);} getsockname \ - getsockname_args int +150 AUE_GETSOCKNAME MSTD { int linux_getsockname(l_int s, \ + struct linux_getsockname_args *args);} 151 AUE_NULL UNIMPL 152 AUE_NULL UNIMPL 153 AUE_NULL UNIMPL ==== //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.22 2006/03/13 23:55:31 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.23 2006/03/20 19:39:07 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -447,7 +447,7 @@ uint32_t value; /* Map the register window so we can access the device. */ - apic = (ioapic_t *)pmap_mapdev(addr, IOAPIC_MEM_REGION); + apic = pmap_mapdev(addr, IOAPIC_MEM_REGION); mtx_lock_spin(&icu_lock); value = ioapic_read(apic, IOAPIC_VER); mtx_unlock_spin(&icu_lock); ==== //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.24 2006/02/28 22:24:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -208,7 +208,7 @@ /* Map the local APIC and setup the spurious interrupt handler. */ KASSERT(trunc_page(addr) == addr, ("local APIC not aligned on a page boundary")); - lapic = (lapic_t *)pmap_mapdev(addr, sizeof(lapic_t)); + lapic = pmap_mapdev(addr, sizeof(lapic_t)); setidt(APIC_SPURIOUS_INT, IDTVEC(spuriousint), SDT_SYSIGT, SEL_KPL, 0); /* Perform basic initialization of the BSP's local APIC. */ ==== //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.270 2006/03/09 16:38:52 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.271 2006/03/18 19:32:46 ups Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -561,6 +561,13 @@ smp_active = 1; /* historic */ } + /* + * Enable global pages TLB extension + * This also implicitly flushes the TLB + */ + + load_cr4(rcr4() | CR4_PGE); + mtx_unlock_spin(&ap_boot_mtx); /* wait until all the AP's are up */ ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.537 2006/03/13 08:13:37 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.539 2006/03/21 18:07:41 alc Exp $"); /* * Manages physical address maps. @@ -1731,7 +1731,13 @@ sva += PAGE_SIZE) { if (*pte == 0) continue; - anyvalid = 1; + + /* + * The TLB entry for a PG_G mapping is invalidated + * by pmap_remove_pte(). + */ + if ((*pte & PG_G) == 0) + anyvalid = 1; if (pmap_remove_pte(pmap, pte, sva, ptpaddr)) break; } @@ -2988,7 +2994,6 @@ void pmap_activate(struct thread *td) { - struct proc *p = td->td_proc; pmap_t pmap, oldpmap; u_int64_t cr3; @@ -3005,18 +3010,7 @@ pmap->pm_active |= PCPU_GET(cpumask); #endif cr3 = vtophys(pmap->pm_pml4); - /* XXXKSE this is wrong. - * pmap_activate is for the current thread on the current cpu - */ - if (p->p_flag & P_SA) { - /* Make sure all other cr3 entries are updated. */ - /* what if they are running? XXXKSE (maybe abort them) */ - FOREACH_THREAD_IN_PROC(p, td) { - td->td_pcb->pcb_cr3 = cr3; - } - } else { - td->td_pcb->pcb_cr3 = cr3; - } + td->td_pcb->pcb_cr3 = cr3; load_cr3(cr3); critical_exit(); } ==== //depot/projects/arm/src/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.1 2004/08/16 07:55:06 tjr Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.2 2006/03/18 18:24:38 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ @@ -197,6 +197,24 @@ l_ulong __unused5; } __packed; +struct l_stat { + l_ushort st_dev; + l_ulong st_ino; + l_ushort st_mode; + l_ushort st_nlink; + l_ushort st_uid; + l_ushort st_gid; + l_ushort st_rdev; + l_long st_size; + struct l_timespec st_atimespec; + struct l_timespec st_mtimespec; + struct l_timespec st_ctimespec; + l_long st_blksize; + l_long st_blocks; + l_ulong st_flags; + l_ulong st_gen; +}; + struct l_stat64 { l_ushort st_dev; u_char __pad0[10]; ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.6 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.10 2006/03/20 18:54:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -82,6 +82,10 @@ char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; }; +struct linux_stat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)]; +}; struct linux_lseek_args { char fdes_l_[PADL_(l_uint)]; l_uint fdes; char fdes_r_[PADR_(l_uint)]; char off_l_[PADL_(l_off_t)]; l_off_t off; char off_r_[PADR_(l_off_t)]; @@ -220,6 +224,10 @@ struct linux_sigpending_args { char mask_l_[PADL_(l_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)]; }; +struct linux_sethostname_args { + char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)]; + char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)]; +}; struct linux_setrlimit_args { char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)]; char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)]; @@ -255,6 +263,10 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; }; +struct linux_lstat_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char up_l_[PADL_(struct linux_lstat *)]; struct linux_lstat * up; char up_r_[PADR_(struct linux_lstat *)]; +}; struct linux_readlink_args { char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; @@ -278,6 +290,10 @@ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)]; }; +struct linux_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)]; +}; struct linux_getpriority_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; @@ -703,6 +719,7 @@ int linux_mknod(struct thread *, struct linux_mknod_args *); int linux_chmod(struct thread *, struct linux_chmod_args *); int linux_lchown16(struct thread *, struct linux_lchown16_args *); +int linux_stat(struct thread *, struct linux_stat_args *); int linux_lseek(struct thread *, struct linux_lseek_args *); int linux_getpid(struct thread *, struct linux_getpid_args *); int linux_mount(struct thread *, struct linux_mount_args *); @@ -740,6 +757,7 @@ int linux_setregid16(struct thread *, struct linux_setregid16_args *); int linux_sigsuspend(struct thread *, struct linux_sigsuspend_args *); int linux_sigpending(struct thread *, struct linux_sigpending_args *); +int linux_sethostname(struct thread *, struct linux_sethostname_args *); int linux_setrlimit(struct thread *, struct linux_setrlimit_args *); int linux_old_getrlimit(struct thread *, struct linux_old_getrlimit_args *); int linux_getrusage(struct thread *, struct linux_getrusage_args *); @@ -749,11 +767,13 @@ int linux_setgroups16(struct thread *, struct linux_setgroups16_args *); int linux_old_select(struct thread *, struct linux_old_select_args *); int linux_symlink(struct thread *, struct linux_symlink_args *); +int linux_lstat(struct thread *, struct linux_lstat_args *); int linux_readlink(struct thread *, struct linux_readlink_args *); int linux_reboot(struct thread *, struct linux_reboot_args *); int linux_readdir(struct thread *, struct linux_readdir_args *); int linux_mmap(struct thread *, struct linux_mmap_args *); int linux_truncate(struct thread *, struct linux_truncate_args *); +int linux_ftruncate(struct thread *, struct linux_ftruncate_args *); int linux_getpriority(struct thread *, struct linux_getpriority_args *); int linux_statfs(struct thread *, struct linux_statfs_args *); int linux_fstatfs(struct thread *, struct linux_fstatfs_args *); ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.6 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.10 2006/03/20 18:54:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp */ #define LINUX_SYS_exit 1 @@ -22,6 +22,7 @@ #define LINUX_SYS_linux_mknod 14 #define LINUX_SYS_linux_chmod 15 #define LINUX_SYS_linux_lchown16 16 +#define LINUX_SYS_linux_stat 18 #define LINUX_SYS_linux_lseek 19 #define LINUX_SYS_linux_getpid 20 #define LINUX_SYS_linux_mount 21 @@ -69,7 +70,7 @@ #define LINUX_SYS_linux_setregid16 71 #define LINUX_SYS_linux_sigsuspend 72 #define LINUX_SYS_linux_sigpending 73 -#define LINUX_SYS_osethostname 74 +#define LINUX_SYS_linux_sethostname 74 #define LINUX_SYS_linux_setrlimit 75 #define LINUX_SYS_linux_old_getrlimit 76 #define LINUX_SYS_linux_getrusage 77 @@ -79,6 +80,7 @@ #define LINUX_SYS_linux_setgroups16 81 #define LINUX_SYS_linux_old_select 82 #define LINUX_SYS_linux_symlink 83 +#define LINUX_SYS_linux_lstat 84 #define LINUX_SYS_linux_readlink 85 #define LINUX_SYS_swapon 87 #define LINUX_SYS_linux_reboot 88 @@ -86,7 +88,7 @@ #define LINUX_SYS_linux_mmap 90 #define LINUX_SYS_munmap 91 #define LINUX_SYS_linux_truncate 92 -#define LINUX_SYS_oftruncate 93 +#define LINUX_SYS_linux_ftruncate 93 #define LINUX_SYS_fchmod 94 #define LINUX_SYS_fchown 95 #define LINUX_SYS_linux_getpriority 96 ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.6 2005/07/13 20:35:07 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.10 2006/03/20 18:54:29 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp */ #include @@ -38,7 +38,7 @@ { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ { SYF_MPSAFE | AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_NULL }, /* 16 = linux_lchown16 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = stat */ + { SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL }, /* 18 = linux_stat */ { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ { SYF_MPSAFE | 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 20 = linux_getpid */ { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 21 = linux_mount */ @@ -94,7 +94,7 @@ { SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL }, /* 71 = linux_setregid16 */ { SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ { SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 74 = osethostname */ + { SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL }, /* 74 = linux_sethostname */ { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 75 = linux_setrlimit */ { SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL }, /* 76 = linux_old_getrlimit */ { SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL }, /* 77 = linux_getrusage */ @@ -104,7 +104,7 @@ { SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL }, /* 81 = linux_setgroups16 */ { SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL }, /* 82 = linux_old_select */ { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 83 = linux_symlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = ostat */ + { SYF_MPSAFE | AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_NULL }, /* 84 = linux_lstat */ { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 85 = linux_readlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 87 = swapon */ @@ -113,7 +113,7 @@ { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 90 = linux_mmap */ { SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL }, /* 91 = munmap */ { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 92 = linux_truncate */ - { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 93 = oftruncate */ + { SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL }, /* 93 = linux_ftruncate */ { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 94 = fchmod */ { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 95 = fchown */ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 96 = linux_getpriority */ ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#5 (text+ko) ==== @@ -31,14 +31,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.14 2005/12/26 21:23:57 sobomax Exp $"); - -/* XXX we use functions that might not exist. */ +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.17 2006/03/19 11:10:32 ru Exp $"); #include "opt_compat.h" -#ifndef COMPAT_43 -#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!" -#endif #ifndef COMPAT_IA32 #error "Unable to compile Linux-emulator due to missing COMPAT_IA32 option!" #endif ==== //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#4 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.8 2006/03/20 18:53:26 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -11,7 +11,7 @@ ; there is no audit event for the call at this time. For the ; case where the event exists, but we don't want auditing, the ; event should be #defined to AUE_NULL in audit_kevents.h. -; type one of STD, OBSOL, UNIMPL, COMPAT +; type one of STD, OBSOL, UNIMPL ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: ; altname name of system call if different @@ -21,8 +21,6 @@ ; types: ; STD always included -; COMPAT included on COMPAT #ifdef -; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only @@ -66,7 +64,8 @@ 16 AUE_NULL MSTD { int linux_lchown16(char *path, \ l_uid16_t uid, l_gid16_t gid); } 17 AUE_NULL UNIMPL break -18 AUE_NULL UNIMPL stat +18 AUE_NULL MSTD { int linux_stat(char *path, \ + struct linux_stat *up); } 19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } 20 AUE_NULL MSTD { int linux_getpid(void); } @@ -136,9 +135,8 @@ 72 AUE_NULL MSTD { int linux_sigsuspend(l_int hist0, \ l_int hist1, l_osigset_t mask); } 73 AUE_NULL MSTD { int linux_sigpending(l_osigset_t *mask); } -74 AUE_NULL MNOPROTO { int osethostname(char *hostname, \ - u_int len); } osethostname \ - sethostname_args int +74 AUE_NULL MSTD { int linux_sethostname(char *hostname, \ + u_int len); } 75 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } 76 AUE_NULL MSTD { int linux_old_getrlimit(l_uint resource, \ @@ -159,7 +157,7 @@ struct l_old_select_argv *ptr); } 83 AUE_NULL MSTD { int linux_symlink(char *path, \ char *to); } -84 AUE_NULL UNIMPL ostat +84 AUE_NULL MSTD { int linux_lstat(char *path, struct linux_lstat *up); } 85 AUE_NULL MSTD { int linux_readlink(char *name, \ char *buf, l_int count); } 86 AUE_NULL UNIMPL linux_uselib @@ -173,7 +171,7 @@ 91 AUE_NULL MNOPROTO { int munmap(caddr_t addr, int len); } 92 AUE_NULL MSTD { int linux_truncate(char *path, \ l_ulong length); } -93 AUE_NULL MNOPROTO { int oftruncate(int fd, long length); } +93 AUE_NULL MSTD { int linux_ftruncate(int fd, long length); } 94 AUE_NULL MNOPROTO { int fchmod(int fd, int mode); } 95 AUE_NULL MNOPROTO { int fchown(int fd, int uid, int gid); } 96 AUE_NULL MSTD { int linux_getpriority(int which, int who); } ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#12 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.42 2006/03/01 23:04:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.44 2006/03/22 22:11:10 cognet Exp $"); #include #include #include ==== //depot/projects/arm/src/sys/arm/at91/at91.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 23 21:48:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8296516A45B; Thu, 23 Mar 2006 21:48:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6157D16A458 for ; Thu, 23 Mar 2006 21:48:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C74A643D55 for ; Thu, 23 Mar 2006 21:48:52 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2NLmqkq014169 for ; Thu, 23 Mar 2006 21:48:52 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NLmqlX014166 for perforce@freebsd.org; Thu, 23 Mar 2006 21:48:52 GMT (envelope-from imp@freebsd.org) Date: Thu, 23 Mar 2006 21:48:52 GMT Message-Id: <200603232148.k2NLmqlX014166@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 21:48:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=93877 Change 93877 by imp@imp_Speedy on 2006/03/23 21:48:37 My latest Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#24 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#24 (text+ko) ==== @@ -31,10 +31,12 @@ #hints "GENERIC.hints" #Default places to look for devices. hints "KB920X.hints" #Default places to look for devices. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=arm9 options DDB options KDB +options BREAK_TO_DEBUGGER +options ALT_BREAK_TO_DEBUGGER options SCHED_4BSD #4BSD scheduler options INET #InterNETworking From owner-p4-projects@FreeBSD.ORG Thu Mar 23 21:49:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF37F16A429; Thu, 23 Mar 2006 21:49:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDB5D16A423 for ; Thu, 23 Mar 2006 21:49:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC4C143D53 for ; Thu, 23 Mar 2006 21:49:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2NLnscA014228 for ; Thu, 23 Mar 2006 21:49:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NLnsQY014225 for perforce@freebsd.org; Thu, 23 Mar 2006 21:49:54 GMT (envelope-from imp@freebsd.org) Date: Thu, 23 Mar 2006 21:49:54 GMT Message-Id: <200603232149.k2NLnsQY014225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 21:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=93878 Change 93878 by imp@imp_Speedy on 2006/03/23 21:48:55 spin locks for fast interrupts Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#8 (text+ko) ==== @@ -64,11 +64,11 @@ bus_write_4(sc->mem_res, off, val); } -#define AT91_PIO_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define AT91_PIO_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define AT91_PIO_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) +#define AT91_PIO_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) #define AT91_PIO_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ - "pio", MTX_DEF) + "pio", MTX_SPIN) #define AT91_PIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_PIO_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_PIO_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); From owner-p4-projects@FreeBSD.ORG Thu Mar 23 21:49:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F1EB16A46E; Thu, 23 Mar 2006 21:49:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D046416A427 for ; Thu, 23 Mar 2006 21:49:57 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C8D243D5C for ; Thu, 23 Mar 2006 21:49:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2NLnsX9014234 for ; Thu, 23 Mar 2006 21:49:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NLns78014231 for perforce@freebsd.org; Thu, 23 Mar 2006 21:49:54 GMT (envelope-from imp@freebsd.org) Date: Thu, 23 Mar 2006 21:49:54 GMT Message-Id: <200603232149.k2NLns78014231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 21:49:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=93879 Change 93879 by imp@imp_Speedy on 2006/03/23 21:49:24 First cut at rtc. Just cut and paste ATM. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#1 add .. //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#1 add .. //depot/projects/arm/src/sys/arm/at91/files.at91#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91#5 (text) ==== @@ -6,6 +6,7 @@ arm/at91/at91_mci.c optional at91_mci arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard +arm/at91/at91_rtc.c standard arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_spi.c optional at91_spi arm/at91/at91_twi.c optional at91_twi From owner-p4-projects@FreeBSD.ORG Thu Mar 23 23:45:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABCD716A41F; Thu, 23 Mar 2006 23:45:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5574816A401 for ; Thu, 23 Mar 2006 23:45:20 +0000 (UTC) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F17BE43D48 for ; Thu, 23 Mar 2006 23:45:19 +0000 (GMT) (envelope-from soc-shteryana@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2NNjJSk021113 for ; Thu, 23 Mar 2006 23:45:19 GMT (envelope-from soc-shteryana@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NNjJFc021110 for perforce@freebsd.org; Thu, 23 Mar 2006 23:45:19 GMT (envelope-from soc-shteryana@freebsd.org) Date: Thu, 23 Mar 2006 23:45:19 GMT Message-Id: <200603232345.k2NNjJFc021110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-shteryana@freebsd.org using -f From: Shteryana Shopova To: Perforce Change Reviews Cc: Subject: PERFORCE change 93892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2006 23:45:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=93892 Change 93892 by soc-shteryana@prometheus on 2006/03/23 23:44:26 IFC Affected files ... .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/FREEBSD-Xlist#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/NEWS#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/TODO#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/VERSION#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.1#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#4 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.h#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/snmpclient.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/support.h#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/oid-list#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/BEGEMOT-IP-MIB.txt#1 branch .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#1 branch .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.c#8 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.h#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_begemot.c#1 branch .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_route.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_tcp.c#3 branch .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_tree.def#6 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_udp.c#3 branch .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmpd/snmpmod.h#4 integrate .. //depot/projects/soc2005/bsnmp/lib/Makefile#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/bsnmpd/Makefile#3 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/Makefile#7 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#24 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#12 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#14 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#8 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#7 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#6 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#7 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#5 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#12 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#23 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#28 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#12 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#4 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#8 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#2 integrate .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_mibII/Makefile#5 integrate Differences ... ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/FREEBSD-Xlist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.4 2005/10/04 14:53:06 harti Exp $ +#$FreeBSD: src/contrib/bsnmp/FREEBSD-Xlist,v 1.5 2006/03/13 09:30:26 harti Exp $ */Makefile.in */acinclude.m4 */aclocal.m4 @@ -10,6 +10,7 @@ */gensnmptree/Makefile.in */lib/Makefile.in */snmp_mibII/Makefile.in +*/snmp_mibII/tree.h */snmp_ntp/Makefile.in */snmpd/Makefile.in */snmpd/.gdbinit ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/NEWS#3 (text+ko) ==== @@ -1,3 +1,29 @@ +1.12 + A couple of man page fixes from various submitters. + + Make default communities NULL for security. + + Fix a core dump when -d tracing suboption has no argument (thanks + to Shteryana Shopova). + + Fix bug in parsing the include path in the daemon. + + Fix an uninitialize structure field in gensnmptree (thanks to + jasone@freebsdorg) + + 64bit HC counters in the IF-MIB by polling the OS periodically. + + Fix link traps to be more RFC conform (thanks to glebius@freebsd.org) + + Add fallback definition for SA_SIZE() to support.h. + + Move the porting definitions for U?INT32_{MIN,MAX} into support.h. + + Include a sys/tree.h from FreeBSD-current and add autoconf + check for it. + +1.11a Fix build of modules when stdint.h is included after asn1.h + 1.11 Make the Mib2 routing table use red-black tree. This vastly reduces loading and access time. Load the table only every 10 minutes. In the meantime process message from the routing socket ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/TODO#2 (text+ko) ==== @@ -1,6 +1,3 @@ -snmpd_mibII: - - handle HC counters by periodically polling the kernel counters. - snmpd: - rethink transports a little bit: make them loadable and make a private subtree for transports: ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/VERSION#3 (text+ko) ==== @@ -1,1 +1,1 @@ -1.11 +1.12 ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.1#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.5 2005/06/15 11:31:25 brandt_h Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.7 2006/02/27 09:52:08 brandt_h Exp $ .\" -.Dd June 14, 2005 +.Dd February 27, 2006 .Dt GENSNMPTREE 1 .Os .Sh NAME @@ -45,7 +45,7 @@ utility is used to either generate C language tables and header files from a MIB description or to numeric OIDs from MIB descriptions. The first form is used only for maintaining the -.Xr snmpd 1 +.Xr bsnmpd 1 daemon or for module writers. The second form may be used by SNMP client program writers. .Pp @@ -57,7 +57,7 @@ C-file .Ar prefix Ns tree.c containing a table used by -.Xr snmpd 1 +.Xr bsnmpd 1 during PDU processing and a header file .Ar prefix Ns tree.h @@ -70,14 +70,19 @@ .Nm expects MIB variable names (only the last component) on its command line. It reads a MIB specification from standard input and for each MIB variable -name emits two C preprocessor defines on its standard output. -One define -.Va OID_ Ns Ar name -can be used as an array initialized to initialize a -.Va struct asn_oid . -The other define -.Va OIDLEN_ Ns Ar name -contains the length of the OID. +name emits three C preprocessor defines on its standard output: +.Bl -tag -width ".Va OIDLEN_ Ns Ar Name" +.It Va OIDX_ Ns Ar name +This define can be used to initialize a +.Va struct asn_oid +in the following way: +.Pp +.Dl const struct asn_oid oid_sysDescr = OIDX_sysDescr; +.It Va OIDLEN_ Ns Ar name +is the length of the OID. +.It Va OID_ Ns Ar name +is the last component of the OID. +.El .Pp The options are as follows: .Bl -tag -width ".Fl d Ar argument" @@ -88,7 +93,7 @@ .It Fl l Generate local preprocessor includes. This is used for bootstrapping -.Xr snmpd 1 . +.Xr bsnmpd 1 . .It Fl t Instead of normal output print the resulting tree. .It Fl p Ar prefix @@ -187,6 +192,6 @@ ) .Ed .Sh SEE ALSO -.Xr snmpd 1 +.Xr bsnmpd 1 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.43 2005/10/04 11:21:29 brandt_h Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.44 2006/02/14 09:04:17 brandt_h Exp $ * * Generate OID table from table description. * @@ -901,8 +901,6 @@ int opt; struct node *root; char fname[MAXPATHLEN + 1]; - char include_fname[MAXPATHLEN + 128 +1]; - int idx; int tok; while ((opt = getopt(argc, argv, "help:t")) != EOF) @@ -960,24 +958,13 @@ return (0); } sprintf(fname, "%stree.h", file_prefix); - - /*prepare the ifndef directive*/ - memset(include_fname,'\0',sizeof(include_fname)); - snprintf(include_fname, MAXPATHLEN + 128, "_%sTREE_H_INCLUDED__",file_prefix); - for(idx = 0; idx < strlen(include_fname); idx++){ - include_fname[idx] = toupper(include_fname[idx]); - } - if ((fp = fopen(fname, "w")) == NULL) err(1, "%s: ", fname); - - fprintf(fp, "#ifndef %s\n",include_fname); - fprintf(fp, "#define %s\n",include_fname); gen_header(root, PREFIX_LEN, NULL); fprintf(fp, "#define %sCTREE_SIZE %u\n", file_prefix, tree_size); fprintf(fp, "extern const struct snmp_node %sctree[];\n", file_prefix); - fprintf(fp, "#endif /* %s */\n",include_fname); + fclose(fp); sprintf(fname, "%stree.c", file_prefix); ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.29 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.31 2005/10/06 07:14:58 brandt_h Exp $ * * ASN.1 for SNMP. */ @@ -41,18 +41,10 @@ #include #endif #include + +#include "support.h" #include "asn1.h" -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - static void asn_error_func(const struct asn_buf *, const char *, ...); void (*asn_error)(const struct asn_buf *, const char *, ...) = asn_error_func; ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/asn1.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.19 2005/10/04 11:21:31 brandt_h Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/snmpclient.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpclient.c,v 1.34 2005/10/04 14:32:42 brandt_h Exp $ + * $Begemot: bsnmp/lib/snmpclient.c,v 1.36 2005/10/06 07:14:58 brandt_h Exp $ * * Support functions for SNMP clients. */ @@ -64,14 +64,6 @@ #include "snmpclient.h" #include "snmppriv.h" -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - - /* global context */ struct snmp_client snmp_client; ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/lib/support.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 + * Copyright (C) 2004-2005 * Hartmut Brandt. * All rights reserved. * @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/lib/support.h,v 1.1 2004/08/06 08:47:59 brandt Exp $ + * $Begemot: bsnmp/lib/support.h,v 1.2 2005/10/06 07:14:59 brandt_h Exp $ * * Functions that are missing on certain systems. This header file is not * to be installed. @@ -68,4 +68,29 @@ #endif +/* + * For systems with missing stdint.h or inttypes.h + */ +#if !defined(INT32_MIN) +#define INT32_MIN (-0x7fffffff-1) +#endif +#if !defined(INT32_MAX) +#define INT32_MAX (0x7fffffff) +#endif +#if !defined(UINT32_MAX) +#define UINT32_MAX (0xffffffff) +#endif + +/* + * Systems missing SA_SIZE(). Taken from FreeBSD net/route.h:1.63 + */ +#ifndef SA_SIZE + +#define SA_SIZE(sa) \ + ( (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \ + sizeof(long) : \ + 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) ) + +#endif + #endif ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/oid-list#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$Begemot: bsnmp/oid-list,v 1.3 2005/05/23 09:03:22 brandt_h Exp $ +$Begemot: bsnmp/oid-list,v 1.5 2006/02/27 09:55:45 brandt_h Exp $ This file documents the OID assignments under BSNMP's private OID. @@ -11,10 +11,12 @@ 1 BEGEMOT 1 BEGEMOT-SNMPD 2 BEGEMOT-NETGRAPH snmpd netgraph module + 3 BEGEMOT-IP snmpd IP related stuff. 100 BEGEMOT-ILMID snmpd ILMID module 101 BEGEMOT-ATM snmpd ATM module 200 BEGEMOT-PF snmpd PF module (phillip@freebsd.org) 201 BEGEMOT-NTP snmpd NTP module + 202 BEGEMOT-HOSTRES snmpd HOSTRES module private stuff 300 BEGEMOT-ACM DLR ACM project If you need an OID and don't know where to stuck it in, I can assign you one - ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.23 2005/06/09 12:36:52 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.24 2006/02/14 09:04:18 brandt_h Exp $ * * Implementation of the standard interfaces and ip MIB. */ @@ -34,9 +34,6 @@ #include "mibII_oid.h" #include -/*just a prototype below*/ -u_int -mib2_getIfIndex(const char* dev_name); /*****************************/ @@ -57,8 +54,8 @@ /* OR registrations */ static u_int ifmib_reg; static u_int ipmib_reg; - - +static u_int tcpmib_reg; +static u_int udpmib_reg; static u_int ipForward_reg; /*****************************/ @@ -108,10 +105,24 @@ /* list of all New if registrations */ static struct newifreg_list newifreg_list = TAILQ_HEAD_INITIALIZER(newifreg_list); +/* baud rate of fastest interface */ +uint64_t mibif_maxspeed; + +/* user-forced update interval */ +u_int mibif_force_hc_update_interval; + +/* current update interval */ +u_int mibif_hc_update_interval; + +/* HC update timer handle */ +static void *hc_update_timer; + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; static const struct asn_oid oid_ipMIB = OIDX_ipMIB; +static const struct asn_oid oid_tcpMIB = OIDX_tcpMIB; +static const struct asn_oid oid_udpMIB = OIDX_udpMIB; static const struct asn_oid oid_ipForward = OIDX_ipForward; static const struct asn_oid oid_linkDown = OIDX_linkDown; static const struct asn_oid oid_linkUp = OIDX_linkUp; @@ -281,16 +292,15 @@ (struct snmp_value *)NULL); } -/* - * Fetch new MIB data. +/** + * Fetch the GENERIC IFMIB and update the HC counters */ -int -mib_fetch_ifmib(struct mibif *ifp) +static int +fetch_generic_mib(struct mibif *ifp, const struct ifmibdata *old) { int name[6]; size_t len; - void *newmib; - struct ifmibdata oldmib = ifp->mib; + struct mibif_private *p = ifp->private; name[0] = CTL_NET; name[1] = PF_LINK; @@ -307,26 +317,144 @@ return (-1); } - if (ifp->trap_enable) { - if (!(oldmib.ifmd_flags & IFF_UP)) { - if (ifp->mib.ifmd_flags & IFF_UP) - link_trap(ifp, 1); + /* + * Assume that one of the two following compounds is optimized away + */ + if (ULONG_MAX >= 0xffffffffffffffffULL) { + p->hc_inoctets = ifp->mib.ifmd_data.ifi_ibytes; + p->hc_outoctets = ifp->mib.ifmd_data.ifi_obytes; + p->hc_omcasts = ifp->mib.ifmd_data.ifi_omcasts; + p->hc_opackets = ifp->mib.ifmd_data.ifi_opackets; + p->hc_imcasts = ifp->mib.ifmd_data.ifi_imcasts; + p->hc_ipackets = ifp->mib.ifmd_data.ifi_ipackets; + + } else if (ULONG_MAX >= 0xffffffff) { + +#define UPDATE(HC, MIB) \ + if (old->ifmd_data.MIB > ifp->mib.ifmd_data.MIB) \ + p->HC += (0x100000000ULL + \ + ifp->mib.ifmd_data.MIB) - \ + old->ifmd_data.MIB; \ + else \ + p->HC += ifp->mib.ifmd_data.MIB - \ + old->ifmd_data.MIB; + + UPDATE(hc_inoctets, ifi_ibytes) + UPDATE(hc_outoctets, ifi_obytes) + UPDATE(hc_omcasts, ifi_omcasts) + UPDATE(hc_opackets, ifi_opackets) + UPDATE(hc_imcasts, ifi_imcasts) + UPDATE(hc_ipackets, ifi_ipackets) + +#undef UPDATE + } else + abort(); + return (0); +} + +/** + * Update the 64-bit interface counters + */ +static void +update_hc_counters(void *arg __unused) +{ + struct mibif *ifp; + struct ifmibdata oldmib; + + TAILQ_FOREACH(ifp, &mibif_list, link) { + oldmib = ifp->mib; + (void)fetch_generic_mib(ifp, &oldmib); + } +} + +/** + * Recompute the poll timer for the HC counters + */ +void +mibif_reset_hc_timer(void) +{ + u_int ticks; + + if ((ticks = mibif_force_hc_update_interval) == 0) { + if (mibif_maxspeed <= 10000000) { + /* at 10Mbps overflow needs 3436 seconds */ + ticks = 3000 * 100; /* 50 minutes */ + } else if (mibif_maxspeed <= 100000000) { + /* at 100Mbps overflow needs 343 seconds */ + ticks = 300 * 100; /* 5 minutes */ + } else if (mibif_maxspeed < 650000000) { + /* at 622Mbps overflow needs 53 seconds */ + ticks = 40 * 100; /* 40 seconds */ + } else if (mibif_maxspeed <= 1000000000) { + /* at 1Gbps overflow needs 34 seconds */ + ticks = 20 * 100; /* 20 seconds */ } else { - if (!(ifp->mib.ifmd_flags & IFF_UP)) - link_trap(ifp, 0); + /* at 10Gbps overflow needs 3.4 seconds */ + ticks = 100; /* 1 seconds */ } } + if (ticks == mibif_hc_update_interval) + return; + + if (hc_update_timer != NULL) { + timer_stop(hc_update_timer); + hc_update_timer = NULL; + } + update_hc_counters(NULL); + if ((hc_update_timer = timer_start_repeat(ticks * 10, ticks * 10, + update_hc_counters, NULL, module)) == NULL) { + syslog(LOG_ERR, "timer_start(%u): %m", ticks); + return; + } + mibif_hc_update_interval = ticks; +} + +/* + * Fetch new MIB data. + */ +int +mib_fetch_ifmib(struct mibif *ifp) +{ + int name[6]; + size_t len; + void *newmib; + struct ifmibdata oldmib = ifp->mib; + + if (fetch_generic_mib(ifp, &oldmib) == -1) + return (-1); + + /* + * Quoting RFC2863, 3.1.15: "... LinkUp and linkDown traps are + * generated just after ifOperStatus leaves, or just before it + * enters, the down state, respectively;" + */ + if (ifp->trap_enable && ifp->mib.ifmd_data.ifi_link_state != + oldmib.ifmd_data.ifi_link_state && + (ifp->mib.ifmd_data.ifi_link_state == LINK_STATE_DOWN || + oldmib.ifmd_data.ifi_link_state == LINK_STATE_DOWN)) + link_trap(ifp, ifp->mib.ifmd_data.ifi_link_state == + LINK_STATE_UP ? 1 : 0); + ifp->flags &= ~(MIBIF_HIGHSPEED | MIBIF_VERYHIGHSPEED); if (ifp->mib.ifmd_data.ifi_baudrate > 20000000) { ifp->flags |= MIBIF_HIGHSPEED; if (ifp->mib.ifmd_data.ifi_baudrate > 650000000) ifp->flags |= MIBIF_VERYHIGHSPEED; } + if (ifp->mib.ifmd_data.ifi_baudrate > mibif_maxspeed) { + mibif_maxspeed = ifp->mib.ifmd_data.ifi_baudrate; + mibif_reset_hc_timer(); + } /* * linkspecific MIB */ + name[0] = CTL_NET; + name[1] = PF_LINK; + name[2] = NETLINK_GENERIC; + name[3] = IFMIB_IFDATA; + name[4] = ifp->sysindex; name[5] = IFDATA_LINKSPECIFIC; if (sysctl(name, 6, NULL, &len, NULL, 0) == -1) { syslog(LOG_WARNING, "sysctl linkmib estimate (%s): %m", @@ -518,6 +646,7 @@ static void mibif_free(struct mibif *ifp) { + struct mibif *ifp1; struct mibindexmap *map; struct mibifa *ifa, *ifa1; struct mibrcvaddr *rcv, *rcv1; @@ -530,6 +659,18 @@ (void)mib_ifstack_delete(NULL, ifp); TAILQ_REMOVE(&mibif_list, ifp, link); + + /* if this was the fastest interface - recompute this */ + if (ifp->mib.ifmd_data.ifi_baudrate == mibif_maxspeed) { + mibif_maxspeed = ifp->mib.ifmd_data.ifi_baudrate; + TAILQ_FOREACH(ifp1, &mibif_list, link) + if (ifp1->mib.ifmd_data.ifi_baudrate > mibif_maxspeed) + mibif_maxspeed = + ifp1->mib.ifmd_data.ifi_baudrate; + mibif_reset_hc_timer(); + } + + free(ifp->private); if (ifp->physaddr != NULL) free(ifp->physaddr); if (ifp->specmib != NULL) @@ -588,6 +729,13 @@ return (NULL); } memset(ifp, 0, sizeof(*ifp)); + if ((ifp->private = malloc(sizeof(struct mibif_private))) == NULL) { + syslog(LOG_WARNING, "%s: %m", __func__); + free(ifp); + return (NULL); + } + memset(ifp->private, 0, sizeof(struct mibif_private)); + ifp->sysindex = sysindex; strcpy(ifp->name, name); strcpy(ifp->descr, name); @@ -626,6 +774,7 @@ ifp->counter_disc = get_ticks(); } ifp->index = map->ifindex; + ifp->mib.ifmd_data.ifi_link_state = LINK_STATE_UNKNOWN; INSERT_OBJECT_INT(ifp, &mibif_list); mib_if_number++; @@ -1514,7 +1663,12 @@ "The MIB module for managing IP and ICMP implementations, but " "excluding their management of IP routes.", module); + tcpmib_reg = or_register(&oid_tcpMIB, + "The MIB module for managing TCP implementations.", module); + udpmib_reg = or_register(&oid_udpMIB, + "The MIB module for managing UDP implementations.", module); + ipForward_reg = or_register(&oid_ipForward, "The MIB module for the display of CIDR multipath IP Routes.", module); @@ -1570,6 +1724,8 @@ /* XXX free memory */ or_unregister(ipForward_reg); + or_unregister(udpmib_reg); + or_unregister(tcpmib_reg); or_unregister(ipmib_reg); or_unregister(ifmib_reg); @@ -1631,19 +1787,3 @@ ifp->xnotify_data = NULL; ifp->xnotify_mod = NULL; } - - -/* - * Get the MIB II ifIndex for the device with - * the name passed as argument (ie "rl0") - */ -u_int -mib2_getIfIndex(const char* dev_name){ - struct mibindexmap *map; - - STAILQ_FOREACH(map, &mibindexmap_list, link) - if (strcmp(map->name, dev_name) == 0) { - return map->ifindex; - } - return 0; -} ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.15 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.16 2006/02/14 09:04:19 brandt_h Exp $ * * Implementation of the interfaces and IP groups of MIB-II. */ @@ -56,7 +56,6 @@ #include "snmp_mibII.h" #include "mibII_tree.h" - /* * Interface list and flags. */ @@ -66,12 +65,19 @@ MIBIF_HIGHSPEED = 0x0002, MIBIF_VERYHIGHSPEED = 0x0004, }; -#define hc_inoctets mib.ifmd_data.ifi_ibytes -#define hc_outoctets mib.ifmd_data.ifi_obytes -#define hc_omcasts mib.ifmd_data.ifi_omcasts -#define hc_opackets mib.ifmd_data.ifi_opackets -#define hc_imcasts mib.ifmd_data.ifi_imcasts -#define hc_ipackets mib.ifmd_data.ifi_ipackets + +/* + * Private mibif data - hang off from the mibif. + */ +struct mibif_private { + uint64_t hc_inoctets; + uint64_t hc_outoctets; + uint64_t hc_omcasts; + uint64_t hc_opackets; + uint64_t hc_imcasts; + uint64_t hc_ipackets; +}; +#define MIBIF_PRIV(IFP) ((struct mibif_private *)((IFP)->private)) /* * Interface addresses. @@ -193,6 +199,18 @@ /* info on system clocks */ extern struct clockinfo clockinfo; +/* baud rate of fastest interface */ +extern uint64_t mibif_maxspeed; + +/* user-forced update interval */ +extern u_int mibif_force_hc_update_interval; + +/* current update interval */ +extern u_int mibif_hc_update_interval; + +/* re-compute update interval */ +void mibif_reset_hc_timer(void); + /* get interfaces and interface addresses. */ void mib_fetch_interfaces(void); ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.16 2005/11/02 12:07:40 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.17 2006/02/14 09:04:19 brandt_h Exp $ * * Interfaces group. */ @@ -463,19 +463,20 @@ case LEAF_ifHCInOctets: if (!(ifp->flags & MIBIF_HIGHSPEED)) goto again; - value->v.counter64 = ifp->hc_inoctets; + value->v.counter64 = MIBIF_PRIV(ifp)->hc_inoctets; break; case LEAF_ifHCInUcastPkts: if (!(ifp->flags & (MIBIF_VERYHIGHSPEED|MIBIF_HIGHSPEED))) goto again; - value->v.counter64 = ifp->hc_ipackets - ifp->hc_imcasts; + value->v.counter64 = MIBIF_PRIV(ifp)->hc_ipackets - + MIBIF_PRIV(ifp)->hc_imcasts; break; case LEAF_ifHCInMulticastPkts: if (!(ifp->flags & (MIBIF_VERYHIGHSPEED|MIBIF_HIGHSPEED))) goto again; - value->v.counter64 = ifp->hc_imcasts; + value->v.counter64 = MIBIF_PRIV(ifp)->hc_imcasts; break; case LEAF_ifHCInBroadcastPkts: @@ -487,19 +488,20 @@ case LEAF_ifHCOutOctets: if (!(ifp->flags & MIBIF_HIGHSPEED)) goto again; - value->v.counter64 = ifp->hc_outoctets; + value->v.counter64 = MIBIF_PRIV(ifp)->hc_outoctets; break; case LEAF_ifHCOutUcastPkts: if (!(ifp->flags & (MIBIF_VERYHIGHSPEED|MIBIF_HIGHSPEED))) goto again; - value->v.counter64 = ifp->hc_opackets - ifp->hc_omcasts; + value->v.counter64 = MIBIF_PRIV(ifp)->hc_opackets - + MIBIF_PRIV(ifp)->hc_omcasts; break; case LEAF_ifHCOutMulticastPkts: if (!(ifp->flags & (MIBIF_VERYHIGHSPEED|MIBIF_HIGHSPEED))) goto again; - value->v.counter64 = ifp->hc_omcasts; + value->v.counter64 = MIBIF_PRIV(ifp)->hc_omcasts; break; case LEAF_ifHCOutBroadcastPkts: ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_route.c#3 (text+ko) ==== @@ -26,11 +26,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.7 2005/06/09 12:36:53 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.9 2005/10/06 07:15:00 brandt_h Exp $ * * Routing table */ +#include "support.h" + +#ifdef HAVE_SYS_TREE_H #include +#else +#include "tree.h" +#endif + #include "mibII.h" #include "mibII_oid.h" ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/mibII_tree.def#6 (text+ko) ==== @@ -26,7 +26,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Begemot: bsnmp/snmp_mibII/mibII_tree.def,v 1.12 2004/08/06 08:47:05 brandt Exp $ +# $Begemot: bsnmp/snmp_mibII/mibII_tree.def,v 1.13 2006/02/14 09:04:19 brandt_h Exp $ # # Definition of the standard interfaces and ip trees. # @@ -148,6 +148,41 @@ (25 icmpOutAddrMasks COUNTER op_icmpstat GET) (26 icmpOutAddrMaskReps COUNTER op_icmpstat GET) ) + (6 tcp + (1 tcpRtoAlgorithm INTEGER op_tcp GET) + (2 tcpRtoMin INTEGER32 op_tcp GET) + (3 tcpRtoMax INTEGER32 op_tcp GET) + (4 tcpMaxConn INTEGER32 op_tcp GET) + (5 tcpActiveOpens COUNTER op_tcp GET) + (6 tcpPassiveOpens COUNTER op_tcp GET) + (7 tcpAttemptFails COUNTER op_tcp GET) + (8 tcpEstabResets COUNTER op_tcp GET) + (9 tcpCurrEstab GAUGE op_tcp GET) + (10 tcpInSegs COUNTER op_tcp GET) + (11 tcpOutSegs COUNTER op_tcp GET) + (12 tcpRetransSegs COUNTER op_tcp GET) + (13 tcpConnTable + (1 tcpConnEntry : IPADDRESS INTEGER IPADDRESS INTEGER op_tcpconn + (1 tcpConnState INTEGER GET) + (2 tcpConnLocalAddress IPADDRESS GET) + (3 tcpConnLocalPort INTEGER GET) + (4 tcpConnRemAddress IPADDRESS GET) + (5 tcpConnRemPort INTEGER GET) + )) + (14 tcpInErrs COUNTER op_tcp GET) + (15 tcpOutRsts COUNTER op_tcp) # don't know + ) + (7 udp + (1 udpInDatagrams COUNTER op_udp GET) + (2 udpNoPorts COUNTER op_udp GET) + (3 udpInErrors COUNTER op_udp GET) + (4 udpOutDatagrams COUNTER op_udp GET) + (5 udpTable + (1 udpEntry : IPADDRESS INTEGER op_udptable + (1 udpLocalAddress IPADDRESS GET) + (2 udpLocalPort INTEGER GET) + )) + ) (31 ifMIB (1 ifMIBObjects (1 ifXTable @@ -190,7 +225,28 @@ ) (48 ipMIB ) + (49 tcpMIB + ) + (50 udpMIB + ) )) + (4 private + (1 enterprises + (12325 fokus + (1 begemot + (3 begemotIp + (1 begemotIpObjects + (1 begemotMib2 + (1 begemotIfMaxspeed COUNTER64 op_begemot_mibII GET) + (2 begemotIfPoll TIMETICKS op_begemot_mibII GET) + (3 begemotIfForcePoll TIMETICKS op_begemot_mibII GET SET) + ) + ) + ) + ) + ) + ) + ) (6 snmpV2 (3 snmpModules (1 snmpMIB ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.17 2005/05/23 09:03:43 brandt_h Exp $ + * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.18 2006/02/14 09:04:19 brandt_h Exp $ * * Implementation of the interfaces and IP groups of MIB-II. */ @@ -79,6 +79,9 @@ /* to be set by ifType specific modules. This is ifSpecific. */ struct asn_oid spec_oid; + + /* private data - don't touch */ + void *private; }; /* ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/snmp_ntp/snmp_ntp.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/snmp_ntp/snmp_ntp.c,v 1.7 2005/10/04 11:21:36 brandt_h Exp $ + * $Begemot: bsnmp/snmp_ntp/snmp_ntp.c,v 1.9 2005/10/06 07:15:01 brandt_h Exp $ * * NTP interface for SNMPd. */ @@ -51,20 +51,11 @@ #include #include +#include "support.h" #include "snmpmod.h" #include "ntp_tree.h" #include "ntp_oid.h" -#if !defined(INT32_MIN) -#define INT32_MIN (-0x7fffffff-1) -#endif -#if !defined(INT32_MAX) -#define INT32_MAX (0x7fffffff) -#endif -#if !defined(UINT32_MAX) -#define UINT32_MAX (0xffffffff) -#endif - #define NTPC_MAX 576 #define NTPC_VERSION 3 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 24 06:44:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B56AB16A420; Fri, 24 Mar 2006 06:44:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 919FF16A400 for ; Fri, 24 Mar 2006 06:44:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F4A943D46 for ; Fri, 24 Mar 2006 06:44:04 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2O6i4HK058237 for ; Fri, 24 Mar 2006 06:44:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2O6i3B2058234 for perforce@freebsd.org; Fri, 24 Mar 2006 06:44:03 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Mar 2006 06:44:03 GMT Message-Id: <200603240644.k2O6i3B2058234@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93916 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 06:44:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=93916 Change 93916 by imp@imp_Speedy on 2006/03/24 06:43:38 rtc working. but it is of dubious value since we don't need it to keep time, and it is reset to 1-1-1998 on reboot. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_rtc.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,8 @@ #include +#include "clock_if.h" + struct at91_rtc_softc { device_t dev; /* Myself */ @@ -61,11 +64,11 @@ bus_write_4(sc->mem_res, off, val); } -#define AT91_RTC_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) -#define AT91_RTC_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) +#define AT91_RTC_LOCK(_sc) mtx_lock_spin(&(_sc)->sc_mtx) +#define AT91_RTC_UNLOCK(_sc) mtx_unlock_spin(&(_sc)->sc_mtx) #define AT91_RTC_LOCK_INIT(_sc) \ mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \ - "rtc", MTX_DEF) + "rtc", MTX_SPIN) #define AT91_RTC_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); #define AT91_RTC_ASSERT_LOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_OWNED); #define AT91_RTC_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED); @@ -113,6 +116,7 @@ AT91_RTC_LOCK_DESTROY(sc); goto out; } + clock_register(dev, 1000000); out:; if (err) at91_rtc_deactivate(dev); @@ -187,12 +191,53 @@ return; } +/* + * Get the time of day clock and return it in ts. + * Return 0 on success, an error number otherwise. + */ +static int +at91_rtc_gettime(device_t dev, struct timespec *ts) +{ + struct clocktime ct; + uint32_t timr, calr; + struct at91_rtc_softc *sc; + + sc = device_get_softc(dev); + timr = RD4(sc, RTC_TIMR); + calr = RD4(sc, RTC_CALR); + ct.nsec = 0; + ct.sec = RTC_TIMR_SEC(timr); + ct.min = RTC_TIMR_MIN(timr); + ct.hour = RTC_TIMR_HR(timr); + ct.year = RTC_CALR_CEN(calr) * 100 + RTC_CALR_YEAR(calr); + ct.mon = RTC_CALR_MON(calr); + ct.day = RTC_CALR_DAY(calr); + ct.dow = -1; + return clock_ct_to_ts(&ct, ts); +} + +/* + * Set the time of day clock based on the value of the struct timespec arg. + * Return 0 on success, an error number otherwise. + */ +static int +at91_rtc_settime(device_t dev, struct timespec *ts) +{ + // XXX UGLY XXX + printf("SET TIME\n"); + return (EINVAL); +} + static device_method_t at91_rtc_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_rtc_probe), DEVMETHOD(device_attach, at91_rtc_attach), DEVMETHOD(device_detach, at91_rtc_detach), + /* clock interface */ + DEVMETHOD(clock_gettime, at91_rtc_gettime), + DEVMETHOD(clock_settime, at91_rtc_settime), + { 0, 0 } }; ==== //depot/projects/arm/src/sys/arm/at91/at91_rtcreg.h#2 (text+ko) ==== @@ -28,41 +28,56 @@ #define ARM_AT91_AT91_RTCREG_H /* Registers */ -#define RTC_PER 0x00 /* RTC Enable Register */ -#define RTC_PDR 0x04 /* RTC Disable Register */ -#define RTC_PSR 0x08 /* RTC Status Register */ - /* 0x0c reserved */ -#define RTC_OER 0x10 /* RTC Output Enable Register */ -#define RTC_ODR 0x14 /* RTC Output Disable Register */ -#define RTC_OSR 0x18 /* RTC Output Status Register */ - /* 0x1c reserved */ -#define RTC_IFER 0x20 /* RTC Glitch Input Enable Register */ -#define RTC_IFDR 0x24 /* RTC Glitch Input Disable Register */ -#define RTC_IFSR 0x28 /* RTC Glitch Input Status Register */ - /* 0x2c reserved */ -#define RTC_SODR 0x30 /* RTC Set Output Data Register */ -#define RTC_CODR 0x34 /* RTC Clear Output Data Register */ -#define RTC_ODSR 0x38 /* RTC Output Data Status Register */ -#define RTC_PDSR 0x3c /* RTC Pin Data Status Register */ -#define RTC_IER 0x40 /* RTC Interrupt Enable Register */ -#define RTC_IDR 0x44 /* RTC Interrupt Disable Register */ -#define RTC_IMR 0x48 /* RTC Interrupt Mask Register */ -#define RTC_ISR 0x4c /* RTC Interrupt Status Register */ -#define RTC_MDER 0x50 /* RTC Multi-Driver Enable Register */ -#define RTC_MDDR 0x54 /* RTC Multi-Driver Disable Register */ -#define RTC_MDSR 0x58 /* RTC Multi-Driver Status Register */ - /* 0x5c reserved */ -#define RTC_PUER 0x60 /* RTC Pull-up Enable Register */ -#define RTC_PUDR 0x64 /* RTC Pull-up Disable Register */ -#define RTC_PUSR 0x68 /* RTC Pull-up Status Register */ - /* 0x6c reserved */ -#define RTC_ASR 0x70 /* RTC Peripheral A Select Register */ -#define RTC_BSR 0x74 /* RTC Peripheral B Select Register */ -#define RTC_ABSR 0x78 /* RTC AB Status Register */ - /* 0x7c-0x9c reserved */ -#define RTC_OWER 0xa0 /* RTC Output Write Enable Register */ -#define RTC_OWDR 0xa4 /* RTC Output Write Disable Register */ -#define RTC_OWSR 0xa8 /* RTC Output Write Status Register */ - /* 0xac reserved */ +#define RTC_CR 0x00 /* RTC Control Register */ +#define RTC_MR 0x04 /* RTC Mode Register */ +#define RTC_TIMR 0x08 /* RTC Time Register */ +#define RTC_CALR 0x0c /* RTC Calendar Register */ +#define RTC_TIMALR 0x10 /* RTC Time Alarm Register */ +#define RTC_CALALR 0x14 /* RTC Calendar Alarm Register */ +#define RTC_SR 0x18 /* RTC Status Register */ +#define RTC_SCCR 0x1c /* RTC Status Command Clear Register */ +#define RTC_IER 0x20 /* RTC Interrupt Enable Register */ +#define RTC_IDR 0x24 /* RTC Interrupt Disable Register */ +#define RTC_IMR 0x28 /* RTC Interrupt Mask Register */ +#define RTC_VER 0x2c /* RTC Valid Entry Register */ + +/* TIMR */ +#define RTC_TIMR_SEC_M 0x7fUL +#define RTC_TIMR_SEC_S 0 +#define RTC_TIMR_SEC(x) FROMBCD(((x) & RTC_TIMR_SEC_M) >> RTC_TIMR_SEC_S) +#define RTC_TIMR_MIN_M 0x7f00UL +#define RTC_TIMR_MIN_S 8 +#define RTC_TIMR_MIN(x) FROMBCD(((x) & RTC_TIMR_MIN_M) >> RTC_TIMR_MIN_S) +#define RTC_TIMR_HR_M 0x3f0000UL +#define RTC_TIMR_HR_S 16 +#define RTC_TIMR_HR(x) FROMBCD(((x) & RTC_TIMR_HR_M) >> RTC_TIMR_HR_S) +#define RTC_TIMR_MK(hr, min, sec) \ + ((TOBCD(hr) << RTC_TIMR_HR_S) | \ + (TOBCD(min) << RTC_TIMR_MIN_S) | \ + (TOBCD(sec) << RTC_TIMR_SEC_S)) +#define RTC_TIMR_PM (1UL << 22) + +/* CALR */ +#define RTC_CALR_CEN_M 0x0000007fUL +#define RTC_CALR_CEN_S 0 +#define RTC_CALR_CEN(x) FROMBCD(((x) & RTC_CALR_CEN_M) >> RTC_CALR_CEN_S) +#define RTC_CALR_YEAR_M 0x0000ff00UL +#define RTC_CALR_YEAR_S 8 +#define RTC_CALR_YEAR(x) FROMBCD(((x) & RTC_CALR_YEAR_M) >> RTC_CALR_YEAR_S) +#define RTC_CALR_MON_M 0x001f0000UL +#define RTC_CALR_MON_S 16 +#define RTC_CALR_MON(x) FROMBCD(((x) & RTC_CALR_MON_M) >> RTC_CALR_MON_S) +#define RTC_CALR_DOW_M 0x00d0000UL +#define RTC_CALR_DOW_S 21 +#define RTC_CALR_DOW(x) FROMBCD(((x) & RTC_CALR_DOW_M) >> RTC_CALR_DOW_S) +#define RTC_CALR_DAY_M 0x3f00000UL +#define RTC_CALR_DAY_S 24 +#define RTC_CALR_DAY(x) FROMBCD(((x) & RTC_CALR_DAY_M) >> RTC_CALR_DAY_S) +#define RTC_CALR_MK(yr, mon, day, dow) \ + ((TOBCD((yr) / 100 + 19) << RTC_CALR_CENTURY_S) | \ + (TOBCD((yr) % 100) << RTC_CALR_YEAR_S) | \ + (TOBCD(mon) << RTC_CALR_MON_S) | \ + (TOBCD(dow) << RTC_CALR_DOW_S) | \ + (TOBCD(day) << RTC_CALR_DAY_S)) #endif /* ARM_AT91_AT91_RTCREG_H */ From owner-p4-projects@FreeBSD.ORG Fri Mar 24 06:45:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C282116A425; Fri, 24 Mar 2006 06:45:06 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2CF516A420 for ; Fri, 24 Mar 2006 06:45:06 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C8AD43D46 for ; Fri, 24 Mar 2006 06:45:06 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2O6j6Mu058331 for ; Fri, 24 Mar 2006 06:45:06 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2O6j61I058328 for perforce@freebsd.org; Fri, 24 Mar 2006 06:45:06 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Mar 2006 06:45:06 GMT Message-Id: <200603240645.k2O6j61I058328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93918 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 06:45:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=93918 Change 93918 by imp@imp_Speedy on 2006/03/24 06:44:52 If mnt_time is set, use it in preference to the RTC clock if they are more than 2 days off. This restores 4.2 behavior that was lost along the way. # alas, nfs doesn't set this. Affected files ... .. //depot/projects/arm/src/sys/kern/subr_clock.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/kern/subr_clock.c#2 (text+ko) ==== @@ -254,7 +254,8 @@ void inittodr(time_t base) { - struct timespec diff, ref, ts; + time_t deltat; + struct timespec ref, ts; int error; if (base) { @@ -282,17 +283,18 @@ ts.tv_sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); - if (timespeccmp(&ref, &ts, >)) { - diff = ref; - timespecsub(&ref, &ts); - } else { - diff = ts; - timespecsub(&diff, &ref); - } - if (ts.tv_sec >= 2) { - /* badly off, adjust it */ + deltat = ts.tv_sec - base; + if (deltat < 0) + deltat = -deltat; + if (deltat < 2 * SECDAY || base == 0) { tc_setclock(&ts); + return; } + + printf("WARNING: clock %s %d days", + ts.tv_sec < base ? "lost" : "gained", (int)(deltat / SECDAY)); + + printf(" -- CHECK AND RESET THE DATE!\n"); } /* From owner-p4-projects@FreeBSD.ORG Fri Mar 24 06:46:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F37516A420; Fri, 24 Mar 2006 06:46:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F7D116A400 for ; Fri, 24 Mar 2006 06:46:08 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E7CB43D45 for ; Fri, 24 Mar 2006 06:46:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2O6k8DW058381 for ; Fri, 24 Mar 2006 06:46:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2O6k72O058378 for perforce@freebsd.org; Fri, 24 Mar 2006 06:46:07 GMT (envelope-from imp@freebsd.org) Date: Fri, 24 Mar 2006 06:46:07 GMT Message-Id: <200603240646.k2O6k72O058378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 93919 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 06:46:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=93919 Change 93919 by imp@imp_Speedy on 2006/03/24 06:45:21 report errors in some 'can't happen' cases to make sure that they are noticed. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#14 (text+ko) ==== @@ -201,11 +201,14 @@ struct at91_ivar *ivar; kid = device_add_child_ordered(dev, prio, name, unit); - if (kid == NULL) - return; + if (kid == NULL) { + printf("Can't add child %s%d ordered\n", name, unit); + return; + } ivar = malloc(sizeof(*ivar), M_DEVBUF, M_WAITOK | M_ZERO); if (ivar == NULL) { device_delete_child(dev, kid); + printf("Can't add alloc ivar\n"); return; } device_set_ivars(kid, ivar); From owner-p4-projects@FreeBSD.ORG Fri Mar 24 18:11:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72F8216A424; Fri, 24 Mar 2006 18:11:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4DE2516A400 for ; Fri, 24 Mar 2006 18:11:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C39B243D6E for ; Fri, 24 Mar 2006 18:11:50 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OIBnOb006428 for ; Fri, 24 Mar 2006 18:11:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OIBnLK006425 for perforce@freebsd.org; Fri, 24 Mar 2006 18:11:49 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Mar 2006 18:11:49 GMT Message-Id: <200603241811.k2OIBnLK006425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 18:11:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=93936 Change 93936 by kmacy@kmacy_storage:sun4vtmp on 2006/03/24 18:11:33 adjust reserved range so dev_mondo lines up correctly Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#38 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#38 (text+ko) ==== @@ -325,13 +325,14 @@ .macro cpu_mondo MAGIC_TRAP_ON - MAGIC_EXIT + ba,a,pt %xcc, cpu_mondo .align 32 .endm .macro dev_mondo MAGIC_TRAP_ON MAGIC_EXIT + ba,a,pt %xcc, dev_mondo .align 32 .endm @@ -667,7 +668,7 @@ tl0_reserved 9 ! 0x63-0x6b tl0_data_prot_6c: data_prot ! 0x6c - tl0_reserved 8 ! 0x6d-0x75 + tl0_reserved 9 ! 0x6d-0x75 tl0_breakpoint_76: tl0_gen T_BREAKPOINT ! 0x76 tl0_reserved 5 ! 0x77-0x7b @@ -1214,7 +1215,7 @@ be,pn %xcc, tl1_trap nop - MAGIC_TRAP_OFF +! MAGIC_TRAP_OFF rdpr %tstate, %g5 btst TSTATE_PRIV, %g5 and %g5, TSTATE_CWP_MASK, %g6 From owner-p4-projects@FreeBSD.ORG Fri Mar 24 18:12:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24D6B16A432; Fri, 24 Mar 2006 18:12:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E003016A429 for ; Fri, 24 Mar 2006 18:12:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 994AE43D48 for ; Fri, 24 Mar 2006 18:12:51 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OICpX7006475 for ; Fri, 24 Mar 2006 18:12:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OICpAP006472 for perforce@freebsd.org; Fri, 24 Mar 2006 18:12:51 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Mar 2006 18:12:51 GMT Message-Id: <200603241812.k2OICpAP006472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 18:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=93937 Change 93937 by kmacy@kmacy_storage:sun4vtmp on 2006/03/24 18:12:50 nexus for virtual devices Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vnex.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Mar 24 18:13:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5E2116A423; Fri, 24 Mar 2006 18:13:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD6C216A401 for ; Fri, 24 Mar 2006 18:13:53 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7254043D46 for ; Fri, 24 Mar 2006 18:13:53 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OIDrFi006523 for ; Fri, 24 Mar 2006 18:13:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OIDri0006520 for perforce@freebsd.org; Fri, 24 Mar 2006 18:13:53 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Mar 2006 18:13:53 GMT Message-Id: <200603241813.k2OIDri0006520@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 18:13:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=93938 Change 93938 by kmacy@kmacy_storage:sun4vtmp on 2006/03/24 18:13:23 hook simdisk into vnex Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /*- - * Copyright (C) 2002 Benno Rice - * Copyright (C) 2006 Kip Macy + * Copyright (c) 2006 Kip Macy + * Copyright (c) 2001 Benno Rice * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -13,28 +13,22 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. * - * - */ - - -/* This is pretty much a rip-off of ofw_disk - it only works on the simulator - * so odds are it will be put out to pasture in a week or two + * $ Exp $ */ - - #include -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_disk.c,v 1.18 2005/10/31 03:09:38 grehan Exp $"); +__FBSDID("$$"); #include #include @@ -52,6 +46,11 @@ #include +#include +#include +#include + + #include #define HVD_BLOCKSIZE 512 @@ -139,9 +138,6 @@ curthread->td_base_pri = PRIBIO; for (;;) { -#if 0 - printf("in hvd_kthread\n"); -#endif mtx_lock(&sc->hvd_queue_mtx); bp = bioq_takefirst(&sc->hvd_bio_queue); if (!bp) { @@ -218,3 +214,40 @@ return (ENXIO); return (0); } + +static int +hvd_probe(device_t dev) +{ + + if (strcmp(ofw_bus_get_name(dev), "disk")) + return (ENXIO); + + device_set_desc(dev, "sun4v virtual disk"); + + return (0); +} + + +static int +hvd_attach(device_t dev) +{ + return (0); +} + +static device_method_t hvd_methods[] = { + DEVMETHOD(device_probe, hvd_probe), + DEVMETHOD(device_attach, hvd_attach), + {0, 0} +}; + + +static driver_t hvd_driver = { + "hvd", + hvd_methods, + 0, +}; + + +static devclass_t hvd_devclass; + +DRIVER_MODULE(hvd, vnex, hvd_driver, hvd_devclass, 0, 0); From owner-p4-projects@FreeBSD.ORG Fri Mar 24 18:16:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADB3A16A427; Fri, 24 Mar 2006 18:16:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75E5E16A426 for ; Fri, 24 Mar 2006 18:16:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7301B43D7B for ; Fri, 24 Mar 2006 18:15:56 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OIFuJM006671 for ; Fri, 24 Mar 2006 18:15:56 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OIFuIh006668 for perforce@freebsd.org; Fri, 24 Mar 2006 18:15:56 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 24 Mar 2006 18:15:56 GMT Message-Id: <200603241815.k2OIFuIh006668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 18:16:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=93939 Change 93939 by kmacy@kmacy_storage:sun4vtmp on 2006/03/24 18:15:35 re-label data identifiers to correspond to trap table entries so %tt can be used to recover trap type Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/trap.h#5 (text+ko) ==== @@ -31,7 +31,9 @@ #ifdef _KERNEL +#define T_DATA_MISS 0x31 #define T_ALIGNMENT 0x34 +#define T_DATA_PROTECTION 0x6c #define T_RESERVED 0 #define T_INSTRUCTION_EXCEPTION 1 @@ -47,7 +49,7 @@ #define T_DIVISION_BY_ZERO 11 #define T_DATA_EXCEPTION 12 #define T_DATA_ERROR 13 -#define T_DATA_PROTECTION 14 + #define T_MEM_ADDRESS_NOT_ALIGNED 15 #define T_PRIVILEGED_ACTION 16 #define T_ASYNC_DATA_ERROR 17 @@ -68,7 +70,7 @@ #define T_TRAP_INSTRUCTION_30 32 #define T_TRAP_INSTRUCTION_31 33 #define T_INSTRUCTION_MISS 34 -#define T_DATA_MISS 35 + #define T_INTERRUPT 36 #define T_PA_WATCHPOINT 37 @@ -89,7 +91,7 @@ #define T_MAX (T_KSTACK_FAULT + 1) -#define T_KERNEL 64 +#define T_KERNEL 0x100 #define PTL1_BAD_DEBUG 0 #define PTL1_BAD_WTRAP 1 From owner-p4-projects@FreeBSD.ORG Fri Mar 24 19:58:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAA016A423; Fri, 24 Mar 2006 19:58:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DE4A16A422 for ; Fri, 24 Mar 2006 19:58:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2977343D53 for ; Fri, 24 Mar 2006 19:58:01 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OJw1ai010590 for ; Fri, 24 Mar 2006 19:58:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OJw006010587 for perforce@freebsd.org; Fri, 24 Mar 2006 19:58:00 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Mar 2006 19:58:00 GMT Message-Id: <200603241958.k2OJw006010587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 19:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=93943 Change 93943 by jhb@jhb_slimer on 2006/03/24 19:57:35 Force the TD_IS_RUNNING check in the adaptive spin to treat td_state as volatile. On amd64 the compiler was caching the value of td_state in a register. :( Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#119 edit .. //depot/projects/smpng/sys/sys/proc.h#167 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#119 (text+ko) ==== @@ -551,8 +551,14 @@ if (m != &Giant && TD_IS_RUNNING(owner)) { #endif turnstile_release(&m->mtx_object); + + /* + * Inline expansion of TD_IS_RUNNING(owner) to + * force volatile. + */ while (mtx_rawowner(m) == owner && - TD_IS_RUNNING(owner)) { + (volatile enum _td_state)owner->td_state == + TDS_RUNNING) { cpu_spinwait(); } continue; ==== //depot/projects/smpng/sys/sys/proc.h#167 (text+ko) ==== @@ -311,7 +311,7 @@ * or already have been set in the allocator, constructor, etc. */ struct pcb *td_pcb; /* (k) Kernel VA of pcb and kstack. */ - enum { + enum _td_state { TDS_INACTIVE = 0x0, TDS_INHIBITED, TDS_CAN_RUN, From owner-p4-projects@FreeBSD.ORG Fri Mar 24 20:43:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D30BD16A422; Fri, 24 Mar 2006 20:43:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F1D116A401 for ; Fri, 24 Mar 2006 20:43:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BC5C43D46 for ; Fri, 24 Mar 2006 20:43:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OKhv0Q012267 for ; Fri, 24 Mar 2006 20:43:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OKhvZX012264 for perforce@freebsd.org; Fri, 24 Mar 2006 20:43:57 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Mar 2006 20:43:57 GMT Message-Id: <200603242043.k2OKhvZX012264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 20:43:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=93945 Change 93945 by jhb@jhb_twclab on 2006/03/24 20:43:26 The volatile cast didn't work on amd64 for some reason (gcc bug?). Just make the td_state member of struct thread volatile. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#120 edit .. //depot/projects/smpng/sys/sys/proc.h#168 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#120 (text+ko) ==== @@ -551,14 +551,8 @@ if (m != &Giant && TD_IS_RUNNING(owner)) { #endif turnstile_release(&m->mtx_object); - - /* - * Inline expansion of TD_IS_RUNNING(owner) to - * force volatile. - */ while (mtx_rawowner(m) == owner && - (volatile enum _td_state)owner->td_state == - TDS_RUNNING) { + TD_IS_RUNNING(owner)) { cpu_spinwait(); } continue; ==== //depot/projects/smpng/sys/sys/proc.h#168 (text+ko) ==== @@ -311,7 +311,7 @@ * or already have been set in the allocator, constructor, etc. */ struct pcb *td_pcb; /* (k) Kernel VA of pcb and kstack. */ - enum _td_state { + volatile enum { TDS_INACTIVE = 0x0, TDS_INHIBITED, TDS_CAN_RUN, From owner-p4-projects@FreeBSD.ORG Fri Mar 24 21:24:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1125C16A422; Fri, 24 Mar 2006 21:24:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD0FE16A400 for ; Fri, 24 Mar 2006 21:24:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 771D143D5F for ; Fri, 24 Mar 2006 21:24:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OLOlpX022323 for ; Fri, 24 Mar 2006 21:24:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OLOlf2022320 for perforce@freebsd.org; Fri, 24 Mar 2006 21:24:47 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Mar 2006 21:24:47 GMT Message-Id: <200603242124.k2OLOlf2022320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 93947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2006 21:24:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=93947 Change 93947 by jhb@jhb_twclab on 2006/03/24 21:23:46 After some help from Peter, make td_state non volatile again and apply the correct magic to make the one check in the adaptive spin treat td_state as volatile. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#121 edit .. //depot/projects/smpng/sys/sys/proc.h#169 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#121 (text+ko) ==== @@ -551,8 +551,16 @@ if (m != &Giant && TD_IS_RUNNING(owner)) { #endif turnstile_release(&m->mtx_object); + + /* + * Expanded TD_IS_RUNNING so that we could force + * the compiler to not cache owner->td_state. + * Otherwise, we wouldn't notice when the owning + * thread stopped running. + */ while (mtx_rawowner(m) == owner && - TD_IS_RUNNING(owner)) { + ((volatile struct thread *)owner)->td_state == + TDS_RUNNING) { cpu_spinwait(); } continue; ==== //depot/projects/smpng/sys/sys/proc.h#169 (text+ko) ==== @@ -311,7 +311,7 @@ * or already have been set in the allocator, constructor, etc. */ struct pcb *td_pcb; /* (k) Kernel VA of pcb and kstack. */ - volatile enum { + enum { TDS_INACTIVE = 0x0, TDS_INHIBITED, TDS_CAN_RUN, From owner-p4-projects@FreeBSD.ORG Sat Mar 25 00:45:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FB6C16A420; Sat, 25 Mar 2006 00:45:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C55EB16A401 for ; Sat, 25 Mar 2006 00:45:54 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C54A43D48 for ; Sat, 25 Mar 2006 00:45:54 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2P0jslg031280 for ; Sat, 25 Mar 2006 00:45:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2P0jrj7031277 for perforce@freebsd.org; Sat, 25 Mar 2006 00:45:53 GMT (envelope-from peter@freebsd.org) Date: Sat, 25 Mar 2006 00:45:53 GMT Message-Id: <200603250045.k2P0jrj7031277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 93954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 00:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=93954 Change 93954 by peter@peter_daintree on 2006/03/25 00:45:06 IFC @93953 Affected files ... .. //depot/projects/hammer/bin/ls/cmp.c#7 integrate .. //depot/projects/hammer/bin/ls/extern.h#8 integrate .. //depot/projects/hammer/bin/ls/ls.1#25 integrate .. //depot/projects/hammer/bin/ls/ls.c#17 integrate .. //depot/projects/hammer/bin/ls/ls.h#6 integrate .. //depot/projects/hammer/bin/ls/print.c#16 integrate .. //depot/projects/hammer/bin/ls/util.c#11 integrate .. //depot/projects/hammer/contrib/opie/opiepasswd.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#12 integrate .. //depot/projects/hammer/contrib/sendmail/PGPKEYS#6 integrate .. //depot/projects/hammer/contrib/sendmail/README#4 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#10 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#9 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/Makefile#4 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/knecht.mc#3 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#10 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/feature/mtamark.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#9 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#10 integrate .. //depot/projects/hammer/contrib/sendmail/cf/ostype/darwin.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/sendmail.schema#4 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/Makefile#3 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#9 integrate .. //depot/projects/hammer/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#10 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/ldap.h#3 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/time.h#1 branch .. //depot/projects/hammer/contrib/sendmail/libmilter/README#5 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/smfi_stop.html#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/docs/xxfi_helo.html#4 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/libmilter.h#6 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/listener.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/signal.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/smfi.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/Makefile.m4#5 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/b-strcmp.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/b-strl.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/clock.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/fclose.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/fflush.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/fopen.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/fpos.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/fseek.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/local.h#5 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/memstat.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/refill.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/sem.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/shm.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/signal.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/stdio.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/strio.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/t-event.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/t-memstat.c#1 branch .. //depot/projects/hammer/contrib/sendmail/libsm/t-sem.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ungetc.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/vfprintf.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/vfscanf.c#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/README#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/TRACEFLAGS#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#11 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.h#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/daemon.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/envelope.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/helpfile#3 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/map.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/mci.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/mime.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/sfsasl.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/sfsasl.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#10 integrate .. //depot/projects/hammer/contrib/sendmail/src/timers.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/tls.c#8 integrate .. //depot/projects/hammer/contrib/sendmail/src/udb.c#5 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#9 integrate .. //depot/projects/hammer/contrib/sendmail/src/util.c#7 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#10 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#10 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#9 integrate .. //depot/projects/hammer/crypto/openssh/README#8 integrate .. //depot/projects/hammer/crypto/openssh/README.platform#4 integrate .. //depot/projects/hammer/crypto/openssh/README.tun#1 branch .. //depot/projects/hammer/crypto/openssh/acconfig.h#11 delete .. //depot/projects/hammer/crypto/openssh/aclocal.m4#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#10 integrate .. //depot/projects/hammer/crypto/openssh/auth-options.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#11 integrate .. //depot/projects/hammer/crypto/openssh/auth2-gss.c#5 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#11 integrate .. //depot/projects/hammer/crypto/openssh/bufaux.c#7 integrate .. //depot/projects/hammer/crypto/openssh/buildpkg.sh.in#3 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#11 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#11 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#8 integrate .. //depot/projects/hammer/crypto/openssh/cipher-aes.c#3 integrate .. //depot/projects/hammer/crypto/openssh/cipher-ctr.c#5 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#10 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#9 integrate .. //depot/projects/hammer/crypto/openssh/config.h#10 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#10 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#10 integrate .. //depot/projects/hammer/crypto/openssh/dns.c#5 integrate .. //depot/projects/hammer/crypto/openssh/dns.h#3 integrate .. //depot/projects/hammer/crypto/openssh/entropy.c#5 integrate .. //depot/projects/hammer/crypto/openssh/entropy.h#2 integrate .. //depot/projects/hammer/crypto/openssh/envpass.sh#2 delete .. //depot/projects/hammer/crypto/openssh/gss-genr.c#4 integrate .. //depot/projects/hammer/crypto/openssh/gss-serv-krb5.c#6 integrate .. //depot/projects/hammer/crypto/openssh/gss-serv.c#4 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.c#8 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#9 integrate .. //depot/projects/hammer/crypto/openssh/kex.c#6 integrate .. //depot/projects/hammer/crypto/openssh/kex.h#6 integrate .. //depot/projects/hammer/crypto/openssh/kexdh.c#3 integrate .. //depot/projects/hammer/crypto/openssh/kexdhc.c#3 integrate .. //depot/projects/hammer/crypto/openssh/kexdhs.c#3 integrate .. //depot/projects/hammer/crypto/openssh/kexgex.c#3 integrate .. //depot/projects/hammer/crypto/openssh/kexgexc.c#3 integrate .. //depot/projects/hammer/crypto/openssh/kexgexs.c#2 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#10 integrate .. //depot/projects/hammer/crypto/openssh/misc.c#9 integrate .. //depot/projects/hammer/crypto/openssh/misc.h#6 integrate .. //depot/projects/hammer/crypto/openssh/monitor.c#12 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#10 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#8 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/base64.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/basename.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bindresvport.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-asprintf.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-closefrom.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#9 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-snprintf.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/daemon.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/dirname.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getcwd.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getgrouplist.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getopt.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getrrsetbyname.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_aton.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntoa.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntop.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.c#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#8 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openssl-compat.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-tun.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-tun.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-uw.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.c#6 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.c#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/rresvport.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.c#7 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sigact.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sigact.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcat.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcpy.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strmode.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strsep.c#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strtoll.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strtonum.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strtoul.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-queue.h#5 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-tree.h#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.c#4 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/vis.h#4 integrate .. //depot/projects/hammer/crypto/openssh/opensshd.init.in#2 integrate .. //depot/projects/hammer/crypto/openssh/packet.c#10 integrate .. //depot/projects/hammer/crypto/openssh/progressmeter.c#7 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#10 integrate .. //depot/projects/hammer/crypto/openssh/readconf.h#9 integrate .. //depot/projects/hammer/crypto/openssh/regress/README.regress#5 integrate .. //depot/projects/hammer/crypto/openssh/regress/agent-getpeereid.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/forwarding.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/multiplex.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/reconfigure.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/scp-ssh-wrapper.sh#2 integrate .. //depot/projects/hammer/crypto/openssh/regress/scp.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/regress/test-exec.sh#8 integrate .. //depot/projects/hammer/crypto/openssh/regress/try-ciphers.sh#5 integrate .. //depot/projects/hammer/crypto/openssh/regress/yes-head.sh#3 integrate .. //depot/projects/hammer/crypto/openssh/scp.1#8 integrate .. //depot/projects/hammer/crypto/openssh/scp.c#10 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#10 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#8 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#9 integrate .. //depot/projects/hammer/crypto/openssh/session.c#13 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#10 integrate .. //depot/projects/hammer/crypto/openssh/sftp-common.h#4 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#8 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#9 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.1#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#12 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.1#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#9 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.1#6 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#11 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#8 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#10 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#12 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#12 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#10 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#7 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#10 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#10 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#13 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#13 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#14 integrate .. //depot/projects/hammer/crypto/openssh/version.h#13 integrate .. //depot/projects/hammer/etc/rc.d/serial#7 integrate .. //depot/projects/hammer/etc/rc.subr#33 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#27 integrate .. //depot/projects/hammer/lib/libc/inet/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/nameser/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#27 integrate .. //depot/projects/hammer/lib/libc/resolv/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#25 integrate .. //depot/projects/hammer/lib/libc/sys/mmap.2#8 integrate .. //depot/projects/hammer/lib/librt/aio.c#3 integrate .. //depot/projects/hammer/lib/libsm/Makefile#10 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_list.c#5 integrate .. //depot/projects/hammer/lib/libz/ChangeLog#4 integrate .. //depot/projects/hammer/lib/libz/FAQ#4 integrate .. //depot/projects/hammer/lib/libz/README#4 integrate .. //depot/projects/hammer/lib/libz/adler32.c#4 integrate .. //depot/projects/hammer/lib/libz/compress.c#4 integrate .. //depot/projects/hammer/lib/libz/crc32.c#4 integrate .. //depot/projects/hammer/lib/libz/deflate.c#4 integrate .. //depot/projects/hammer/lib/libz/deflate.h#4 integrate .. //depot/projects/hammer/lib/libz/example.c#4 integrate .. //depot/projects/hammer/lib/libz/gzio.c#5 integrate .. //depot/projects/hammer/lib/libz/infback.c#4 integrate .. //depot/projects/hammer/lib/libz/inffast.c#4 integrate .. //depot/projects/hammer/lib/libz/inflate.c#5 integrate .. //depot/projects/hammer/lib/libz/inflate.h#2 integrate .. //depot/projects/hammer/lib/libz/inftrees.c#5 integrate .. //depot/projects/hammer/lib/libz/inftrees.h#4 integrate .. //depot/projects/hammer/lib/libz/minigzip.c#4 integrate .. //depot/projects/hammer/lib/libz/trees.c#4 integrate .. //depot/projects/hammer/lib/libz/zconf.h#4 integrate .. //depot/projects/hammer/lib/libz/zlib.3#5 integrate .. //depot/projects/hammer/lib/libz/zlib.h#4 integrate .. //depot/projects/hammer/lib/libz/zutil.c#4 integrate .. //depot/projects/hammer/lib/libz/zutil.h#4 integrate .. //depot/projects/hammer/release/Makefile#85 integrate .. //depot/projects/hammer/sbin/gvinum/gvinum.8#2 integrate .. //depot/projects/hammer/sbin/gvinum/gvinum.c#6 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#16 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_cmds.c#5 integrate .. //depot/projects/hammer/share/examples/scsi_target/scsi_target.c#5 integrate .. //depot/projects/hammer/share/man/man3/queue.3#7 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#28 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#9 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#31 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/hammer/sys/arm/at91/files.at91#3 integrate .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#24 integrate .. //depot/projects/hammer/sys/conf/files#140 integrate .. //depot/projects/hammer/sys/dev/aha/aha_isa.c#14 integrate .. //depot/projects/hammer/sys/dev/aha/aha_mca.c#10 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#22 integrate .. //depot/projects/hammer/sys/dev/mii/miidevs#11 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#41 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#40 integrate .. //depot/projects/hammer/sys/dev/sound/pci/atiixp.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#29 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#20 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/hid.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/hammer/sys/gdb/gdb_cons.c#1 branch .. //depot/projects/hammer/sys/gdb/gdb_int.h#3 integrate .. //depot/projects/hammer/sys/gdb/gdb_main.c#6 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#15 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#9 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#55 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#53 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#53 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#44 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#67 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#58 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#41 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#24 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#25 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#8 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#9 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#9 integrate .. //depot/projects/hammer/sys/netipx/README#5 integrate .. //depot/projects/hammer/sys/netipx/ipx_input.c#9 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#12 integrate .. //depot/projects/hammer/sys/netipx/ipx_pcb.c#7 integrate .. //depot/projects/hammer/sys/netipx/ipx_pcb.h#4 integrate .. //depot/projects/hammer/sys/netipx/spx_usrreq.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#36 integrate .. //depot/projects/hammer/sys/pci/if_rlreg.h#21 integrate .. //depot/projects/hammer/sys/sys/aio.h#4 integrate .. //depot/projects/hammer/sys/sys/clock.h#2 integrate .. //depot/projects/hammer/sys/sys/syscall.h#52 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#52 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#52 integrate .. //depot/projects/hammer/usr.sbin/rtadvd/config.c#10 integrate .. //depot/projects/hammer/usr.sbin/snapinfo/snapinfo.8#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#17 integrate Differences ... ==== //depot/projects/hammer/bin/ls/cmp.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.17 2005/06/03 11:05:58 dd Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/cmp.c,v 1.18 2006/03/24 16:38:02 jhb Exp $"); #include @@ -115,6 +115,32 @@ } int +birthcmp(const FTSENT *a, const FTSENT *b) +{ + + if (b->fts_statp->st_birthtimespec.tv_sec > + a->fts_statp->st_birthtimespec.tv_sec) + return (1); + if (b->fts_statp->st_birthtimespec.tv_sec < + a->fts_statp->st_birthtimespec.tv_sec) + return (-1); + if (b->fts_statp->st_birthtimespec.tv_nsec > + a->fts_statp->st_birthtimespec.tv_nsec) + return (1); + if (b->fts_statp->st_birthtimespec.tv_nsec < + a->fts_statp->st_birthtimespec.tv_nsec) + return (-1); + return (strcoll(a->fts_name, b->fts_name)); +} + +int +revbirthcmp(const FTSENT *a, const FTSENT *b) +{ + + return (birthcmp(b, a)); +} + +int statcmp(const FTSENT *a, const FTSENT *b) { ==== //depot/projects/hammer/bin/ls/extern.h#8 (text+ko) ==== @@ -27,11 +27,13 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.24 2005/06/03 11:05:58 dd Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.25 2006/03/24 16:38:02 jhb Exp $ */ int acccmp(const FTSENT *, const FTSENT *); int revacccmp(const FTSENT *, const FTSENT *); +int birthcmp(const FTSENT *, const FTSENT *); +int revbirthcmp(const FTSENT *, const FTSENT *); int modcmp(const FTSENT *, const FTSENT *); int revmodcmp(const FTSENT *, const FTSENT *); int namecmp(const FTSENT *, const FTSENT *); ==== //depot/projects/hammer/bin/ls/ls.1#25 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.95 2005/11/17 12:15:23 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.98 2006/03/24 17:09:02 jhb Exp $ .\" .Dd November 16, 2005 .Dt LS 1 @@ -40,7 +40,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1 +.Op Fl ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1 .Op Ar .Sh DESCRIPTION For each operand that names a @@ -149,6 +149,8 @@ .Dq ell ) option, display complete time information for the file, including month, day, hour, minute, second, and year. +.It Fl U +Use time when file was created for sorting or printing. .It Fl W Display whiteouts when scanning directories. .It Fl Z @@ -263,11 +265,18 @@ the format used. .Pp The -.Fl c +.Fl c , u , +and +.Fl U +options all override each other; the last one specified determines +the file time used. +.Pp +The +.Fl S and -.Fl u +.Fl t options override each other; the last one specified determines -the file time used. +the sort order used. .Pp The .Fl B , b , w , ==== //depot/projects/hammer/bin/ls/ls.c#17 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.82 2005/11/16 07:13:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.85 2006/03/24 17:09:03 jhb Exp $"); #include #include @@ -104,6 +104,7 @@ /* flags */ int f_accesstime; /* use time of last access */ + int f_birthtime; /* use time of birth */ int f_flags; /* show flags associated with a file */ int f_humanval; /* show human-readable file sizes */ int f_inode; /* print inode */ @@ -178,7 +179,7 @@ fts_options = FTS_PHYSICAL; while ((ch = getopt(argc, argv, - "1ABCFGHILPRSTWZabcdfghiklmnopqrstuwx")) != -1) { + "1ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx")) != -1) { switch (ch) { /* * The -1, -C, -x and -l options all override each other so @@ -207,15 +208,22 @@ f_longform = 0; f_singlecol = 0; break; - /* The -c and -u options override each other. */ + /* The -c, -u, and -U options override each other. */ case 'c': f_statustime = 1; f_accesstime = 0; + f_birthtime = 0; break; case 'u': f_accesstime = 1; f_statustime = 0; + f_birthtime = 0; break; + case 'U': + f_birthtime = 1; + f_accesstime = 0; + f_statustime = 0; + break; case 'F': f_type = 1; f_slash = 0; @@ -296,11 +304,14 @@ case 'T': f_sectime = 1; break; + /* The -t and -S options override each other. */ case 't': f_timesort = 1; + f_sizesort = 0; break; case 'S': f_sizesort = 1; + f_timesort = 0; break; case 'W': f_whiteout = 1; @@ -408,23 +419,27 @@ if (f_reversesort) { if (!f_timesort && !f_sizesort) sortfcn = revnamecmp; + else if (f_sizesort) + sortfcn = revsizecmp; else if (f_accesstime) sortfcn = revacccmp; + else if (f_birthtime) + sortfcn = revbirthcmp; else if (f_statustime) sortfcn = revstatcmp; - else if (f_sizesort) - sortfcn = revsizecmp; else /* Use modification time. */ sortfcn = revmodcmp; } else { if (!f_timesort && !f_sizesort) sortfcn = namecmp; + else if (f_sizesort) + sortfcn = sizecmp; else if (f_accesstime) sortfcn = acccmp; + else if (f_birthtime) + sortfcn = birthcmp; else if (f_statustime) sortfcn = statcmp; - else if (f_sizesort) - sortfcn = sizecmp; else /* Use modification time. */ sortfcn = modcmp; } ==== //depot/projects/hammer/bin/ls/ls.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.21 2005/01/10 08:39:23 imp Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.22 2006/03/24 16:38:02 jhb Exp $ */ #define NO_PRINT 1 @@ -38,6 +38,7 @@ extern long blocksize; /* block size units */ extern int f_accesstime; /* use time of last access */ +extern int f_birthtime; /* use time of file creation */ extern int f_flags; /* show flags associated with a file */ extern int f_humanval; /* show human-readable file sizes */ extern int f_label; /* show MAC label */ ==== //depot/projects/hammer/bin/ls/print.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.74 2005/01/10 08:39:23 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.75 2006/03/24 16:38:02 jhb Exp $"); #include #include @@ -190,6 +190,8 @@ printsize(dp->s_size, sp->st_size); if (f_accesstime) printtime(sp->st_atime); + else if (f_birthtime) + printtime(sp->st_birthtime); else if (f_statustime) printtime(sp->st_ctime); else ==== //depot/projects/hammer/bin/ls/util.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.39 2005/11/16 07:13:37 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/util.c,v 1.40 2006/03/24 16:38:02 jhb Exp $"); #include #include @@ -222,9 +222,9 @@ { (void)fprintf(stderr, #ifdef COLORLS - "usage: ls [-ABCFGHILPRSTWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuwx1]" #else - "usage: ls [-ABCFHILPRSTWZabcdfghiklmnopqrstuwx1]" + "usage: ls [-ABCFHILPRSTUWZabcdfghiklmnopqrstuwx1]" #endif " [file ...]\n"); exit(1); ==== //depot/projects/hammer/contrib/opie/opiepasswd.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ Written at Bellcore for the S/Key Version 1 software distribution (skeyinit.c). - $FreeBSD: src/contrib/opie/opiepasswd.c,v 1.3 2002/03/21 23:42:52 markm Exp $ + $FreeBSD: src/contrib/opie/opiepasswd.c,v 1.4 2006/03/22 16:00:42 cperciva Exp $ */ #include "opie_cfg.h" @@ -118,11 +118,18 @@ struct opie opie; int rval, n = 499, i, mode = MODE_DEFAULT, force = 0; char seed[OPIE_SEED_MAX+1]; + char *username; + uid_t ruid; struct passwd *pp; memset(seed, 0, sizeof(seed)); - if (!(pp = getpwnam(getlogin()))) { + ruid = getuid(); + username = getlogin(); + pp = getpwnam(username); + if (username == NULL || pp == NULL || pp->pw_uid != ruid) + pp = getpwuid(ruid); + if (pp == NULL) { fprintf(stderr, "Who are you?"); return 1; } ==== //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#12 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.28 2005/06/07 04:22:21 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.29 2006/03/22 16:48:21 gshapiro Exp $ -sendmail 8.13.4 +sendmail 8.13.6 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.13.4' \ - src/contrib/sendmail SENDMAIL v8_13_4 + cvs import -m 'Import sendmail 8.13.6' \ + src/contrib/sendmail SENDMAIL v8_13_6 To make local changes to sendmail, simply patch and commit to the main @@ -93,4 +93,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -6-June-2005 +22-March-2006 ==== //depot/projects/hammer/contrib/sendmail/PGPKEYS#6 (text+ko) ==== @@ -89,6 +89,83 @@ -----END PGP PUBLIC KEY BLOCK----- Type Bits KeyID Created Expires Algorithm Use +pub 1024 0xAF959625 2005-12-31 ---------- RSA Sign & Encrypt +f16 Fingerprint16 = E3 F4 97 BC 9F DF 3F 1D 9B 0D DF D5 77 9A C9 79 +uid Sendmail Signing Key/2006 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.1 (OpenBSD) + +mQCNA0O3FKgAAAEEALUfKjFiXc8T2XS4C8N/jJQkProkzyl7mdN0xVKqokMy9/rx +nbji5dG7WlxyJX3jI9eypZV/d5+KpXljvyC+cBIxhhmsEhVT6AsOkxlg/Y8Gmb5Q +bn2mAiyeaylvcFeHLjBA+CaMByDms97M6FbiSzdXx6JtLP1Tdx57s8ivlZYlAAUR +tDFTZW5kbWFpbCBTaWduaW5nIEtleS8yMDA2IDxzZW5kbWFpbEBTZW5kbWFpbC5P +Ukc+iQCVAwUQQ7cUqB57s8ivlZYlAQEn6gQApe1I5DhI/Y+fwI8hjx7Ydd8LQ553 +CoBYnvoqrxybSZtOc3D7LHoKIb01R2hx71O282soxjL6N9SGnGQMcVPINXAcJ0Z0 +mTCpUZc+QtItS44R3aqp27q0C8FTt885/pkKT0cQM/9EjWRv3kI+f39gl+MwcA3I +AV4NJmTpi6ASzmmJAJUDBRBDtxYm71iWZNQy4Z0BAbnQA/wIfK6PT+zTefydUovI +G3dDLGGxMowpdG5yQwPwkAEIPFlbLhYsk8E9t8sLsLI1briqKaqxZkHo9ggPNkZU +6Kojwrs7imUZj4AMVL7HDqOlb+jHeYsg3yq/KzKIy3i1fmyUYA/cddSJOp3a0zjy +IISZ9VPR6/KaOj8cLKTQqZG6tYkAlQMFEEO3FjvBnB0lEtNGHQEBJWgD/RkJuAVQ +LL0cEe/VBUi4CmW3iGF+mAokJZn750ibVQg25SjDUc0UScxyvSnl8ehu3fjWmsEu +ckHbzBWkMx/cnCb7xG5Ve1HGgzsBjFpvcQUM07y4JCFOfTOl3WiYP311EKBp2tnL +2i/kdD1IVITswAEQ7XId1NBIuf4P71v16rj/iQCVAwUQQ7cWRL3aj9Y/6n39AQGO +uAQApQ5v6HZkgFNKT+SaXJOsqtk+xQQd19QfQQ2U13uaJ0nQ0i4O11WUTM9qfdWF +utTlDTZKeEdz+Zb67KnuIi8PHyMpBPV1BGvWNqeiEN0Q5TmkxmaXBXTWtGeHoWw4 +Jxaic4LdunSNDIpE0A9zfeaj9YJGX87I3KMf1DQ3h+FCRRWJAJUDBRBDtxZZfEtn +baAOFWMBAVi/A/0bQQvU747R5bMC0vQLRMVOtq6rDwNPlXoFhzW26AU2Pb+mKCkU +ugVqjFaAWm2ILxKvkjgDyfw6b62IvEK4rHJbfwH/FeIfi6e0+ye+TpXcCzXkARTm +FHld0IERIXpaUA6XarNlWfiqaZN0YLpCQH0M29kTFvIfyoUHn9LgvBLe1YkAlQMF +EEO3Fl9vUpPYo5umVQEBVtwEAIaSvlhM+gIKnlxN/1hpcG9639bLlUTkAt2gtn2w +4hPDZxMpblkQhcn3JcO9GD0BHNrV5qYBn3bLFwTG2FIoaROS4XyH8GPbEBWGNg9d +IGm3kLdLTWsRVCtlkLKE74ipiiaN8JhPRGAtFUjcDVSSkGNzw2jBHP0hrQEKga9R +wElSiQCVAwUQQ7cWepwcveLjXFY1AQFA/AP7BRC5j+Hed/B/RjbsbX3mxk4DprEh +6IijxC/2XAZbk1e25GspBO9Pbqs/2GufGCFX60Jj1FQJ2+vq8vg7chNNZ5XNEJse +6GrQtUx2/mEKMtvWGbWGSn53ET+AzmLne/u+f3bIh1OtXXro7w8OUkK9J+ZdG/9V +J/a0nYTlPUw6o3KJAJUDBRBDtxaE1uCh/k++Kt0BAf14BAC4mGT1gE0aoW8rn7kk +XJ3an4hThBZVuR2GS+rvwioEsIk2xe4NEFwJPGKmKq+C4vb0OWSiRev5l1fPx13x +tWDGcm2k3SukDOHB0le6gS0RQx/WHCTe/lRKiQ3w/IuhLmrDfmoOOkDj6KVb5fA0 +x0Uvd4ycXUPSoJcBq7dwNg0f8YkAlQMFEEO3Foo4IttHzDdPLQEB6N0D/3LRqVT4 +Dhw6UmDIre9Tag8EmqTu3R8wFTmmEYDQ+7CxW+ZbJyYEDZp/WU/6xmOE2TSHaFPQ +lgFEAaN1Cp4N9IXAM2EqeNK3fJOAsv4F5NOXbVtGJhyqG4aDUBZPvr/p123cpiiH +2yVIvHDkaacX1Tq/kECpKLj4k5D+dQYrUVdCiQCVAwUQQ7cWl4lpYrhnjAoDAQG9 +pQQAg78+p2O+g7qPh1dAMcnQrI1eW3fTntWbadoKPXO5oFr/n+a74Go0D9+8J9Tt +iW3C11KR3w1q+af5wp+viJfe8YDEwvm5gcmoCxPnwOeSAzdquujnQZRE5lynr6r7 +QzJOFZv457qzndC2P5qSODCkmVC6uAsRxo4Xq/zflzRXmzCJAJUDBRBDtxaeIYPh +sTlvB4kBAcvhA/9LBX9mskFW9IpA3Y5slRV1G2GFv0DXV79295p8OCKlZhEfk1y+ +JyvT2hdnseD3Id2cyoMlEk57gJBuDrKdjeOLBMIJ2lOKGE6dLAsywSYkyFnngXu7 +6QvoTS0mE+ahJlT9VDz79Jl6W+118cIeYzzt1TP8c1WkWBCJJcvge390BYkAlQMF +EEO3FqXI1e0plfYXcQEB7W0D/AjxxjEMuS3UedxXI8VQzTB2o3c0o5DdlK2SXgHP +SFxr9feksucCanCoYfuTWgxm/Ioy7cxtVNZT1dAHfn2MSrGN+2Adoep8E/o6PyiD +t3pCzowtXFS1wjq1j/MX5SJoDrGl0VT1sQXsWh2uOFaeMfH1w9/r9Zkl1RYXYOEn +/jkmiQCVAwUQQ7cWunCgJE0e+ZJRAQGTqgQAtdhMXLTw+tBCshX/CdLhrD0byRN5 +omeib2QWmxdi7Djyz1wbDMBhnssM3SHUj/kRiorTnjv7qU8TS4z9r9zXw9U7XjCO +T/CRepb3siiHzMU4KI5bxdg0ZAsauCVDel5MItT7OlK2Fjv4vCYam/jHGYXe6AEY +dbARTWInDsFK7VCJAJUDBRBDtxgXwCnKQBb0zOkBAQHXA/47Mvt5oI8f2JbOMLkV +E14upGU+zXYeWH7j9L4AYRzjl/Lg7tT+LBTjh+HEdl2UIMdYASrC6WbKEbatb4dr +nu/pxd7/QaeSMV00P9j+Cfa3uIWn6HFUi+TH5fkLwERfkcLHKZ5SshZal9KTbjzv +uwZsArnsNN0A/d1gUqljdDI/K4kAlQMFEEO7cAXPHrUDIjJ6AQEBYWMEAIJ5g1oG +cL28orl4J7SxhOMyQODgaPRHusnWTBsa/ufUugVSR0g+3a2Pzyuq9xWqYStHf50N +hdFx45JtPmkAiWuiBsyycVbBq/ursCeL2SCQPBCcbIfB+4BUbWoU62QA0a+sY5bW +mitsU1FB2Mxd7QWqIBW4jqwB0nsAVxShRdWliJwEEAECAAYFAkO7mAoACgkQ+IYW +ZdmHE1gcHAQAkMZ2julBDdx5TeQ3rrFus44snaHiq5exlN1wIJrVIhJzmOcHq5i5 +ysfoKSha0cYf6F+6kTFxNL/Y9mneisg+rWfgRYmHDzNvXcuyAY/g6rwkRoyVN70q +XhWXdY6nA29E5VH52pKCdjQgpbdyO6JDglLzfq7jVljCuPq8+PXqN+OIRgQQEQIA +BgUCQ7uYzAAKCRDEsQeYhXlqI6AlAJ48z/+X/bUYIu1yekM+Wa3uN1SgSQCePzZl +iV3/rvMdwqhHZPfM00GQQxOIRgQQEQIABgUCQ7vkHwAKCRAJp6JK0eWCB903AJ9x +Jkm4hmDjMy8+ynBwFrnKzmGUgQCdGoOE+xbNHN2kArmTHDvzd80yQAeJAJUDBRJD +u9CCXx7Ib4gMnlUBAfFkA/wP/qNyveNU4ZyJt+Ft/1xIYV4Gk/FJ4MOfpRlDYaN7 +z2FXCjXtWeoxEJ8hqtWUMBuQHSm5T49Zv7Tb+6jtflscL3E/Kz3nIIr3Tzu1iNIM +m3dzI37Qdk/7tnP2fp1fO2VbrQC7CtQTYODko6vTUSLap4+NWbidGNQMSEXAFfBK +2okAlQMFEEO776zh1PwU5tB0cQEBZrEEAMjAS0ahmy5KzFgRMrrI3RkrcKwi+Hnj +Vuw6UowvW7tUhIkdFuXpd/a2YczU2Enivu7uSJgUD/2KzurD60ahJjSkC/l8xDNs +v5wvbB+nYCOVDEvL32tvGiyLyT72MpkwT3ECYXFdlwpk2P7bk87tA9isuue0Nqvr +TlO5vpTGYrPoiEYEEBECAAYFAkO9OlsACgkQorv7JAz5Vve2KACdGpTb2FWBtvXB +cyIoyLoYGLWwtSYAoLDtcY9f816jYC3awv42YCMLuKuE +=bh1L +-----END PGP PUBLIC KEY BLOCK----- + +Type Bits KeyID Created Expires Algorithm Use pub 1024 0x1EF99251 2004-12-30 ---------- RSA Sign & Encrypt f16 Fingerprint16 = 4B 38 0E 0B 41 E8 FC 79 E9 7E 82 9B 04 23 EC 8A uid Sendmail Signing Key/2005 @@ -1094,4 +1171,4 @@ =dbDm -----END PGP PUBLIC KEY BLOCK----- -$Revision: 8.21 $, Last updated $Date: 2005/01/07 04:39:10 $ +$Revision: 8.23 $, Last updated $Date: 2006/01/07 01:07:21 $ ==== //depot/projects/hammer/contrib/sendmail/README#4 (text+ko) ==== @@ -3,17 +3,18 @@ This directory has the latest sendmail(TM) software from Sendmail, Inc. -Report any bugs to sendmail-bugs@sendmail.ORG +Report any bugs to sendmail-bugs-YYYY@support.sendmail.org +where YYYY is the current year, e.g., 2005. -There is a web site at http://WWW.Sendmail.ORG/ -- see that site for +There is a web site at http://www.sendmail.org/ -- see that site for the latest updates. +--------------+ | INTRODUCTION | +--------------+ -0. The vast majority of queries to - are answered in the README files noted below. +0. The vast majority of queries about sendmail are answered in the + README files noted below. 1. Read this README file, especially this introduction, and the DIRECTORY PERMISSIONS sections. @@ -463,4 +464,4 @@ test Some test scripts (currently only for compilation aids). vacation Source for the vacation program. NOT PART OF SENDMAIL! -$Revision: 8.91 $, Last updated $Date: 2002/11/09 23:33:07 $ +$Revision: 8.93 $, Last updated $Date: 2005/09/16 20:08:50 $ ==== //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#10 (text+ko) ==== @@ -1,11 +1,120 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1730 2005/03/28 00:31:23 gshapiro Exp $ + $Id: RELEASE_NOTES,v 8.1765 2006/03/08 02:15:03 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.13.6/8.13.6 2006/03/22 + SECURITY: Replace unsafe use of setjmp(3)/longjmp(3) in the server + and client side of sendmail with timeouts in the libsm I/O + layer and fix problems in that code. Also fix handling of + a buffer in sm_syslog() which could have been used as an + attack vector to exploit the unsafe handling of + setjmp(3)/longjmp(3) in combination with signals. + Problem detected by Mark Dowd of ISS X-Force. + Handle theoretical integer overflows that could triggered if + the server accepted headers larger than the maximum + (signed) integer value. This is prevented in the default + configuration by restricting the size of a header, and on + most machines memory allocations would fail before reaching + those values. Problems found by Phil Brass of ISS. + If a server returns 421 for an RSET command when trying to start + another transaction in a session while sending mail, do + not trigger an internal consistency check. Problem found + by Allan E Johannesen of Worcester Polytechnic Institute. + If a server returns a 5xy error code (other than 501) in response + to a STARTTLS command despite the fact that it advertised + STARTTLS and that the code is not valid according to RFC + 2487 treat it nevertheless as a permanent failure instead + of a protocol error (which has been changed to a + temporary error in 8.13.5). Problem reported by Jeff + A. Earickson of Colby College. + Clear SMTP state after a HELO/EHLO command. Patch from John + Myers of Proofpoint. + Observe MinQueueAge option when gathering entries from the queue + for sorting etc instead of waiting until the entries are + processed. Patch from Brian Fundakowski Feldman. + Set up TLS session cache to properly handle clients that try to + resume a stored TLS session. + Properly count the number of (direct) child processes such that + a configured value (MaxDaemonChildren) is not exceeded. + Based on patch from Attila Bruncsak. + LIBMILTER: Remove superfluous backslash in macro definition + (libmilter.h). Based on patch from Mike Kupfer of + Sun Microsystems. + LIBMILTER: Don't try to set SO_REUSEADDR on UNIX domain sockets. + This generates an error message from libmilter on + Solaris, though other systems appear to just discard the + request silently. + LIBMILTER: Deal with sigwait(2) implementations that return + -1 and set errno instead of returning an error code + directly. Patch from Chris Adams of HiWAAY Informations + Services. + Portability: + Fix compilation checks for closefrom(3) and statvfs(2) + in NetBSD. Problem noted by S. Moonesamy, patch from + Andrew Brown. + +8.13.5/8.13.5 2005/09/16 + Store the filesystem identifier of the df/ subdirectory (if it + exists) in an internal structure instead of the base + directory. This structure is used decide whether there + is enough free disk space when selecting a queue, hence + without this change queue selection could fail if a df/ + subdirectory exists and is on a different filesystem + than the base directory. + Use the queue index of the df file (instead of the qf file) for + checking whether a link(2) operation can be used to split + an envelope across queue groups. Problem found by + Werner Wiethege. + If the list of items in the queue is larger than the maximum + number of items to process, sort the queue first and + then cut the list off instead of the other way around. + Patch from Matej Vela of Rudjer Boskovic Institute. + Fix helpfile to show full entry for ETRN. Problem noted by + Penelope Fudd, patch from Neil Rickert of Northern Illinois + University. + FallbackSmartHost should also be tried on temporary errors. + From John Beck of Sun Microsystems. + When a server responds with 421 to the STARTTLS command then treat + it as a temporary error, not as protocol error. Problem + noted by Andrey J. Melnikoff. + Properly define two functions in libsm as static because their + prototype used static too. Patch from Peter Klein. + Fix syntax errors in helpfile for MAIL and RCPT commands. + LIBMILTER: When smfi_replacebody() is called with bodylen equals + zero then do not silently ignore that call. Patch from + Gurusamy Sarathy of Active State. + LIBMILTER: Recognize "421" also in a multi-line reply to terminate + the SMTP session with that error. Fix from Brian Kantor. + Portability: New option HASSNPRINTF which can be set if the OS + has a properly working snprintf(3) to get rid + of the last two (safe) sprintf(3) calls in the + source code. + Add support for AIX 5.3. + Add support for SunOS 5.11 (aka Solaris 11). + Add support for Darwin 8.x. Patch from Lyndon Nerenberg. + OpenBSD 3.7 has removed support for NETISO. + CONFIG: Add OSTYPE(freebsd6) for FreeBSD 6.X. + Set DontBlameSendmail to AssumeSafeChown and + GroupWritableDirPathSafe for OSTYPE(darwin). + Patch from Lyndon Nerenberg. + Some features still used 4.7.1 as enhanced status code which + was supposed to be eliminated in 8.13.0 because some + broken systems misinterpret it as a permanent error. + Patch from Matej Vela of Rudjer Boskovic Institute. + Some default values in a generated cf file did not match + the defaults in the sendmail binary. Problem noted + by Mike Pechkin. + New Files: + cf/ostype/freebsd6.m4 + devtools/OS/AIX.5.3 + devtools/OS/Darwin.8.x + devtools/OS/SunOS.5.11 + include/sm/time.h + 8.13.4/8.13.4 2005/03/27 The bug fixes in 8.13.3 for connection handling uncovered a different error which could result in connections that ==== //depot/projects/hammer/contrib/sendmail/cf/README#9 (text+ko) ==== @@ -77,7 +77,7 @@ divert(-1) # - # Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. + # Copyright (c) 1998-2005 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -492,11 +492,12 @@ LOCAL_PROG_QGRP [undefined] The queue group for the prog mailer. Note: to tweak Name_MAILER_FLAGS use the macro MODIFY_MAILER_FLAGS: -MODIFY_MAILER_FLAGS(`Name', `change') where Name is the first part of -the macro Name_MAILER_FLAGS and change can be: flags that should -be used directly (thus overriding the default value), or if it -starts with `+' (`-') then those flags are added to (removed from) -the default value. Example: +MODIFY_MAILER_FLAGS(`Name', `change') where Name is the first part +of the macro Name_MAILER_FLAGS (note: that means Name is entirely in +upper case) and change can be: flags that should be used directly +(thus overriding the default value), or if it starts with `+' (`-') +then those flags are added to (removed from) the default value. +Example: MODIFY_MAILER_FLAGS(`LOCAL', `+e') @@ -958,7 +959,7 @@ virtusertable A domain-specific form of aliasing, allowing multiple virtual domains to be hosted on one machine. For example, - if the virtuser table contained: + if the virtuser table contains: info@foo.com foo-info info@bar.com bar-info @@ -1186,7 +1187,7 @@ Normally, MAIL FROM: commands in the SMTP session will be refused if the connection is a network connection and the sender address does not include a domain name. If your - setup sends local mail unqualified (i.e., MAIL FROM: ), + setup sends local mail unqualified (i.e., MAIL FROM:), you will need to use this feature to accept unqualified sender addresses. Setting the DaemonPortOptions modifier 'u' overrides the default behavior, i.e., unqualified @@ -1872,7 +1873,8 @@ See the file cf/sendmail.schema for the actual LDAP schemas. Note that this schema (and therefore the lookups and examples below) is experimental at this point as it has had little public review. Therefore, it may change -in future versions. Feedback via sendmail@sendmail.org is encouraged. +in future versions. Feedback via sendmail-YYYY@support.sendmail.org is +encouraged (replace YYYY with the current year, e.g., 2005). ------- Aliases @@ -2336,7 +2338,7 @@ FEATURE(`relay_local_from') will allow relaying if the sender specifies a return path (i.e. -MAIL FROM: ) domain which is a local domain. This is a +MAIL FROM:) domain which is a local domain. This is a dangerous feature as it will allow spammers to spam using your mail server by simply specifying a return address of user@your.domain.com. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Mar 25 04:12:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92E3E16A420; Sat, 25 Mar 2006 04:12:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5509916A41F for ; Sat, 25 Mar 2006 04:12:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F34C43D45 for ; Sat, 25 Mar 2006 04:12:02 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2P4C1vL046185 for ; Sat, 25 Mar 2006 04:12:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2P4C1XK046182 for perforce@freebsd.org; Sat, 25 Mar 2006 04:12:01 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Mar 2006 04:12:01 GMT Message-Id: <200603250412.k2P4C1XK046182@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 04:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=93956 Change 93956 by kmacy@kmacy_storage:sun4vtmp on 2006/03/25 04:11:19 add hypervisor virtual console driver Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hvcons.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Mar 25 04:16:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BE0916A41F; Sat, 25 Mar 2006 04:16:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA01A16A400 for ; Sat, 25 Mar 2006 04:16:07 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95A8C43D46 for ; Sat, 25 Mar 2006 04:16:07 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2P4G7gN046415 for ; Sat, 25 Mar 2006 04:16:07 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2P4G7WT046412 for perforce@freebsd.org; Sat, 25 Mar 2006 04:16:07 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Mar 2006 04:16:07 GMT Message-Id: <200603250416.k2P4G7WT046412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 04:16:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=93957 Change 93957 by kmacy@kmacy_storage:sun4vtmp on 2006/03/25 04:15:57 make sure ino is typesafe Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vnex.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/vnex.c#2 (text+ko) ==== @@ -244,7 +244,7 @@ cfg = SUN4V_REG_SPEC2CFG_HDL(reg); - if (hvio_intr_devino_to_sysino(cfg, ino, &ihdl) != H_EOK) { + if (hvio_intr_devino_to_sysino(cfg, (uint32_t)ino, &ihdl) != H_EOK) { error = ENXIO; goto fail; } From owner-p4-projects@FreeBSD.ORG Sat Mar 25 04:19:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B2DE16A422; Sat, 25 Mar 2006 04:19:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5499A16A41F for ; Sat, 25 Mar 2006 04:19:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E859C43D4C for ; Sat, 25 Mar 2006 04:19:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2P4JBvA046505 for ; Sat, 25 Mar 2006 04:19:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2P4JBnk046502 for perforce@freebsd.org; Sat, 25 Mar 2006 04:19:11 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Mar 2006 04:19:11 GMT Message-Id: <200603250419.k2P4JBnk046502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 04:19:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=93958 Change 93958 by kmacy@kmacy_storage:sun4vtmp on 2006/03/25 04:18:42 disable ofw_console and add hvcons.c disable WITNESS Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#9 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#5 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#9 (text+ko) ==== @@ -51,6 +51,8 @@ sun4v/sun4v/eeprom.c optional eeprom ebus | eeprom fhc | \ eeprom sbus sun4v/sun4v/gdb_machdep.c optional gdb +# XXX hvcons should be optional +sun4v/sun4v/hvcons.c standard sun4v/sun4v/hcall.S standard sun4v/sun4v/identcpu.c standard sun4v/sun4v/in_cksum.c optional inet @@ -80,3 +82,4 @@ sun4v/sun4v/trap.c standard sun4v/sun4v/uio_machdep.c standard sun4v/sun4v/vm_machdep.c standard +sun4v/sun4v/vnex.c standard ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#5 (text+ko) ==== @@ -65,8 +65,8 @@ options GDB # Support remote GDB. options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS # Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +#options WITNESS # Enable checks to detect deadlocks and cycles +#options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # To make an SMP kernel, the next line is needed #options SMP # Symmetric MultiProcessor Kernel @@ -111,7 +111,7 @@ #device splash # Splash screen and screen saver support #options KBD_INSTALL_CDEV # install a CDEV entry in /dev -device ofw_console # Open Firmware console device +#device ofw_console # Open Firmware console device # Builtin hardware #device auxio # auxiliary I/O device @@ -192,3 +192,6 @@ #device fwe # Ethernet over FireWire (non-standard!) options SIMULATOR # compile for ISA simulator +#options KTR +#options KTR_MASK=(KTR_TRAP) +#options DDB From owner-p4-projects@FreeBSD.ORG Sat Mar 25 04:20:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AC2F16A422; Sat, 25 Mar 2006 04:20:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5892D16A400 for ; Sat, 25 Mar 2006 04:20:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1EC043D45 for ; Sat, 25 Mar 2006 04:20:13 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2P4KDhd046608 for ; Sat, 25 Mar 2006 04:20:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2P4KDXD046605 for perforce@freebsd.org; Sat, 25 Mar 2006 04:20:13 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 25 Mar 2006 04:20:13 GMT Message-Id: <200603250420.k2P4KDXD046605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 04:20:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=93959 Change 93959 by kmacy@kmacy_storage:sun4vtmp on 2006/03/25 04:19:49 pull in initial {dev,cpu}_mondo implementation Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#15 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#39 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#4 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sparc64/sparc64/genassym.c#15 (text+ko) ==== @@ -205,9 +205,9 @@ ASSYM(PC_SIZEOF, sizeof(struct pcpu)); #ifdef SUN4V -ASSYM(PC_CPU_Q_BASE, offsetof(struct pcpu, pc_cpu_q_ra)); +ASSYM(PC_CPU_Q_RA, offsetof(struct pcpu, pc_cpu_q_ra)); ASSYM(PC_CPU_Q_SIZE, offsetof(struct pcpu, pc_cpu_q_size)); -ASSYM(PC_DEV_Q_BASE, offsetof(struct pcpu, pc_dev_q_ra)); +ASSYM(PC_DEV_Q_RA, offsetof(struct pcpu, pc_dev_q_ra)); ASSYM(PC_DEV_Q_SIZE, offsetof(struct pcpu, pc_dev_q_size)); ASSYM(PC_RQ_BASE, offsetof(struct pcpu, pc_rq_ra)); @@ -222,6 +222,7 @@ ASSYM(PC_CURPCB_RA, offsetof(struct pcpu, pc_curpcb_ra)); ASSYM(PCB_RA, offsetof(struct pcb, pcb_ra)); +ASSYM(INTR_REPORT_SIZE, INTR_REPORT_SIZE); #else ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/exception.S#39 (text+ko) ==== @@ -324,14 +324,11 @@ .endm .macro cpu_mondo - MAGIC_TRAP_ON ba,a,pt %xcc, cpu_mondo .align 32 .endm .macro dev_mondo - MAGIC_TRAP_ON - MAGIC_EXIT ba,a,pt %xcc, dev_mondo .align 32 .endm ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#4 (text+ko) ==== @@ -27,6 +27,8 @@ #include __FBSDID("$FreeBSD: src/sys/sparc64/sparc64/interrupt.S,v 1.8 2005/04/16 15:05:56 marius Exp $"); +#include "opt_simulator.h" +#include #include #include #include @@ -79,3 +81,267 @@ ba,a %xcc, 1b nop END(intr_fast) + +/* + * Running tally of invalid CPU mondo interrupts + */ +#if defined(lint) +uint64_t cpu_mondo_invalid; +#else /* lint */ + .data + .globl cpu_mondo_invalid + .align 8 +cpu_mondo_invalid: + .skip 8 + + .text +#endif /* lint */ + +#if defined(lint) +void +cpu_mondo(void) +{} +#else /* lint */ + +/* + * (TT 0x7c, TL>0) CPU Mondo Queue Handler + * Globals are the Interrupt Globals. + * + * Interrupts in sun4v are delivered to privileged code in the form + * of interrupt reports. Each interrupt report is 64-bytes long, + * consisting of 8 64-bit words. Each interrupt report is appended + * onto the appropriate interrupt queue of which there are currently two, + * one for CPU mondos (formerly referred to as cross trap function + * requests) and one for device mondos. Each queue has its own + * trap vector. + * + * New reports are appended onto the tail of the queue, and privileged + * code reads the report from the queue's head. The head pointer is stored + * in a register and is equal to the current offset from the base address + * of its associated queue. + * + * The structure of the cpu mondo report follows sun4u conventions: + * + * word 0: address of cross-trap handler + * word 1: first argument to handler + * word 2: second argument to handler + * word 3-7: unused + * + * Privileged code is responsible for incrementing the head pointer + * to remove each entry. The pointers are updated using modulo + * arithmetic such that the queue is empty when head == tail and is full + * when the addition of an entry would make head == tail. + * + * This trap handler is called when the cpu mondo queue becomes non-empty + * and will continue to be called while interrupts enabled until the + * queue becomes empty. + * + */ +ENTRY(cpu_mondo) + MAGIC_TRAP_ON + ! + ! Register Usage:- + ! %g5 PC for fasttrap TL>0 handler + ! %g1 arg 1 + ! %g2 arg 2 + ! %g3 queue base VA + ! %g4 queue size mask + ! %g6 head ptr + mov CPU_MONDO_QUEUE_HEAD, %g1 + ldxa [%g1]ASI_QUEUE, %g6 ! %g6 = head ptr + mov CPU_MONDO_QUEUE_TAIL, %g2 + ldxa [%g2]ASI_QUEUE, %g4 ! %g4 = tail ptr + cmp %g6, %g4 + be,pn %xcc, 0f ! head == tail + nop + + /* + * Get the address of the current CPU and index into + * the pcpu structure for the Q values. + */ + GET_PCPU_SCRATCH + ldx [PCPU(CPU_Q_RA)], %g3 ! %g3 = queue base PA + ldx [PCPU(CPU_Q_SIZE)], %g4 ! %g4 = queue size + sub %g4, 1, %g4 ! %g4 = queue size mask + + ! Load interrupt receive data registers 1 and 2 to fetch + ! the arguments for the fast trap handler. + ! + ! Since the data words in the interrupt report are not defined yet + ! we assume that the consective words contain valid data and preserve + ! sun4u's xcall mondo arguments. + ! Register usage: + ! %g5 PC for fasttrap TL>0 handler + ! %g1 arg 1 + ! %g2 arg 2 + + ldxa [%g3 + %g6]ASI_REAL, %g5 ! get PC from q base + head + add %g6, 0x8, %g6 ! inc head 8 bytes + ldxa [%g3 + %g6]ASI_REAL, %g1 ! read data word 1 + add %g6, 0x8, %g6 ! inc head 8 bytes + ldxa [%g3 + %g6]ASI_REAL, %g2 ! read data word 2 + add %g6, (INTR_REPORT_SIZE - 16) , %g6 + ! inc head to next record + + and %g6, %g4, %g6 ! and size mask for wrap around + mov CPU_MONDO_QUEUE_HEAD, %g3 + stxa %g6, [%g3]ASI_QUEUE ! store head pointer + membar #Sync + + /* + * For now catch invalid PC being passed via cpu_mondo queue + */ + set KERNBASE, %g4 + cmp %g5, %g4 + bl,a,pn %xcc, 1f ! branch if bad %pc + nop + + jmp %g5 ! jump to traphandler + nop +1: + ! invalid trap handler, discard it for now + set cpu_mondo_invalid, %g4 + ldx [%g4], %g5 + inc %g5 + stx %g5, [%g4] +0: + retry + /* NOTREACHED */ +END(cpu_mondo) + +#endif /* lint */ + + +#if defined(lint) +void +dev_mondo(void) +{} +#else /* lint */ + +/* + * (TT 0x7d, TL>0) Dev Mondo Queue Handler + * Globals are the Interrupt Globals. + * + * Device interrupt reports take the following form: + * Bits: 63 11 10 6 5 0 + * word 0: | zero | | bus port | | device ID | + * word 1-7: unused + * + */ +ENTRY(dev_mondo) + /* + * Register Usage:- + * %g5 inum + * %g1 ptr to intrerrupt vector entry for inum + * %g3 queue base PA + * %g4 queue size mask + * %g6 head ptr + */ + mov DEV_MONDO_QUEUE_HEAD, %g1 + ldxa [%g1]ASI_QUEUE, %g6 ! %g6 = head ptr + mov DEV_MONDO_QUEUE_TAIL, %g2 + ldxa [%g2]ASI_QUEUE, %g4 ! %g4 = tail ptr + cmp %g6, %g4 + be,pn %xcc, 0f ! head == tail + nop + + /* + * Get CPU address and index to Q base + */ + GET_PCPU_SCRATCH + ldx [PCPU(DEV_Q_RA)], %g3 ! %g3 = queue base PA + + /* + * Register usage: + * %g5 - inum + */ + ldxa [%g3 + %g6]ASI_REAL, %g5 ! %g5 = inum from q base + head + + /* + * We verify that inum is valid ( < IV_MAX). If it is greater + * than IV_MAX, we let the software interrupt handler take care + * of it. + */ + set IV_MAX, %g4 + cmp %g5, %g4 + bgeu,a,pn %xcc, 1f + ldx [PCPU(DEV_Q_SIZE)], %g4 ! queue size (delay slot) + + /* + * Find the function, argument and desired priority from the + * intr_vectors table + */ + set intr_vectors, %g1 + sll %g5, IV_SHIFT, %g2 + add %g1, %g2, %g1 ! %g1 = &intr_vectors[inum] + + /* + * Get an intr_request from the free list. There should always be one + * unless we are getting an interrupt storm from stray interrupts, in + * which case the we will dereference a NULL pointer and panic. + */ + ldx [PCPU(IRFREE)], %g2 ! %g2 = ptr to tail element + + /* + * Sun4v-fixme: It might be better to have the software interrupt + * handler deal with this scenario rather than just panic. + */ + !brz,a,pt %g2, 1f + !ldx [PCPU(DEV_Q_SIZE)], %g4 ! queue size (delay slot) + + ldx [%g2 + IR_NEXT], %g3 ! %g3 = next element in list + stx %g3, [PCPU(IRFREE)] ! %g3 is now the tail + + /* + * Store the vector number, function, argument, and priority. + */ + stw %g5, [%g2 + IR_VEC] + ldx [%g1 + IV_FUNC], %g3 ! %g3 = function ptr + stx %g3, [%g2 + IR_FUNC] + ldx [%g1 + IV_ARG], %g3 ! %g3 = argument ptr + stx %g3, [%g2 + IR_ARG] + lduw [%g1 + IV_PRI], %g1 ! %g1 = priority + stw %g1, [%g2 + IR_PRI] + + /* + * Link it onto the end of the active list + */ + stx %g0, [%g2 + IR_NEXT] + ldx [PCPU(IRTAIL)], %g3 ! %g3 = ptr to tail + stx %g2, [%g3] + add %g2, IR_NEXT, %g2 + stx %g2, [PCPU(IRTAIL)] + + /* + * Unlike Solaris, FreeBSD throws away the rest of the + * 64-byte packet. We may want to revisit this philosophy + * at some point since information in the packet is defined by + * the device and MAY be meaningful. + * + * For now, we retain FreeBSD's sun4u semantics. + */ + ldx [PCPU(DEV_Q_SIZE)], %g4 ! queue size + +1: sub %g4, 1, %g4 ! %g4 = queue size mask + add %g6, INTR_REPORT_SIZE, %g6 ! inc head to next record + and %g6, %g4, %g6 ! and mask for wrap around + mov DEV_MONDO_QUEUE_HEAD, %g3 + stxa %g6, [%g3]ASI_QUEUE ! increment head offset + membar #Sync + + /* + * Trigger a softint at the level indicated by the priority + */ + mov 1, %g6 + sllx %g6, %g1, %g6 + wr %g6, 0, %set_softint + + /* + * Done, retry the instruction + */ +0: retry + + /* NOTREACHED */ +END(dev_mondo) +#endif /* lint */ + From owner-p4-projects@FreeBSD.ORG Sat Mar 25 22:23:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C3AB16A423; Sat, 25 Mar 2006 22:23:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9BA616A401 for ; Sat, 25 Mar 2006 22:23:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C53643D46 for ; Sat, 25 Mar 2006 22:23:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2PMN4YI035350 for ; Sat, 25 Mar 2006 22:23:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2PMN3Wv035347 for perforce@freebsd.org; Sat, 25 Mar 2006 22:23:03 GMT (envelope-from jhb@freebsd.org) Date: Sat, 25 Mar 2006 22:23:03 GMT Message-Id: <200603252223.k2PMN3Wv035347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 94001 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2006 22:23:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=94001 Change 94001 by jhb@jhb_zion on 2006/03/25 22:22:54 Various VFS Giant locking for ndis, acct, alq, and ktrace. Affected files ... .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#36 edit .. //depot/projects/smpng/sys/kern/kern_acct.c#42 edit .. //depot/projects/smpng/sys/kern/kern_alq.c#10 edit .. //depot/projects/smpng/sys/kern/kern_ktrace.c#50 edit Differences ... ==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#36 (text+ko) ==== @@ -2899,7 +2899,7 @@ char *afilename = NULL; struct thread *td = curthread; struct nameidata nd; - int flags, error; + int flags, error, vfslocked; struct vattr vat; struct vattr *vap = &vat; ndis_fh *fh; @@ -2986,21 +2986,19 @@ snprintf(path, MAXPATHLEN, "%s/%s", ndis_filepath, afilename); - mtx_lock(&Giant); - /* Some threads don't have a current working directory. */ + /* XXX: locking? Which threads don't have these, kthreads maybe? */ if (td->td_proc->p_fd->fd_rdir == NULL) td->td_proc->p_fd->fd_rdir = rootvnode; if (td->td_proc->p_fd->fd_cdir == NULL) td->td_proc->p_fd->fd_cdir = rootvnode; - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, td); + NDINIT(&nd, LOOKUP, FOLLOW | MPSAFE, UIO_SYSSPACE, path, td); flags = FREAD; error = vn_open(&nd, &flags, 0, -1); if (error) { - mtx_unlock(&Giant); *status = NDIS_STATUS_FILE_NOT_FOUND; ExFreePool(fh); printf("NDIS: open file %s failed: %d\n", path, error); @@ -3008,6 +3006,7 @@ free(afilename, M_DEVBUF); return; } + vfslocked = NDHASGIANT(&nd); ExFreePool(path); @@ -3016,7 +3015,7 @@ /* Get the file size. */ VOP_GETATTR(nd.ni_vp, vap, td->td_ucred, td); VOP_UNLOCK(nd.ni_vp, 0, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); fh->nf_vp = nd.ni_vp; fh->nf_map = NULL; @@ -3038,7 +3037,7 @@ struct thread *td = curthread; linker_file_t lf; caddr_t kldstart; - int error, resid; + int error, resid, vfslocked; if (filehandle == NULL) { *status = NDIS_STATUS_FAILURE; @@ -3076,10 +3075,10 @@ return; } - mtx_lock(&Giant); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); error = vn_rdwr(UIO_READ, fh->nf_vp, fh->nf_map, fh->nf_maplen, 0, UIO_SYSSPACE, 0, td->td_ucred, NOCRED, &resid, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); if (error) *status = NDIS_STATUS_FAILURE; @@ -3114,6 +3113,7 @@ { struct thread *td = curthread; ndis_fh *fh; + int vfslocked; if (filehandle == NULL) return; @@ -3129,9 +3129,9 @@ return; if (fh->nf_type == NDIS_FH_TYPE_VFS) { - mtx_lock(&Giant); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_close(fh->nf_vp, FREAD, td->td_ucred, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); } fh->nf_vp = NULL; ==== //depot/projects/smpng/sys/kern/kern_acct.c#42 (text+ko) ==== @@ -159,7 +159,7 @@ acct(struct thread *td, struct acct_args *uap) { struct nameidata nd; - int error, flags; + int error, flags, vfslocked; /* Make sure that the caller is root. */ error = suser(td); @@ -168,38 +168,38 @@ /* * If accounting is to be started to a file, open that file for - * appending and make sure it's a 'normal'. While we could - * conditionally acquire Giant here, we're actually interacting with - * vnodes from possibly two file systems, making the logic a bit - * complicated. For now, use Giant unconditionally. + * appending and make sure it's a 'normal'. */ - mtx_lock(&Giant); if (uap->path != NULL) { - NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_USERSPACE, + uap->path, td); flags = FWRITE | O_APPEND; error = vn_open(&nd, &flags, 0, -1); if (error) - goto done; + return (error); + vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC error = mac_check_system_acct(td->td_ucred, nd.ni_vp); if (error) { VOP_UNLOCK(nd.ni_vp, 0, td); vn_close(nd.ni_vp, flags, td->td_ucred, td); - goto done; + VFS_UNLOCK_GIANT(vfslocked); + return (error); } #endif VOP_UNLOCK(nd.ni_vp, 0, td); if (nd.ni_vp->v_type != VREG) { vn_close(nd.ni_vp, flags, td->td_ucred, td); - error = EACCES; - goto done; + VFS_UNLOCK_GIANT(vfslocked); + return (EACCES); } + VFS_UNLOCK_GIANT(vfslocked); #ifdef MAC } else { error = mac_check_system_acct(td->td_ucred, NULL); if (error) - goto done; + return (error); #endif } @@ -216,15 +216,18 @@ * enabled. */ acct_suspended = 0; - if (acct_vp != NULL) + if (acct_vp != NULL) { + vfslocked = VFS_LOCK_GIANT(acct_vp->v_mount); error = acct_disable(td); + VFS_UNLOCK_GIANT(vfslocked); + } if (uap->path == NULL) { if (acct_state & ACCT_RUNNING) { acct_state |= ACCT_EXITREQ; wakeup(&acct_state); } sx_xunlock(&acct_sx); - goto done; + return (error); } /* @@ -245,20 +248,20 @@ error = kthread_create(acct_thread, NULL, NULL, 0, 0, "accounting"); if (error) { + vfslocked = VFS_LOCK_GIANT(acct_vp->v_mount); (void) vn_close(acct_vp, acct_flags, acct_cred, td); + VFS_UNLOCK_GIANT(vfslocked); crfree(acct_cred); acct_vp = NULL; acct_cred = NULL; acct_flags = 0; sx_xunlock(&acct_sx); log(LOG_NOTICE, "Unable to start accounting thread\n"); - goto done; + return (error); } } sx_xunlock(&acct_sx); log(LOG_NOTICE, "Accounting enabled\n"); -done: - mtx_unlock(&Giant); return (error); } ==== //depot/projects/smpng/sys/kern/kern_alq.c#10 (text+ko) ==== @@ -172,8 +172,6 @@ int needwakeup; struct alq *alq; - mtx_lock(&Giant); - ald_thread = FIRST_THREAD_IN_PROC(ald_proc); EVENTHANDLER_REGISTER(shutdown_pre_sync, ald_shutdown, NULL, @@ -250,6 +248,7 @@ struct ale *alstart; int totlen; int iov; + int vfslocked; vp = alq->aq_vp; td = curthread; @@ -291,6 +290,7 @@ /* * Do all of the junk required to write now. */ + vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); VOP_LEASE(vp, td, alq->aq_cred, LEASE_WRITE); @@ -303,6 +303,7 @@ VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, alq->aq_cred); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); + VFS_UNLOCK_GIANT(vfslocked); ALQ_LOCK(alq); alq->aq_flags &= ~AQ_FLUSHING; @@ -345,21 +346,23 @@ char *bufp; int flags; int error; - int i; + int i, vfslocked; *alqp = NULL; td = curthread; - NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_SYSSPACE, file, td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_SYSSPACE, file, td); flags = FWRITE | O_NOFOLLOW | O_CREAT; error = vn_open_cred(&nd, &flags, cmode, cred, -1); if (error) return (error); + vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); /* We just unlock so we hold a reference */ VOP_UNLOCK(nd.ni_vp, 0, td); + VFS_UNLOCK_GIANT(vfslocked); alq = malloc(sizeof(*alq), M_ALD, M_WAITOK|M_ZERO); alq->aq_entbuf = malloc(count * size, M_ALD, M_WAITOK|M_ZERO); ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#50 (text+ko) ==== @@ -598,7 +598,7 @@ int ops = KTROP(uap->ops); int descend = uap->ops & KTRFLAG_DESCEND; int nfound, ret = 0; - int flags, error = 0; + int flags, error = 0, vfslocked; struct nameidata nd; struct ucred *cred; @@ -613,25 +613,25 @@ /* * an operation which requires a file argument. */ - NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->fname, td); + NDINIT(&nd, LOOKUP, NOFOLLOW | MPSAFE, UIO_USERSPACE, + uap->fname, td); flags = FREAD | FWRITE | O_NOFOLLOW; - mtx_lock(&Giant); error = vn_open(&nd, &flags, 0, -1); if (error) { - mtx_unlock(&Giant); ktrace_exit(td); return (error); } + vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; VOP_UNLOCK(vp, 0, td); if (vp->v_type != VREG) { (void) vn_close(vp, FREAD|FWRITE, td->td_ucred, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); ktrace_exit(td); return (EACCES); } - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); } /* * Clear all uses of the tracefile. @@ -649,10 +649,10 @@ p->p_traceflag = 0; mtx_unlock(&ktrace_mtx); PROC_UNLOCK(p); - mtx_lock(&Giant); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); (void) vn_close(vp, FREAD|FWRITE, cred, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); crfree(cred); } else { PROC_UNLOCK(p); @@ -732,9 +732,9 @@ error = EPERM; done: if (vp != NULL) { - mtx_lock(&Giant); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); (void) vn_close(vp, FWRITE, td->td_ucred, td); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); } ktrace_exit(td); return (error); @@ -888,7 +888,7 @@ struct iovec aiov[3]; struct mount *mp; int datalen, buflen, vrele_count; - int error; + int error, vfslocked; /* * We hold the vnode and credential for use in I/O in case ktrace is @@ -944,7 +944,7 @@ auio.uio_iovcnt++; } - mtx_lock(&Giant); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); @@ -956,7 +956,7 @@ VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); vrele(vp); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); if (!error) return; /* @@ -1000,10 +1000,10 @@ * them but not yet committed them, as those are per-thread. The * thread will have to clear it itself on system call return. */ - mtx_lock(&Giant); + vfslocked = VFS_LOCK_GIANT(vp->v_mount); while (vrele_count-- > 0) vrele(vp); - mtx_unlock(&Giant); + VFS_UNLOCK_GIANT(vfslocked); } /*