From owner-p4-projects@FreeBSD.ORG Sun Dec 31 10:57: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 E51D716A415; Sun, 31 Dec 2006 10:57:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF6AE16A40F for ; Sun, 31 Dec 2006 10:57:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AE64E13C457 for ; Sun, 31 Dec 2006 10:57:50 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVAvou9039427 for ; Sun, 31 Dec 2006 10:57:50 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVAvlws039424 for perforce@freebsd.org; Sun, 31 Dec 2006 10:57:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 31 Dec 2006 10:57:47 GMT Message-Id: <200612311057.kBVAvlws039424@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112343 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, 31 Dec 2006 10:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=112343 Change 112343 by rdivacky@rdivacky_witten on 2006/12/31 10:57:24 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#15 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#15 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/linuxolator/src/sys/conf/NOTES#13 integrate .. //depot/projects/linuxolator/src/sys/conf/files#14 integrate .. //depot/projects/linuxolator/src/sys/conf/kern.post.mk#4 integrate .. //depot/projects/linuxolator/src/sys/conf/options#11 integrate .. //depot/projects/linuxolator/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/linuxolator/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/linuxolator/src/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#12 integrate .. //depot/projects/linuxolator/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/if_auereg.h#4 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/msdosfs/bpb.h#3 integrate .. //depot/projects/linuxolator/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/linuxolator/src/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/linuxolator/src/sys/isa/pnpparse.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mac.c#5 delete .. //depot/projects/linuxolator/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/linuxolator/src/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/linuxolator/src/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/linuxolator/src/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/linuxolator/src/sys/net/if_enc.c#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/linuxolator/src/sys/net/if_media.h#2 integrate .. //depot/projects/linuxolator/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/linuxolator/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/linuxolator/src/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/linuxolator/src/sys/netgraph/ng_nat.c#5 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/linuxolator/src/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/linuxolator/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_fw_pfil.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_asconf.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/linuxolator/src/sys/netinet/sctputil.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/linuxolator/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/linuxolator/src/sys/security/mac/mac_inet.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_internal.h#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_pipe.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/linuxolator/src/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/linuxolator/src/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/linuxolator/src/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/linuxolator/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/linuxolator/src/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/linuxolator/src/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/linuxolator/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/linuxolator/src/sys/sun4v/mdesc/mdesc_init.c#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/interrupt.S#6 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/pmap.c#10 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/linuxolator/src/sys/sys/mac_policy.h#7 delete .. //depot/projects/linuxolator/src/sys/sys/mutex.h#4 integrate .. //depot/projects/linuxolator/src/sys/sys/systm.h#5 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.128 2006/12/17 06:48:39 kmacy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $ */ #include "opt_atpic.h" @@ -365,6 +365,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call trap MEXITCOUNT testl %ebx,%ebx ==== //depot/projects/linuxolator/src/sys/amd64/include/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.39 2005/09/27 17:39:10 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.44 2006/12/29 15:29:49 bde Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -33,30 +33,30 @@ #endif /* - * Various simple arithmetic on memory which is atomic in the presence - * of interrupts and multiple processors. + * Various simple operations on memory, each of which is atomic in the + * presence of interrupts and multiple processors. * - * atomic_set_char(P, V) (*(u_char*)(P) |= (V)) - * atomic_clear_char(P, V) (*(u_char*)(P) &= ~(V)) - * atomic_add_char(P, V) (*(u_char*)(P) += (V)) - * atomic_subtract_char(P, V) (*(u_char*)(P) -= (V)) + * atomic_set_char(P, V) (*(u_char *)(P) |= (V)) + * atomic_clear_char(P, V) (*(u_char *)(P) &= ~(V)) + * atomic_add_char(P, V) (*(u_char *)(P) += (V)) + * atomic_subtract_char(P, V) (*(u_char *)(P) -= (V)) * - * atomic_set_short(P, V) (*(u_short*)(P) |= (V)) - * atomic_clear_short(P, V) (*(u_short*)(P) &= ~(V)) - * atomic_add_short(P, V) (*(u_short*)(P) += (V)) - * atomic_subtract_short(P, V) (*(u_short*)(P) -= (V)) + * atomic_set_short(P, V) (*(u_short *)(P) |= (V)) + * atomic_clear_short(P, V) (*(u_short *)(P) &= ~(V)) + * atomic_add_short(P, V) (*(u_short *)(P) += (V)) + * atomic_subtract_short(P, V) (*(u_short *)(P) -= (V)) * - * atomic_set_int(P, V) (*(u_int*)(P) |= (V)) - * atomic_clear_int(P, V) (*(u_int*)(P) &= ~(V)) - * atomic_add_int(P, V) (*(u_int*)(P) += (V)) - * atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) - * atomic_readandclear_int(P) (return *(u_int*)P; *(u_int*)P = 0;) + * atomic_set_int(P, V) (*(u_int *)(P) |= (V)) + * atomic_clear_int(P, V) (*(u_int *)(P) &= ~(V)) + * atomic_add_int(P, V) (*(u_int *)(P) += (V)) + * atomic_subtract_int(P, V) (*(u_int *)(P) -= (V)) + * atomic_readandclear_int(P) (return (*(u_int *)(P)); *(u_int *)(P) = 0;) * - * atomic_set_long(P, V) (*(u_long*)(P) |= (V)) - * atomic_clear_long(P, V) (*(u_long*)(P) &= ~(V)) - * atomic_add_long(P, V) (*(u_long*)(P) += (V)) - * atomic_subtract_long(P, V) (*(u_long*)(P) -= (V)) - * atomic_readandclear_long(P) (return *(u_long*)P; *(u_long*)P = 0;) + * atomic_set_long(P, V) (*(u_long *)(P) |= (V)) + * atomic_clear_long(P, V) (*(u_long *)(P) &= ~(V)) + * atomic_add_long(P, V) (*(u_long *)(P) += (V)) + * atomic_subtract_long(P, V) (*(u_long *)(P) -= (V)) + * atomic_readandclear_long(P) (return (*(u_long *)(P)); *(u_long *)(P) = 0;) */ /* @@ -67,26 +67,26 @@ * Kernel modules call real functions which are built into the kernel. * This allows kernel modules to be portable between UP and SMP systems. */ -#if defined(KLD_MODULE) || !(defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)) +#if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM) #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); -int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); -u_int atomic_fetchadd_int(volatile u_int *p, u_int v); +int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src); +int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); +u_int atomic_fetchadd_int(volatile u_int *p, u_int v); #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#else /* !KLD_MODULE && __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ +#else /* !KLD_MODULE && __GNUCLIKE_ASM */ /* - * For userland, assume the SMP case and use lock prefixes so that - * the binaries will run on both types of systems. + * For userland, always use lock prefixes so that the binaries will run + * on both SMP and !SMP systems. */ #if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED lock ; +#define MPLOCKED "lock ; " #else #define MPLOCKED #endif @@ -99,9 +99,9 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(__XSTRING(MPLOCKED) OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p)); \ + __asm __volatile(MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ } \ struct __hack @@ -116,19 +116,19 @@ static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) { - int res = exp; + u_char res; - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " cmpxchgl %2,%1 ; " - " setz %%al ; " - " movzbl %%al,%0 ; " + " sete %0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res), /* 0 (result) */ + : "=a" (res), /* 0 */ "=m" (*dst) /* 1 */ : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ + "a" (exp), /* 3 */ + "m" (*dst) /* 4 */ : "memory"); return (res); @@ -137,19 +137,19 @@ static __inline int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) { - long res = exp; + u_char res; - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " cmpxchgq %2,%1 ; " - " setz %%al ; " - " movzbq %%al,%0 ; " + " sete %0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res), /* 0 (result) */ + : "=a" (res), /* 0 */ "=m" (*dst) /* 1 */ : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ + "a" (exp), /* 3 */ + "m" (*dst) /* 4 */ : "memory"); return (res); @@ -163,8 +163,8 @@ atomic_fetchadd_int(volatile u_int *p, u_int v) { - __asm __volatile ( - " " __XSTRING(MPLOCKED) " " + __asm __volatile( + " " MPLOCKED " " " xaddl %0, %1 ; " "# atomic_fetchadd_int" : "+r" (v), /* 0 (result) */ @@ -197,7 +197,7 @@ } \ struct __hack -#else /* defined(SMP) */ +#else /* !(_KERNEL && !SMP) */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ @@ -205,11 +205,11 @@ { \ u_##TYPE res; \ \ - __asm __volatile(__XSTRING(MPLOCKED) LOP \ - : "=a" (res), /* 0 (result) */\ + __asm __volatile(MPLOCKED LOP \ + : "=a" (res), /* 0 */ \ "=m" (*p) /* 1 */ \ : "m" (*p) /* 2 */ \ - : "memory"); \ + : "memory"); \ \ return (res); \ } \ @@ -227,9 +227,9 @@ } \ struct __hack -#endif /* SMP */ +#endif /* _KERNEL && !SMP */ -#endif /* KLD_MODULE || !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ +#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v); @@ -259,49 +259,49 @@ #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD -#if !defined(WANT_FUNCTIONS) +#ifndef WANT_FUNCTIONS /* Read the current value and store a zero in the destination. */ -#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE) +#ifdef __GNUCLIKE_ASM static __inline u_int atomic_readandclear_int(volatile u_int *addr) { - u_int result; + u_int res; - result = 0; - __asm __volatile ( + res = 0; + __asm __volatile( " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "+r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ + : "+r" (res), /* 0 */ + "=m" (*addr) /* 1 */ : "m" (*addr)); - return (result); + return (res); } static __inline u_long atomic_readandclear_long(volatile u_long *addr) { - u_long result; + u_long res; - result = 0; - __asm __volatile ( + res = 0; + __asm __volatile( " xchgq %1,%0 ; " "# atomic_readandclear_long" - : "+r" (result), /* 0 (result) */ - "=m" (*addr) /* 1 (addr) */ + : "+r" (res), /* 0 */ + "=m" (*addr) /* 1 */ : "m" (*addr)); - return (result); + return (res); } -#else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ +#else /* !__GNUCLIKE_ASM */ -u_int atomic_readandclear_int(volatile u_int *); -u_long atomic_readandclear_long(volatile u_long *); +u_int atomic_readandclear_int(volatile u_int *addr); +u_long atomic_readandclear_long(volatile u_long *addr); -#endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ +#endif /* __GNUCLIKE_ASM */ /* Acquire and release variants are identical to the normal ones. */ #define atomic_set_acq_char atomic_set_char @@ -437,5 +437,6 @@ #define atomic_cmpset_rel_ptr atomic_cmpset_rel_long #define atomic_readandclear_ptr atomic_readandclear_long -#endif /* !defined(WANT_FUNCTIONS) */ -#endif /* ! _MACHINE_ATOMIC_H_ */ +#endif /* !WANT_FUNCTIONS */ + +#endif /* !_MACHINE_ATOMIC_H_ */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.27 2006/12/29 01:17:09 rwatson Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -1204,7 +1204,7 @@ #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 -#define LINUX_SYS_AUE_linux_creat AUE_O_CREAT +#define LINUX_SYS_AUE_linux_creat AUE_CREAT #define LINUX_SYS_AUE_linux_link AUE_LINK #define LINUX_SYS_AUE_linux_unlink AUE_UNLINK #define LINUX_SYS_AUE_linux_execve AUE_EXECVE @@ -1266,7 +1266,7 @@ #define LINUX_SYS_AUE_linux_lstat AUE_LSTAT #define LINUX_SYS_AUE_linux_readlink AUE_READLINK #define LINUX_SYS_AUE_linux_reboot AUE_REBOOT -#define LINUX_SYS_AUE_linux_readdir AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_readdir AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_mmap AUE_MMAP #define LINUX_SYS_AUE_linux_truncate AUE_TRUNCATE #define LINUX_SYS_AUE_linux_ftruncate AUE_FTRUNCATE @@ -1303,7 +1303,7 @@ #define LINUX_SYS_AUE_linux_setfsuid16 AUE_SETFSUID #define LINUX_SYS_AUE_linux_setfsgid16 AUE_SETFSGID #define LINUX_SYS_AUE_linux_llseek AUE_LSEEK -#define LINUX_SYS_AUE_linux_getdents AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_getdents AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_select AUE_SELECT #define LINUX_SYS_AUE_linux_msync AUE_MSYNC #define LINUX_SYS_AUE_linux_readv AUE_READV @@ -1358,7 +1358,7 @@ #define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID #define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT #define LINUX_SYS_AUE_linux_mincore AUE_MINCORE -#define LINUX_SYS_AUE_linux_getdents64 AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_getdents64 AUE_GETDIRENTRIES #define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL #define LINUX_SYS_AUE_linux_gettid AUE_NULL #define LINUX_SYS_AUE_linux_setxattr AUE_NULL @@ -1398,8 +1398,8 @@ #define LINUX_SYS_AUE_linux_clock_gettime AUE_NULL #define LINUX_SYS_AUE_linux_clock_getres AUE_NULL #define LINUX_SYS_AUE_linux_clock_nanosleep AUE_NULL -#define LINUX_SYS_AUE_linux_statfs64 AUE_NULL -#define LINUX_SYS_AUE_linux_fstatfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_statfs64 AUE_STATFS +#define LINUX_SYS_AUE_linux_fstatfs64 AUE_FSTATFS #define LINUX_SYS_AUE_linux_tgkill AUE_NULL #define LINUX_SYS_AUE_linux_utimes AUE_UTIMES #define LINUX_SYS_AUE_linux_fadvise64_64 AUE_NULL ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.27 2006/12/29 01:17:09 rwatson Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.27 2006/12/29 01:17:09 rwatson Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp */ #include @@ -28,7 +28,7 @@ { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ @@ -109,7 +109,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ @@ -161,7 +161,7 @@ { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ @@ -240,7 +240,7 @@ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ @@ -288,8 +288,8 @@ { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ + { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.22 2006/10/28 10:59:59 netchild Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -50,7 +50,7 @@ 6 AUE_CLOSE NOPROTO { int close(int fd); } 7 AUE_WAIT4 STD { int linux_waitpid(l_pid_t pid, \ l_int *status, l_int options); } -8 AUE_O_CREAT STD { int linux_creat(char *path, \ +8 AUE_CREAT STD { int linux_creat(char *path, \ l_int mode); } 9 AUE_LINK STD { int linux_link(char *path, char *to); } 10 AUE_UNLINK STD { int linux_unlink(char *path); } @@ -80,7 +80,7 @@ 26 AUE_PTRACE STD { int linux_ptrace(l_long req, l_long pid, \ l_long addr, l_long data); } 27 AUE_NULL STD { int linux_alarm(l_uint secs); } -28 AUE_NULL UNIMPL fstat +28 AUE_FSTAT UNIMPL fstat 29 AUE_NULL STD { int linux_pause(void); } 30 AUE_UTIME STD { int linux_utime(char *fname, \ struct l_utimbuf *times); } @@ -160,11 +160,11 @@ 84 AUE_LSTAT STD { int linux_lstat(char *path, struct linux_lstat *up); } 85 AUE_READLINK STD { int linux_readlink(char *name, char *buf, \ l_int count); } -86 AUE_NULL UNIMPL linux_uselib +86 AUE_USELIB UNIMPL linux_uselib 87 AUE_SWAPON NOPROTO { int swapon(char *name); } 88 AUE_REBOOT STD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_O_GETDENTS STD { int linux_readdir(l_uint fd, \ +89 AUE_GETDIRENTRIES STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP STD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP NOPROTO { int munmap(caddr_t addr, int len); } @@ -176,7 +176,7 @@ 96 AUE_GETPRIORITY STD { int linux_getpriority(int which, int who); } 97 AUE_SETPRIORITY NOPROTO { int setpriority(int which, int who, \ int prio); } -98 AUE_AUE_PROFILE UNIMPL profil +98 AUE_PROFILE UNIMPL profil 99 AUE_STATFS STD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } 100 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \ @@ -243,7 +243,7 @@ 140 AUE_LSEEK STD { int linux_llseek(l_int fd, l_ulong ohigh, \ l_ulong olow, l_loff_t *res, \ l_uint whence); } -141 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ +141 AUE_GETDIRENTRIES STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 142 AUE_SELECT STD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ @@ -252,9 +252,9 @@ 143 AUE_FLOCK NOPROTO { int flock(int fd, int how); } 144 AUE_MSYNC STD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } -145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \ +145 AUE_READV STD { int linux_readv(int fd, struct iovec32 *iovp, \ u_int iovcnt); } -146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \ +146 AUE_WRITEV STD { int linux_writev(int fd, struct iovec32 *iovp, \ u_int iovcnt); } 147 AUE_GETSID STD { int linux_getsid(l_pid_t pid); } 148 AUE_NULL STD { int linux_fdatasync(l_uint fd); } @@ -268,16 +268,17 @@ const struct sched_param *param); } 155 AUE_SCHED_GETPARAM NOPROTO { int sched_getparam(pid_t pid, \ struct sched_param *param); } -156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler(l_pid_t pid, \ - l_int policy, \ +156 AUE_SCHED_SETSCHEDULER STD { int linux_sched_setscheduler( \ + l_pid_t pid, l_int policy, \ struct l_sched_param *param); } -157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler(l_pid_t pid); } +157 AUE_SCHED_GETSCHEDULER STD { int linux_sched_getscheduler( \ + l_pid_t pid); } 158 AUE_NULL NOPROTO { int sched_yield(void); } -159 AUE_SCHED_GET_PRIORITY_MAX STD { int linux_sched_get_priority_max( \ +159 AUE_SCHED_GET_PRIORITY_MAX STD { int linux_sched_get_priority_max( \ l_int policy); } -160 AUE_SCHED_GET_PRIORITY_MIN STD { int linux_sched_get_priority_min( \ +160 AUE_SCHED_GET_PRIORITY_MIN STD { int linux_sched_get_priority_min( \ l_int policy); } -161 AUE_SCHED_RR_GET_INTERVAL STD { int linux_sched_rr_get_interval(l_pid_t pid, \ +161 AUE_SCHED_RR_GET_INTERVAL STD { int linux_sched_rr_get_interval(l_pid_t pid, \ struct l_timespec *interval); } 162 AUE_NULL STD { int linux_nanosleep( \ const struct l_timespec *rqtp, \ @@ -383,7 +384,7 @@ l_size_t len, u_char *vec); } 219 AUE_MADVISE NOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ +220 AUE_GETDIRENTRIES STD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } 221 AUE_FCNTL STD { int linux_fcntl64(l_uint fd, l_uint cmd, \ uintptr_t arg); } @@ -435,8 +436,8 @@ 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ struct l_timespec *rqtp, struct l_timespec *rmtp); } -268 AUE_NULL STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } -269 AUE_NULL STD { int linux_fstatfs64(void); } +268 AUE_STATFS STD { int linux_statfs64(char *path, struct l_statfs64_buf *buf); } +269 AUE_FSTATFS STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_UTIMES STD { int linux_utimes(char *fname, \ struct l_timeval *tptr); } ==== //depot/projects/linuxolator/src/sys/cam/cam_xpt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.171 2006/12/10 05:37:48 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.173 2006/12/21 23:20:51 mjacob Exp $"); #include #include @@ -1446,7 +1446,11 @@ devq); xpt_max_ccbs = 16; - xpt_bus_register(xpt_sim, /*bus #*/0); + if ((status = xpt_bus_register(xpt_sim, /*bus #*/0)) != CAM_SUCCESS) { + printf("xpt_init: xpt_bus_register failed with status %#x," + " failing attach\n", status); + return; + } /* * Looking at the XPT from the SIM layer, the XPT is ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.h#3 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_ipc.h,v 1.10 2004/08/16 07:28:16 tjr Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ipc.h,v 1.11 2006/12/21 13:11:06 netchild Exp $ */ #ifndef _LINUX_IPC_H_ ==== //depot/projects/linuxolator/src/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.87 2006/05/16 14:37:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.88 2006/12/25 17:04:41 sam Exp $"); #include #include @@ -197,6 +197,11 @@ static uint32_t InterlockedIncrement(volatile uint32_t *); static uint32_t InterlockedDecrement(volatile uint32_t *); static void ExInterlockedAddLargeStatistic(uint64_t *, uint32_t); +static void *MmAllocateContiguousMemory(uint32_t, uint64_t); +static void *MmAllocateContiguousMemorySpecifyCache(uint32_t, + uint64_t, uint64_t, uint64_t, uint32_t); +static void MmFreeContiguousMemory(void *); +static void MmFreeContiguousMemorySpecifyCache(void *, uint32_t, uint32_t); static uint32_t MmSizeOfMdl(void *, size_t); static void *MmMapLockedPages(mdl *, uint8_t); static void *MmMapLockedPagesSpecifyCache(mdl *, @@ -234,6 +239,7 @@ static uint32_t IoWMIRegistrationControl(device_object *, uint32_t); static void *ntoskrnl_memset(void *, int, size_t); static void *ntoskrnl_memmove(void *, void *, size_t); +static void *ntoskrnl_memchr(void *, unsigned char, size_t); static char *ntoskrnl_strstr(char *, char *); static int ntoskrnl_toupper(int); static int ntoskrnl_tolower(int); @@ -433,6 +439,23 @@ return(dst); } +static void * +ntoskrnl_memchr(buf, ch, len) + void *buf; + unsigned char ch; + size_t len; +{ + if (len != 0) { + unsigned char *p = buf; + + do { + if (*p++ == ch) + return (p - 1); + } while (--len != 0); + } + return (NULL); +} + static char * ntoskrnl_strstr(s, find) char *s, *find; @@ -2471,6 +2494,52 @@ return; } +static void * +MmAllocateContiguousMemory(size, highest) + uint32_t size; + uint64_t highest; +{ + void *addr; + size_t pagelength = roundup(size, PAGE_SIZE); + + addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0); + + return(addr); +} + +static void * +MmAllocateContiguousMemorySpecifyCache(size, lowest, highest, + boundary, cachetype) + uint32_t size; + uint64_t lowest; + uint64_t highest; + uint64_t boundary; + uint32_t cachetype; +{ + void *addr; + size_t pagelength = roundup(size, PAGE_SIZE); + + addr = ExAllocatePoolWithTag(NonPagedPool, pagelength, 0); + + return(addr); +} + +static void +MmFreeContiguousMemory(base) + void *base; +{ + ExFreePool(base); +} + +static void +MmFreeContiguousMemorySpecifyCache(base, size, cachetype) + void *base; + uint32_t size; + uint32_t cachetype; +{ + ExFreePool(base); +} + static uint32_t MmSizeOfMdl(vaddr, len) void *vaddr; @@ -4144,6 +4213,7 @@ IMPORT_SFUNC(DbgBreakPoint, 0), IMPORT_CFUNC(strncmp, 0), IMPORT_CFUNC(strcmp, 0), + IMPORT_CFUNC_MAP(stricmp, strcasecmp, 0), IMPORT_CFUNC(strncpy, 0), IMPORT_CFUNC(strcpy, 0), IMPORT_CFUNC(strlen, 0), @@ -4151,9 +4221,11 @@ IMPORT_CFUNC_MAP(tolower, ntoskrnl_tolower, 0), IMPORT_CFUNC_MAP(strstr, ntoskrnl_strstr, 0), IMPORT_CFUNC_MAP(strchr, index, 0), + IMPORT_CFUNC_MAP(strrchr, rindex, 0), IMPORT_CFUNC(memcpy, 0), IMPORT_CFUNC_MAP(memmove, ntoskrnl_memmove, 0), IMPORT_CFUNC_MAP(memset, ntoskrnl_memset, 0), + IMPORT_CFUNC_MAP(memchr, ntoskrnl_memchr, 0), IMPORT_SFUNC(IoAllocateDriverObjectExtension, 4), IMPORT_SFUNC(IoGetDriverObjectExtension, 2), IMPORT_FFUNC(IofCallDriver, 2), @@ -4239,6 +4311,11 @@ IMPORT_FFUNC(ExInterlockedAddLargeStatistic, 2), IMPORT_SFUNC(IoAllocateMdl, 5), IMPORT_SFUNC(IoFreeMdl, 1), + IMPORT_SFUNC(MmAllocateContiguousMemory, 2), + IMPORT_SFUNC(MmAllocateContiguousMemorySpecifyCache, 5), + IMPORT_SFUNC(MmFreeContiguousMemory, 1), + IMPORT_SFUNC(MmFreeContiguousMemorySpecifyCache, 3), + IMPORT_SFUNC_MAP(MmGetPhysicalAddress, pmap_kextract, 1), IMPORT_SFUNC(MmSizeOfMdl, 1), IMPORT_SFUNC(MmMapLockedPages, 2), IMPORT_SFUNC(MmMapLockedPagesSpecifyCache, 6), ==== //depot/projects/linuxolator/src/sys/conf/NOTES#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1402 2006/12/13 02:33:32 yongari Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1404 2006/12/29 13:59:02 mlaier Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -650,6 +650,7 @@ options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO +options NETGRAPH_DEFLATE options NETGRAPH_DEVICE options NETGRAPH_ECHO options NETGRAPH_EIFACE @@ -674,6 +675,7 @@ options NETGRAPH_PPP options NETGRAPH_PPPOE options NETGRAPH_PPTPGRE +options NETGRAPH_PRED1 options NETGRAPH_RFC1490 options NETGRAPH_SOCKET options NETGRAPH_SPLIT @@ -748,6 +750,9 @@ # The `pflog' device provides the pflog0 interface which logs packets. # The `pfsync' device provides the pfsync0 interface used for # synchronization of firewall state tables (over the net). +# The PF_MPSAFE_UGID option enables a special workaround for a LOR with +# user/group rules that would otherwise lead to a deadlock. This has +# performance implications and should be used with care. # # The PPP_BSDCOMP option enables support for compress(1) style entire # packet compression, the PPP_DEFLATE is for zlib/gzip style compression. @@ -778,6 +783,7 @@ device pf #PF OpenBSD packet-filter firewall device pflog #logging support interface for PF device pfsync #synchronization interface for PF +options PF_MPSAFE_UGID #Workaround LOR with user/group rules device carp #Common Address Redundancy Protocol device enc #IPSec interface (needs FAST_IPSEC) device ppp #Point-to-point protocol ==== //depot/projects/linuxolator/src/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1167 2006/12/13 02:33:33 yongari Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1170 2006/12/29 13:16:42 glebius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1343,7 +1343,6 @@ kern/kern_linker.c standard kern/kern_lock.c standard kern/kern_lockf.c standard -kern/kern_mac.c standard kern/kern_malloc.c standard kern/kern_mbuf.c standard kern/kern_mib.c standard @@ -1456,6 +1455,7 @@ kern/vfs_cluster.c standard kern/vfs_default.c standard kern/vfs_export.c standard +kern/vfs_extattr.c standard kern/vfs_hash.c standard kern/vfs_init.c standard kern/vfs_lookup.c standard @@ -1696,6 +1696,7 @@ netgraph/ng_bpf.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge netgraph/ng_cisco.c optional netgraph_cisco +netgraph/ng_deflate.c optional netgraph_deflate netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo netgraph/ng_eiface.c optional netgraph_eiface @@ -1719,6 +1720,7 @@ netgraph/ng_ppp.c optional netgraph_ppp netgraph/ng_pppoe.c optional netgraph_pppoe netgraph/ng_pptpgre.c optional netgraph_pptpgre +netgraph/ng_pred1.c optional netgraph_pred1 netgraph/ng_rfc1490.c optional netgraph_rfc1490 netgraph/ng_socket.c optional netgraph_socket netgraph/ng_split.c optional netgraph_split @@ -1936,6 +1938,7 @@ security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit security/audit/audit_worker.c optional audit +security/mac/mac_framework.c optional mac security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac @@ -1944,6 +1947,7 @@ security/mac/mac_priv.c optional mac security/mac/mac_process.c optional mac security/mac/mac_socket.c optional mac +security/mac/mac_syscalls.c standard security/mac/mac_system.c optional mac security/mac/mac_sysv_msg.c optional mac security/mac/mac_sysv_sem.c optional mac ==== //depot/projects/linuxolator/src/sys/conf/kern.post.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.98 2006/10/26 19:04:20 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.99 2006/12/30 20:27:24 jmg Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 31 11:16:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C42D16A40F; Sun, 31 Dec 2006 11:16:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB1A016A407 for ; Sun, 31 Dec 2006 11:16:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DCA2413C442 for ; Sun, 31 Dec 2006 11:16:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVBGEje043868 for ; Sun, 31 Dec 2006 11:16:14 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVBGEA4043864 for perforce@freebsd.org; Sun, 31 Dec 2006 11:16:14 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 31 Dec 2006 11:16:14 GMT Message-Id: <200612311116.kBVBGEA4043864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112344 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, 31 Dec 2006 11:16:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=112344 Change 112344 by rdivacky@rdivacky_witten on 2006/12/31 11:15:23 White space fixes. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#3 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#3 (text+ko) ==== @@ -237,14 +237,14 @@ pr = td->td_ucred->cr_prison; if (pr != NULL) { - mtx_lock(&pr->pr_mtx); + mtx_lock(&pr->pr_mtx); if (pr->pr_linux != NULL) { - lpr = (struct linux_prison *)pr->pr_linux; + lpr = (struct linux_prison *)pr->pr_linux; use26 = lpr->pr_use_linux26; } - mtx_unlock(&pr->pr_mtx); + mtx_unlock(&pr->pr_mtx); } else - use26 = linux_use_linux26; + use26 = linux_use_linux26; return (use26); } From owner-p4-projects@FreeBSD.ORG Sun Dec 31 11:26: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 BA67316A416; Sun, 31 Dec 2006 11:26:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6EA3816A403 for ; Sun, 31 Dec 2006 11:26:28 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 47AF513C44B for ; Sun, 31 Dec 2006 11:26:28 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVBQSLh045510 for ; Sun, 31 Dec 2006 11:26:28 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVBQSwT045507 for perforce@freebsd.org; Sun, 31 Dec 2006 11:26:28 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 31 Dec 2006 11:26:28 GMT Message-Id: <200612311126.kBVBQSwT045507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112345 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, 31 Dec 2006 11:26:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=112345 Change 112345 by rdivacky@rdivacky_witten on 2006/12/31 11:26:00 Fix fat finger typo ;( Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#4 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#4 (text+ko) ==== @@ -244,7 +244,7 @@ } mtx_unlock(&pr->pr_mtx); } else - use26 = linux_use_linux26; + use26 = linux_use_linux26; return (use26); } From owner-p4-projects@FreeBSD.ORG Sun Dec 31 12:15: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 0A95F16A407; Sun, 31 Dec 2006 12:15:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 56B4016A501 for ; Sun, 31 Dec 2006 12:15:32 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46FF413C442 for ; Sun, 31 Dec 2006 12:15:32 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVCFWK7055047 for ; Sun, 31 Dec 2006 12:15:32 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVCFWBg055044 for perforce@freebsd.org; Sun, 31 Dec 2006 12:15:32 GMT (envelope-from netchild@freebsd.org) Date: Sun, 31 Dec 2006 12:15:32 GMT Message-Id: <200612311215.kBVCFWBg055044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 112348 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, 31 Dec 2006 12:15:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=112348 Change 112348 by netchild@netchild_magellan on 2006/12/31 12:15:21 IFC recent style fixes (loop-back) Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#47 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/linuxolator/src/sys/sun4v/sun4v/hcall.S#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#47 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.199 2006/12/04 22:46:09 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.200 2006/12/31 11:56:16 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.h#4 (text+ko) ==== @@ -25,7 +25,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$ + * $FreeBSD: src/sys/compat/linux/linux_misc.h,v 1.2 2006/12/31 11:56:16 netchild Exp $ */ #ifndef _LINUX_MISC_H_ ==== //depot/projects/linuxolator/src/sys/sun4v/sun4v/hcall.S#4 (text+ko) ==== @@ -1,1433 +1,1852 @@ -/* - * CDDL HEADER START +/*- + * Copyright (c) 2006 Kip Macy + * All rights reserved. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. + * 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. * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END + * $FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.18 2006/12/17 01:22:51 kmacy Exp $ */ -/* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ -#pragma ident "@(#)hcall.s 1.10 05/09/28 SMI" - -/* - * Hypervisor calls - */ -#define _ASM - +#include + #include -__FBSDID("$FreeBSD: src/sys/sun4v/sun4v/hcall.S,v 1.3 2006/11/08 22:16:05 kmacy Exp $") - #include #include -#include +#include #include #include "assym.s" +/* + * Section 9 API Versioning + * + */ -#if defined(lint) -#error lint -#endif -#if defined(__lint) -#error __lint -#endif -#if defined(lint) || defined(__lint) +/* + * request and check for a version of the hypervisor apis + * which may be compatible + * + * arg0 api_group (%o0) + * arg1 major_number (%o1) + * arg2 req_minor_number (%o2) + * + * ret0 status (%o0) + * ret1 act_minor_number (%o1) + * + */ +ENTRY(api_set_version) + mov API_SET_VERSION, %o5 + ta CORE_TRAP + retl + stx %o1, [%o3] +END(api_set_version) -/*ARGSUSED*/ -int64_t -hv_cnputchar(uint8_t ch) -{ return (0); } +/* + * retrieve the major and minor number of the most recently + * successfully negotiated API + * + * arg0 api_group (%o0) + * + * ret0 status (%o0) + * ret1 major_number (%o1) + * ret2 major_number (%o2) + * + */ +ENTRY(api_get_version) + mov %o2, %o4 + mov %o1, %o3 + mov API_GET_VERSION, %o5 + ta CORE_TRAP + retl + stx %o1, [%o4] + +END(api_get_version) + +/* + * Section 10 Domain Services + * + */ -/*ARGSUSED*/ -int64_t -hv_cngetchar(uint8_t *ch) -{ return (0); } +/* + * stop all CPUs in the virtual machine domain and place them + * in the stopped state + * + * arg0 exit_code (%o0) + * + */ +ENTRY(hv_mach_exit) + mov MACH_EXIT, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_exit) + +/* + * copy the most current machine description into buffer + * upon success or EINVAL the service returns the actual + * size of the machine description + * + * arg0 buffer (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length (%o1) + * + */ +ENTRY(hv_mach_desc) + mov %o1, %o2 + ldx [%o1], %o1 + mov MACH_DESC, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mach_desc) -/*ARGSUSED*/ -uint64_t -hv_tod_get(uint64_t *seconds) -{ return (0); } +/* + * execute a software initiated reset of a virtual machine domain + * + */ +ENTRY(hv_mach_sir) + mov MACH_SIR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_sir) + +/* + * report the guests soft state to the hypervisor + * + * arg0 soft_state (%o0) + * arg1 soft_state_desc_ptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mach_set_soft_state) + mov MACH_SET_SOFT_STATE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mach_set_soft_state) + +/* + * retrieve the current value of the guest's software state + * + * arg0 soft_desc_ptr (%o0) + * + * ret0 status (%o0) + * arg1 soft_state (%o1) + * + */ +ENTRY(hv_mach_get_soft_state) + mov %o1, %o2 + mov MACH_SET_SOFT_STATE, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mach_get_soft_state) + +/* + * set a watchdog timer, 0 disables, upon success + * time_remaining contains the time previously remaining + * + * arg0 timeout (%o0) + * + * ret0 status (%o0) + * ret1 time_remaining (%o1) + * + */ +ENTRY(hv_mach_watchdog) + mov %o1, %o2 + mov MACH_WATCHDOG, %o5 + ta FAST_TRAP + brnz,pn %o0, 1f + nop + stx %o1, [%o2] +1: retl + nop +END(hv_mach_watchdog) + +/* + * Section 11 CPU Services + * + */ -/*ARGSUSED*/ -uint64_t -hv_tod_set(uint64_t seconds) -{ return (0);} +/* + * start CPU with id cpuid with pc in %pc and real trap base address + * of rtba + * + * arg0 cpuid (%o0) + * arg1 pc (%o1) + * arg2 rtba (%o2) + * arg3 target_arg0 (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_start) + mov CPU_START, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_start) -/*ARGSUSED*/ -uint64_t -hv_mmu_map_perm_addr(void *vaddr, int ctx, uint64_t tte, int flags) -{ return (0); } +/* + * stop CPU with id cpuid + * + * arg0 cpuid (%o0) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_stop) + mov CPU_STOP, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_stop) -/*ARGSUSED*/ -uint64_t -hv_mmu_unmap_perm_addr(void *vaddr, int ctx, int flags) -{ return (0); } +/* + * set the real trap base address of the local cpu to rtba + * upon success the previous_rtba contains the address of the + * old rtba + * + * arg0 rtba (%o0) + * + * ret0 status (%o0) + * ret1 previous_rtba(%o1) + * + */ +ENTRY(hv_cpu_set_rtba) + mov %o1, %o2 + mov CPU_SET_RTBA, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] + +END(hv_cpu_set_rtba) -/*ARGSUSED*/ -uint64_t -hv_set_ctx0(uint64_t ntsb_descriptor, uint64_t desc_ra) -{ return (0); } +/* + * return the current real trap base address + * + * ret0 status (%o0) + * ret1 rtba (%o1) + * + */ +ENTRY(hv_cpu_get_rtba) + mov CPU_GET_RTBA, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_get_rtba) + +/* + * suspend execution on current cpu + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_yield) + mov CPU_YIELD, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_yield) -/*ARGSUSED*/ -uint64_t -hv_set_ctxnon0(uint64_t ntsb_descriptor, uint64_t desc_ra) -{ return (0); } +/* + * configure queue of size nentries to be placed at base raddr + * + * arg0 queue (%o0) + * arg1 base raddr (%o1) + * arg2 nentries (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_qconf) + mov CPU_QCONF, %o5 + ta FAST_TRAP + retl + nop +END(hv_cpu_qconf) + +/* + * return configuration of queue queue + * + * arg0 queue (%o0) + * + * ret0 status (%o0) + * ret1 base raddr (%o1) + * ret2 nentries (%o2) + * + */ +ENTRY(hv_cpu_qinfo) +END(hv_cpu_qinfo) + +/* + * send cpu mondo interrupt to cpulist + * + * arg0 ncpus (%o0) + * arg1 cpu list ra (%o1) + * arg2 mondo data ra(%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_cpu_mondo_send) + ldx [PCPU(MONDO_DATA_RA)], %o2 + mov CPU_MONDO_SEND, %o5 + ta FAST_TRAP + retl + membar #Sync +END(hv_cpu_mondo_send) -#ifdef SET_MMU_STATS -/*ARGSUSED*/ -uint64_t -hv_mmu_set_stat_area(uint64_t rstatarea, uint64_t size) -{ return (0); } -#endif /* SET_MMU_STATS */ +/* + * return the hypervisor id for the current cpu + * + * ret0 status (%o0) + * ret1 cpuid (%o1) + * + */ +ENTRY(hv_cpu_myid) + mov %o0, %o2 + mov CPU_MYID, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_cpu_myid) -/*ARGSUSED*/ -uint64_t -hv_cpu_qconf(int queue, uint64_t paddr, int size) -{ return (0); } +/* + * retrieve the current state of cpu cpuid + * + * arg0 cpuid (%o0) + * + * ret0 status (%o0) + * ret1 state (%o1) + * + */ +ENTRY(hv_cpu_state) + mov %o1, %o2 + mov CPU_STATE, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_cpu_state) + +/* + * Section 12 MMU Services + * + */ + +/* + * set the tsb(s) for the current cpu for context 0 + * + * arg0 ntsb (%o0) + * arg1 tsbdptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_tsb_ctx0) + mov MMU_TSB_CTX0, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_tsb_ctx0) -/*ARGSUSED*/ -uint64_t -hvio_config_get(devhandle_t dev_hdl, pci_device_t bdf, - pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t *data_p) -{ return (0); } +/* + * set the tsb(s) for the current cpu for non-zero contexts + * + * arg0 ntsb (%o0) + * arg1 tsbptr (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_tsb_ctxnon0) + mov MMU_TSB_CTXNON0, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_tsb_ctxnon0) -/*ARGSUSED*/ -uint64_t -hvio_config_put(devhandle_t dev_hdl, pci_device_t bdf, - pci_config_offset_t off, pci_config_size_t size, pci_cfg_data_t data) -{ return (0); } +/* + * demap any page mapping of virtual address vaddr in context ctx + * + * arg0 reserved (%o0) + * arg1 reserved (%o1) + * arg2 vaddr (%o2) + * arg3 ctx (%o3) + * arg4 flags (%o4) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_demap_page) + mov MMU_DEMAP_PAGE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_demap_page) -/*ARGSUSED*/ -uint64_t -hvio_intr_devino_to_sysino(uint64_t dev_hdl, uint32_t devino, uint64_t *sysino) -{ return (0); } +/* + * demap all non-permanent virtual address mappings in context ctx + * + * arg0 reserved (%o0) + * arg1 reserved (%o1) + * arg2 ctx (%o2) + * arg3 flags (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_demap_ctx) + mov MMU_DEMAP_CTX, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_demap_ctx) -/*ARGSUSED*/ -uint64_t -hvio_intr_getvalid(uint64_t sysino, int *intr_valid_state) -{ return (0); } +/* + * demap all non-permanent virtual address mappings for the current + * virtual cpu + * + * arg0 reserved (%o0) + * arg1 reserved (%o1) + * arg2 flags (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_demap_all) + mov MMU_DEMAP_ALL, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_demap_all) -/*ARGSUSED*/ -uint64_t -hvio_intr_setvalid(uint64_t sysino, int intr_valid_state) -{ return (0); } +/* + * create a non-permanent mapping for the calling virtual cpu + * + * arg0 vaddr (%o0) + * arg1 context (%o1) + * arg2 TTE (%o2) + * arg3 flags (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_map_addr) + mov MMU_MAP_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_map_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_getstate(uint64_t sysino, int *intr_state) -{ return (0); } +/* + * create a permanent mapping for the calling virtual cpu + * + * arg0 vaddr (%o0) + * arg1 reserved (%o1) + * arg2 TTE (%o2) + * arg3 flags (%o3) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_map_perm_addr) + mov MMU_MAP_PERM_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_map_perm_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_setstate(uint64_t sysino, int intr_state) -{ return (0); } +/* + * demap virtual address vaddr in context ctx on current virtual cpu + * + * arg0 vaddr (%o0) + * arg1 ctx (%o1) + * arg2 flags (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_unmap_addr) + mov MMU_UNMAP_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_unmap_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid) -{ return (0); } +/* + * demap any permanent mapping at virtual address vaddr on current virtual cpu + * + * arg0 vaddr (%o0) + * arg1 reserved (%o1) + * arg2 flags (%o2) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_unmap_perm_addr) + mov %o1, %o2 + clr %o1 + mov MMU_UNMAP_PERM_ADDR, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_unmap_perm_addr) -/*ARGSUSED*/ -uint64_t -hvio_intr_settarget(uint64_t sysino, uint32_t cpuid) -{ return (0); } +/* + * configure the MMU fault status area for the current virtual cpu + * + * arg0 raddr (%o0) + * + * ret0 status (%o0) + * ret1 prev_raddr (%o1) + * + */ +ENTRY(hv_mmu_fault_area_conf) + mov %o1, %o2 + mov MMU_FAULT_AREA_CONF, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mmu_fault_area_conf) -/*ARGSUSED*/ -uint64_t -hvio_iommu_map(devhandle_t dev_hdl, tsbid_t tsbid, - pages_t pages, io_attributes_t io_attributes, - io_page_list_t *io_page_list_p, pages_t *pages_mapped) -{ return (0); } +/* + * enable or disable virtual address translation for the current virtual cpu + * + * arg0 enable_flag (%o0) + * arg1 return_target (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_mmu_enable) + mov MMU_ENABLE, %o5 + ta FAST_TRAP + retl + nop +END(hv_mmu_enable) -/*ARGSUSED*/ -uint64_t -hvio_iommu_demap(devhandle_t dev_hdl, tsbid_t tsbid, - pages_t pages, pages_t *pages_demapped) -{ return (0); } +/* + * return the TSB configuration as previously defined by mmu_tsb_ctx0 + * + * arg0 maxtsbs (%o0) + * arg1 buffer_ra (%o1) + * + * ret0 status (%o0) + * ret1 ntsbs (%o1) + * + */ +ENTRY(hv_mmu_tsb_ctx0_info) + mov %o1, %o2 + mov MMU_TSB_CTX0_INFO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mmu_tsb_ctx0_info) -/*ARGSUSED*/ -uint64_t -hvio_iommu_getmap(devhandle_t dev_hdl, tsbid_t tsbid, - io_attributes_t *attributes_p, r_addr_t *r_addr_p) -{ return (0); } +/* + * return the TSB configuration as previously defined by mmu_tsb_ctxnon0 + * + * arg0 maxtsbs (%o0) + * arg1 buffer_ra (%o1) + * + * ret0 status (%o0) + * ret1 ntsbs (%o1) + * + */ +ENTRY(hv_mmu_tsb_ctxnon0_info) + mov %o1, %o2 + mov MMU_TSB_CTXNON0_INFO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_mmu_tsb_ctxnon0_info) -/*ARGSUSED*/ -uint64_t -hvio_iommu_getbypass(devhandle_t dev_hdl, r_addr_t ra, - io_attributes_t io_attributes, io_addr_t *io_addr_p) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_peek(devhandle_t dev_hdl, r_addr_t ra, size_t size, uint32_t *status, - uint64_t *data_p) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_poke(devhandle_t dev_hdl, r_addr_t ra, uint64_t sizes, uint64_t data, - r_addr_t ra2, uint32_t *rdbk_status) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_dma_sync(devhandle_t dev_hdl, r_addr_t ra, size_t num_bytes, - int io_sync_direction, size_t *bytes_synched) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_msiq_conf(devhandle_t dev_hdl, msiqid_t msiq_id, r_addr_t ra, - uint_t msiq_rec_cnt) -{ return (0); } - -/*ARGSUSED*/ -uint64_t -hvio_msiq_info(devhandle_t dev_hdl, msiqid_t msiq_id, r_addr_t *r_addr_p, - uint_t *msiq_rec_cnt_p) -{ return (0); } +/* + * return the MMU fault status area defined for the current virtual cpu + * + * ret0 status (%o0) + * ret1 mmfsara (%o1) + * + */ +ENTRY(hv_mmu_fault_area_info) + mov %o0, %o2 + mov MMU_FAULT_AREA_INFO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] -/*ARGSUSED*/ -uint64_t -hvio_msiq_getvalid(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_valid_state_t *msiq_valid_state) -{ return (0); } +END(hv_mmu_fault_area_info) -/*ARGSUSED*/ -uint64_t -hvio_msiq_setvalid(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_valid_state_t msiq_valid_state) -{ return (0); } +/* + * Section 13 Cache and Memory Services + * + */ -/*ARGSUSED*/ -uint64_t -hvio_msiq_getstate(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_state_t *msiq_state) -{ return (0); } +/* + * zero from raddr to raddr+length-1 + * + * arg0 raddr (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length scrubbed (%o1) + * + */ +ENTRY(hv_mem_scrub) + mov MEM_SCRUB, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_mem_scrub) -/*ARGSUSED*/ -uint64_t -hvio_msiq_setstate(devhandle_t dev_hdl, msiqid_t msiq_id, - pci_msiq_state_t msiq_state) -{ return (0); } +/* + * for the memory address range from raddr to raddr+length-1 + * for the next access within that range from main system memory + * + * arg0 raddr (%o0) + * arg1 length (%o1) + * + * ret0 status (%o0) + * ret1 length synced (%o1) + * + */ +ENTRY(hv_mem_sync) + mov MEM_SYNC, %o5 + ta FAST_TRAP + stx %o1, [%o2] + retl + nop +END(hv_mem_sync) -/*ARGSUSED*/ -uint64_t -hvio_msiq_gethead(devhandle_t dev_hdl, msiqid_t msiq_id, - msiqhead_t *msiq_head) -{ return (0); } +/* + * Section 14 Device Interrupt Services + * + */ -/*ARGSUSED*/ -uint64_t -hvio_msiq_sethead(devhandle_t dev_hdl, msiqid_t msiq_id, - msiqhead_t msiq_head) -{ return (0); } +/* + * converts a device specific interrupt number given by + * devhandle and devino to a system specific ino (sysino) + * + * arg0 devhandle (%o0) + * arg1 devino (%o1) + * + * ret0 status (%o0) + * ret1 sysino (%o1) + * + */ +ENTRY(hv_intr_devino_to_sysino) + mov INTR_DEVINO2SYSINO, %o5 + ta FAST_TRAP + retl + stx %o1, [%o2] +END(hv_intr_devino_to_sysino) -/*ARGSUSED*/ -uint64_t -hvio_msiq_gettail(devhandle_t dev_hdl, msiqid_t msiq_id, - msiqtail_t *msiq_tail) -{ return (0); } +/* + * return intr enabled state + * + * arg0 sysino (%o0) + * + * ret0 status (%o0) + * ret1 intr_enabled (%o1) + * + */ +ENTRY(hv_intr_getenabled) + mov %o1, %o2 + mov INTR_GETENABLED, %o5 + ta FAST_TRAP + retl + st %o1, [%o2] +END(hv_intr_getenabled) -/*ARGSUSED*/ -uint64_t -hvio_msi_getmsiq(devhandle_t dev_hdl, msinum_t msi_num, - msiqid_t *msiq_id) -{ return (0); } +/* + * set intr enabled state + * + * arg0 sysino (%o0) + * arg1 intr_enabled (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_intr_setenabled) + mov INTR_SETENABLED, %o5 + ta FAST_TRAP + retl + nop +END(hv_intr_setenabled) -/*ARGSUSED*/ -uint64_t -hvio_msi_setmsiq(devhandle_t dev_hdl, msinum_t msi_num, - msiqid_t msiq_id, msi_type_t msitype) -{ return (0); } +/* + * return current state of the interrupt given + * by the sysino + * + * arg0 sysino (%o0) + * + * ret0 status (%o0) + * ret1 intr_state (%o1) + * + */ +ENTRY(hv_intr_getstate) + mov %o1, %o2 + mov INTR_GETSTATE, %o5 + ta FAST_TRAP + retl + st %o1, [%o2] +END(hv_intr_getstate) -/*ARGSUSED*/ -uint64_t -hvio_msi_getvalid(devhandle_t dev_hdl, msinum_t msi_num, - pci_msi_valid_state_t *msi_valid_state) -{ return (0); } +/* + * set the current state of the interrupt given + * by the sysino + * + * arg0 sysino (%o0) + * arg1 intr_state (%o1) + * + * ret0 status (%o0) + * + */ +ENTRY(hv_intr_setstate) + mov INTR_SETSTATE, %o5 + ta FAST_TRAP + retl + nop +END(hv_intr_setstate) -/*ARGSUSED*/ -uint64_t -hvio_msi_setvalid(devhandle_t dev_hdl, msinum_t msi_num, - pci_msi_valid_state_t msi_valid_state) -{ return (0); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 31 13:00: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 5A5C316A412; Sun, 31 Dec 2006 13:00:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 35FC816A403 for ; Sun, 31 Dec 2006 13:00:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0F38E13C45B for ; Sun, 31 Dec 2006 13:00:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVD0WK2070243 for ; Sun, 31 Dec 2006 13:00:32 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVD0Weo070231 for perforce@freebsd.org; Sun, 31 Dec 2006 13:00:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 31 Dec 2006 13:00:32 GMT Message-Id: <200612311300.kBVD0Weo070231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112352 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, 31 Dec 2006 13:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=112352 Change 112352 by rdivacky@rdivacky_witten on 2006/12/31 13:00:07 Fix style in linux_rt_sigtimedwait. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#6 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#6 (text+ko) ==== @@ -429,9 +429,6 @@ linux_rt_sigtimedwait(struct thread *td, struct linux_rt_sigtimedwait_args *args) { -#ifdef DEBUG - struct proc *p = td->td_proc; -#endif int error; l_timeval ltv; struct timeval tv; @@ -446,25 +443,26 @@ printf(ARGS(rt_sigtimedwait, "*")); #endif if (args->sigsetsize != sizeof(l_sigset_t)) - return(EINVAL); + return (EINVAL); if ((error = copyin(args->mask, &lset, sizeof(lset)))) - return(error); + return (error); linux_to_bsd_sigset(&lset, &bset); tsa = NULL; if (args->timeout) { if ((error = copyin(args->timeout, <v, sizeof(ltv)))) - return(error); + return (error); #ifdef DEBUG if (ldebug(rt_sigtimedwait)) - printf("Linux-emul rt_sigtimedwait (%d): incoming timeout (%d/%d)\n", - p->p_pid, ltv.tv_sec, ltv.tv_usec); + printf(LMSG("linux_rt_sigtimedwait: incoming timeout (%d/%d)\n"), + ltv.tv_sec, ltv.tv_usec); #endif tv.tv_sec = (long)ltv.tv_sec; tv.tv_usec = (suseconds_t)ltv.tv_usec; if (itimerfix(&tv)) { - /* The timeout was invalid. Convert it to something + /* + * The timeout was invalid. Convert it to something * valid that will act as it does under Linux. */ tv.tv_sec += tv.tv_usec / 1000000; @@ -474,11 +472,11 @@ tv.tv_usec += 1000000; } if (tv.tv_sec < 0) - timevalclear(&tv); + timevalclear(&tv); #ifdef DEBUG if (ldebug(rt_sigtimedwait)) - printf("Linux-emul rt_sigtimedwait (%d): converted timeout (%d/%ld)\n", - p->p_pid, tv.tv_sec, tv.tv_usec); + printf(LMSG("linux_rt_sigtimedwait: converted timeout (%d/%ld)\n"), + tv.tv_sec, tv.tv_usec); #endif } TIMEVAL_TO_TIMESPEC(&tv, &ts); @@ -487,11 +485,10 @@ error = kern_sigtimedwait(td, bset, &info, tsa); #ifdef DEBUG if (ldebug(rt_sigtimedwait)) - printf("Linux-emul rt_sigtimedwait (%ld): sigtimedwait returning (%d)\n", - (long)p->p_pid, error); + printf(LMSG("linux_rt_sigtimedwait: sigtimedwait returning (%d)\n"), error); #endif if (error) - return error; + return (error); if (args->ptr) { memset(&linfo, 0, sizeof(linfo)); @@ -504,11 +501,10 @@ PROC_LOCK(td->td_proc); tdsignal(td->td_proc, td, info.ksi_signo, &info); PROC_UNLOCK(td->td_proc); - } else { + } else td->td_retval[0] = info.ksi_signo; - } - return error; + return (error); } int From owner-p4-projects@FreeBSD.ORG Sun Dec 31 14:54: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 6732B16A412; Sun, 31 Dec 2006 14:54:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 20E0316A403 for ; Sun, 31 Dec 2006 14:54:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1054E13C441 for ; Sun, 31 Dec 2006 14:54:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVEs1Pw093156 for ; Sun, 31 Dec 2006 14:54:01 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVEs1d1093150 for perforce@freebsd.org; Sun, 31 Dec 2006 14:54:01 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 31 Dec 2006 14:54:01 GMT Message-Id: <200612311454.kBVEs1d1093150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112358 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, 31 Dec 2006 14:54:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=112358 Change 112358 by rdivacky@rdivacky_witten on 2006/12/31 14:53:01 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#7 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#16 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#16 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#15 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#15 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#17 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#6 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#5 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.h#3 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#48 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#7 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#15 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#15 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#14 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_dummy.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.6 2006/10/28 10:59:59 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.7 2006/12/31 13:16:00 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_proto.h#16 (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.27 2006/12/29 01:17:09 rwatson Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_syscall.h#16 (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.27 2006/12/29 01:17:09 rwatson Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysent.c#15 (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.27 2006/12/29 01:17:09 rwatson Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.28 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp */ #include ==== //depot/projects/linuxolator/src/sys/amd64/linux32/syscalls.master#15 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.24 2006/12/29 01:17:02 rwatson Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.25 2006/12/31 13:16:00 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.9 2006/11/15 11:04:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.10 2006/12/31 12:42:55 netchild Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.h#6 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_emul.h,v 1.4 2006/10/28 10:59:59 netchild Exp $ + * $FreeBSD: src/sys/compat/linux/linux_emul.h,v 1.5 2006/12/31 12:42:55 netchild Exp $ */ #ifndef _LINUX_EMUL_H_ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.26 2006/03/19 11:10:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.27 2006/12/31 12:39:10 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_mib.h#3 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_mib.h,v 1.9 2005/12/15 16:30:41 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_mib.h,v 1.10 2006/12/31 12:39:10 netchild Exp $ */ #ifndef _LINUX_MIB_H_ ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#48 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.200 2006/12/31 11:56:16 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.202 2006/12/31 13:16:00 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_signal.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.61 2006/10/15 14:34:03 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.62 2006/12/31 13:16:00 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_dummy.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_dummy.c,v 1.44 2006/10/28 10:59:59 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_dummy.c,v 1.45 2006/12/31 13:16:00 netchild Exp $"); #include #include ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_proto.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.89 2006/12/20 20:42:58 jkim Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp + * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.90 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_syscall.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.82 2006/12/20 20:42:58 jkim Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp + * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.83 2006/12/31 13:20:30 netchild Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_sysent.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.89 2006/12/20 20:42:58 jkim Exp $ - * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp + * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.90 2006/12/31 13:20:31 netchild Exp $ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp */ #include ==== //depot/projects/linuxolator/src/sys/i386/linux/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.84 2006/12/20 20:21:48 jkim Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.85 2006/12/31 13:16:00 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). From owner-p4-projects@FreeBSD.ORG Sun Dec 31 22:42: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 758DC16A412; Sun, 31 Dec 2006 22:42:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4F8A716A403 for ; Sun, 31 Dec 2006 22:42:03 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2878313C45A for ; Sun, 31 Dec 2006 22:42:03 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVMg26d094364 for ; Sun, 31 Dec 2006 22:42:03 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVMg2H2094360 for perforce@freebsd.org; Sun, 31 Dec 2006 22:42:02 GMT (envelope-from ticso@freebsd.org) Date: Sun, 31 Dec 2006 22:42:02 GMT Message-Id: <200612312242.kBVMg2H2094360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 112378 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, 31 Dec 2006 22:42:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=112378 Change 112378 by ticso@ticso on 2006/12/31 22:41:56 BWCT boards are using an 16MHz xtal Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#20 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_pmc.c#20 (text+ko) ==== @@ -399,7 +399,7 @@ pmc_softc->dev = dev; if ((err = at91_pmc_activate(dev)) != 0) return err; -#ifdef AT91_TSC +#if defined(AT91_TSC) | defined (AT91_BWCT) at91_pmc_init_clock(pmc_softc, 16000000); #else at91_pmc_init_clock(pmc_softc, 10000000); From owner-p4-projects@FreeBSD.ORG Sun Dec 31 23:53: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 B5F7616A510; Sun, 31 Dec 2006 23:53:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 84B9416A506 for ; Sun, 31 Dec 2006 23:53:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 759BF13C469 for ; Sun, 31 Dec 2006 23:53:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBVNrYTF007013 for ; Sun, 31 Dec 2006 23:53:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBVNrYYY007010 for perforce@freebsd.org; Sun, 31 Dec 2006 23:53:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 31 Dec 2006 23:53:34 GMT Message-Id: <200612312353.kBVNrYYY007010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112379 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, 31 Dec 2006 23:53:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=112379 Change 112379 by rdivacky@rdivacky_witten on 2006/12/31 23:53:30 Implement SETALL/GETALL IPC primitives. This fixes some LTP testcases. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#8 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_ipc.c#8 (text+ko) ==== @@ -571,9 +571,13 @@ td->td_retval[0] = seminfo.semmni; return 0; /* No need for __semctl call */ case LINUX_GETALL: - /* FALLTHROUGH */ + cmd = GETALL; + semun.val = args->arg.val; + break; case LINUX_SETALL: - /* FALLTHROUGH */ + cmd = SETALL; + semun.val = args->arg.val; + break; default: linux_msg(td, "ipc type %d is not implemented", args->cmd & ~LINUX_IPC_64); From owner-p4-projects@FreeBSD.ORG Wed Dec 27 01:20: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 DC91716A415; Wed, 27 Dec 2006 01:20:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B35816A40F for ; Wed, 27 Dec 2006 01:20:16 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7872813C474 for ; Wed, 27 Dec 2006 01:20:16 +0000 (UTC) (envelope-from ticso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBR1KGMr060136 for ; Wed, 27 Dec 2006 01:20:16 GMT (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBR1KGeo060133 for perforce@freebsd.org; Wed, 27 Dec 2006 01:20:16 GMT (envelope-from ticso@freebsd.org) Date: Wed, 27 Dec 2006 01:20:16 GMT Message-Id: <200612270120.kBR1KGeo060133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter To: Perforce Change Reviews Cc: Subject: PERFORCE change 112151 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, 27 Dec 2006 01:20:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=112151 Change 112151 by ticso@ticso on 2006/12/27 01:19:56 read access require PDC to be setup first otherwise one might get overrun errors. write access however need cmd first, so keep the existing order for them. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#28 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_mci.c#28 (text+ko) ==== @@ -403,12 +403,14 @@ } // printf("CMDR %x ARGR %x with data\n", cmdr, cmd->arg); WR4(sc, MCI_ARGR, cmd->arg); - WR4(sc, MCI_CMDR, cmdr); if (cmdr & MCI_CMDR_TRCMD_START) { - if (cmdr & MCI_CMDR_TRDIR) + if (cmdr & MCI_CMDR_TRDIR) { WR4(sc, PDC_PTCR, PDC_PTCR_RXTEN); - else + WR4(sc, MCI_CMDR, cmdr); + } else { + WR4(sc, MCI_CMDR, cmdr); WR4(sc, PDC_PTCR, PDC_PTCR_TXTEN); + } } WR4(sc, MCI_IER, MCI_SR_ERROR | ier); } @@ -538,6 +540,7 @@ // printf("i 0x%x\n", sr); cmd = sc->curcmd; if (sr & MCI_SR_ERROR) { +// printf("MCI_SR_ERROR 0x%x\n", sr & MCI_SR_ERROR); // Ignore CRC errors on CMD2 and ACMD47, per relevant standards if ((sr & MCI_SR_RCRCE) && (cmd->opcode == MMC_SEND_OP_COND || cmd->opcode == ACMD_SD_SEND_OP_COND)) From owner-p4-projects@FreeBSD.ORG Wed Dec 27 15:04: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 F064216A415; Wed, 27 Dec 2006 15:04:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BD7A316A407 for ; Wed, 27 Dec 2006 15:04:33 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AB59A13C478 for ; Wed, 27 Dec 2006 15:04:33 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBRF4XFu032682 for ; Wed, 27 Dec 2006 15:04:33 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBRF3ah0032511 for perforce@freebsd.org; Wed, 27 Dec 2006 15:03:36 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 27 Dec 2006 15:03:36 GMT Message-Id: <200612271503.kBRF3ah0032511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 112165 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, 27 Dec 2006 15:04:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=112165 Change 112165 by zec@zec_tca51 on 2006/12/27 15:02:57 IFC @ 112154 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/vimage/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/vimage/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#3 integrate .. //depot/projects/vimage/src/sys/conf/files#4 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#2 integrate .. //depot/projects/vimage/src/sys/conf/files.arm#2 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#2 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#2 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#2 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/vimage/src/sys/conf/options#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_auereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/vimage/src/sys/i386/isa/icu.h#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_mac.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sysv_ipc.c#2 integrate .. //depot/projects/vimage/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#3 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/msk/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_nat.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#6 edit .. //depot/projects/vimage/src/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#2 edit .. //depot/projects/vimage/src/sys/netinet6/frag6.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_label.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/vimage/src/sys/sun4v/include/smp.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/trap.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/vimage/src/sys/sun4v/sun4v/exception.S#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/hcall.S#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/interrupt.S#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tte.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/wbuf.S#2 integrate .. //depot/projects/vimage/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#2 integrate .. //depot/projects/vimage/src/sys/sys/mac_policy.h#2 delete .. //depot/projects/vimage/src/sys/sys/mount.h#2 integrate .. //depot/projects/vimage/src/sys/sys/mouse.h#2 integrate .. //depot/projects/vimage/src/sys/sys/mutex.h#2 integrate .. //depot/projects/vimage/src/sys/sys/param.h#2 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#4 integrate .. //depot/projects/vimage/src/sys/sys/sleepqueue.h#2 integrate .. //depot/projects/vimage/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#2 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#2 integrate .. //depot/projects/vimage/src/sys/sys/umtx.h#3 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#2 integrate .. //depot/projects/vimage/src/sys/sys/watchdog.h#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/apic_vector.S#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ */ /* @@ -60,6 +60,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ + movq %rsp, %rsi ; \ movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ @@ -98,7 +99,7 @@ IDTVEC(timerint) PUSH_FRAME FAKE_MCOUNT(TF_RIP(%rsp)) - + movq %rsp, %rdi call lapic_handle_timer MEXITCOUNT jmp doreti ==== //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.154 2005/10/17 23:10:31 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ */ #include @@ -206,6 +206,11 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) + movl TD_TID(%rsi), %eax + movq %r8, PCPU(CURPCB) + movl %eax, PCPU(CURTID) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp @@ -217,9 +222,6 @@ movq PCB_RIP(%r8),%rax movq %rax,(%rsp) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ - /* Test if debug registers should be restored. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f ==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $ */ #include "opt_atpic.h" @@ -165,6 +165,7 @@ .globl calltrap .type calltrap,@function calltrap: + movq %rsp, %rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -267,6 +268,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) @@ -363,6 +365,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call trap MEXITCOUNT testl %ebx,%ebx ==== //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -79,6 +79,7 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); @@ -190,6 +191,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.26 2006/11/17 16:41:03 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.27 2006/12/12 19:20:18 jhb Exp $ */ /* @@ -190,13 +190,13 @@ int intr_remove_handler(void *cookie) { + struct intsrc *isrc; int error; + isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); -#ifdef XXX if (error == 0) - intrcnt_updatename(/* XXX */); -#endif + intrcnt_updatename(isrc); return (error); } ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.33 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.34 2006/12/17 06:48:39 kmacy Exp $"); #include "opt_hwpmc_hooks.h" @@ -610,18 +610,18 @@ } void -lapic_handle_intr(int vector, struct trapframe frame) +lapic_handle_intr(int vector, struct trapframe *frame) { struct intsrc *isrc; if (vector == -1) panic("Couldn't get vector from ISR!"); isrc = intr_lookup_source(apic_idt_to_irq(vector)); - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, frame); } void -lapic_handle_timer(struct trapframe frame) +lapic_handle_timer(struct trapframe *frame) { struct lapic *la; @@ -654,16 +654,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); else - hardclock_cpu(TRAPF_USERMODE(&frame)); + hardclock_cpu(TRAPF_USERMODE(frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(TRAPF_USERMODE(&frame)); + statclock(TRAPF_USERMODE(frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -671,7 +671,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } critical_exit(); } ==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1164,6 +1164,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/vimage/src/sys/amd64/amd64/mptable_pci.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.5 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); #include #include @@ -72,6 +72,27 @@ return (bus_generic_attach(dev)); } +/* Pass MSI alloc requests up to the nexus. */ +static int +mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, + int *irqs) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount, + irqs)); +} + +static int +mptable_hostb_alloc_msix(device_t pcib, device_t dev, int index, int *irq) +{ + device_t bus; + + bus = device_get_parent(pcib); + return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, index, irq)); +} + static device_method_t mptable_hostb_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mptable_hostb_probe), @@ -96,9 +117,9 @@ DEVMETHOD(pcib_read_config, legacy_pcib_read_config), DEVMETHOD(pcib_write_config, legacy_pcib_write_config), DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt), - DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), + DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), - DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -165,4 +186,3 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); - ==== //depot/projects/vimage/src/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.313 2006/12/17 06:48:39 kmacy Exp $"); /* * AMD64 Trap and System call handling @@ -94,8 +94,8 @@ #endif #include -extern void trap(struct trapframe frame); -extern void syscall(struct trapframe frame); +extern void trap(struct trapframe *frame); +extern void syscall(struct trapframe *frame); static int trap_pfault(struct trapframe *, int); static void trap_fatal(struct trapframe *, vm_offset_t); @@ -155,8 +155,7 @@ */ void -trap(frame) - struct trapframe frame; +trap(struct trapframe *frame) { struct thread *td = curthread; struct proc *p = td->td_proc; @@ -165,7 +164,7 @@ ksiginfo_t ksi; PCPU_LAZY_INC(cnt.v_trap); - type = frame.tf_trapno; + type = frame->tf_trapno; #ifdef SMP #ifdef STOP_NMI @@ -192,12 +191,12 @@ * the NMI was handled by it and we can return immediately. */ if (type == T_NMI && pmc_intr && - (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame.tf_rip, - TRAPF_USERMODE(&frame))) + (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame->tf_rip, + TRAPF_USERMODE(frame))) goto out; #endif - if ((frame.tf_rflags & PSL_I) == 0) { + if ((frame->tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled * interrupts and then trapped. Enabling interrupts @@ -205,7 +204,7 @@ * interrupts disabled until they are accidentally * enabled later. */ - if (ISPL(frame.tf_cs) == SEL_UPL) + if (ISPL(frame->tf_cs) == SEL_UPL) printf( "pid %ld (%s): trap %d with interrupts disabled\n", (long)curproc->p_pid, curproc->p_comm, type); @@ -226,7 +225,7 @@ } } - code = frame.tf_err; + code = frame->tf_err; if (type == T_PAGEFLT) { /* * If we get a page fault while in a critical section, then @@ -245,15 +244,15 @@ if (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, "Kernel page fault") != 0) - trap_fatal(&frame, frame.tf_addr); + trap_fatal(frame, frame->tf_addr); } - if (ISPL(frame.tf_cs) == SEL_UPL) { + if (ISPL(frame->tf_cs) == SEL_UPL) { /* user trap */ td->td_pticks = 0; - td->td_frame = &frame; - addr = frame.tf_rip; + td->td_frame = frame; + addr = frame->tf_rip; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -266,7 +265,7 @@ case T_BPTFLT: /* bpt instruction fault */ case T_TRCTRAP: /* trace trap */ enable_intr(); - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; i = SIGTRAP; ucode = (type == T_TRCTRAP ? TRAP_TRACE : TRAP_BRKPT); break; @@ -298,12 +297,12 @@ break; case T_PAGEFLT: /* page fault */ - addr = frame.tf_addr; + addr = frame->tf_addr; #ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); #endif - i = trap_pfault(&frame, TRUE); + i = trap_pfault(frame, TRUE); if (i == -1) goto userout; if (i == 0) @@ -334,7 +333,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap(type, 0, &frame); + kdb_trap(type, 0, frame); } #endif /* KDB */ goto userout; @@ -380,7 +379,7 @@ ("kernel trap doesn't have ucred")); switch (type) { case T_PAGEFLT: /* page fault */ - (void) trap_pfault(&frame, FALSE); + (void) trap_pfault(frame, FALSE); goto out; case T_DNA: @@ -413,12 +412,12 @@ * selectors and pointers when the user changes * them. */ - if (frame.tf_rip == (long)doreti_iret) { - frame.tf_rip = (long)doreti_iret_fault; + if (frame->tf_rip == (long)doreti_iret) { + frame->tf_rip = (long)doreti_iret_fault; goto out; } if (PCPU_GET(curpcb)->pcb_onfault != NULL) { - frame.tf_rip = + frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; goto out; } @@ -434,8 +433,8 @@ * problem here and not every time the kernel is * entered. */ - if (frame.tf_rflags & PSL_NT) { - frame.tf_rflags &= ~PSL_NT; + if (frame->tf_rflags & PSL_NT) { + frame->tf_rflags &= ~PSL_NT; goto out; } break; @@ -470,7 +469,7 @@ */ #ifdef KDB /* XXX Giant */ - if (kdb_trap(type, 0, &frame)) + if (kdb_trap(type, 0, frame)) goto out; #endif break; @@ -487,7 +486,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap(type, 0, &frame); + kdb_trap(type, 0, frame); } #endif /* KDB */ goto out; @@ -497,7 +496,7 @@ #endif /* DEV_ISA */ } - trap_fatal(&frame, 0); + trap_fatal(frame, 0); goto out; } @@ -517,13 +516,13 @@ uprintf("fatal process exception: %s", trap_msg[type]); if ((type == T_PAGEFLT) || (type == T_PROTFLT)) - uprintf(", fault VA = 0x%lx", frame.tf_addr); + uprintf(", fault VA = 0x%lx", frame->tf_addr); uprintf("\n"); } #endif user: - userret(td, &frame); + userret(td, frame); mtx_assert(&Giant, MA_NOTOWNED); userout: out: @@ -723,8 +722,7 @@ * A system call is essentially treated as a trap. */ void -syscall(frame) - struct trapframe frame; +syscall(struct trapframe *frame) { caddr_t params; struct sysent *callp; @@ -746,7 +744,7 @@ PCPU_LAZY_INC(cnt.v_syscall); #ifdef DIAGNOSTIC - if (ISPL(frame.tf_cs) != SEL_UPL) { + if (ISPL(frame->tf_cs) != SEL_UPL) { mtx_lock(&Giant); /* try to stabilize the system XXX */ panic("syscall"); /* NOT REACHED */ @@ -757,25 +755,25 @@ reg = 0; regcnt = 6; td->td_pticks = 0; - td->td_frame = &frame; + td->td_frame = frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); #ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); #endif - params = (caddr_t)frame.tf_rsp + sizeof(register_t); - code = frame.tf_rax; - orig_tf_rflags = frame.tf_rflags; + params = (caddr_t)frame->tf_rsp + sizeof(register_t); + code = frame->tf_rax; + orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { /* * The prep code is MP aware. */ - (*p->p_sysent->sv_prepsyscall)(&frame, (int *)args, &code, ¶ms); + (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { - code = frame.tf_rdi; + code = frame->tf_rdi; reg++; regcnt--; } @@ -797,7 +795,7 @@ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; - argp = &frame.tf_rdi; + argp = &frame->tf_rdi; argp += reg; bcopy(argp, args, sizeof(args[0]) * regcnt); if (narg > regcnt) { @@ -817,7 +815,7 @@ if (error == 0) { td->td_retval[0] = 0; - td->td_retval[1] = frame.tf_rdx; + td->td_retval[1] = frame->tf_rdx; STOPEVENT(p, S_SCE, narg); @@ -830,9 +828,9 @@ switch (error) { case 0: - frame.tf_rax = td->td_retval[0]; - frame.tf_rdx = td->td_retval[1]; - frame.tf_rflags &= ~PSL_C; + frame->tf_rax = td->td_retval[0]; + frame->tf_rdx = td->td_retval[1]; + frame->tf_rflags &= ~PSL_C; break; case ERESTART: @@ -842,8 +840,8 @@ * (which was holding the value of %rcx) is restored for * the next iteration. */ - frame.tf_rip -= frame.tf_err; - frame.tf_r10 = frame.tf_rcx; + frame->tf_rip -= frame->tf_err; + frame->tf_r10 = frame->tf_rcx; td->td_pcb->pcb_flags |= PCB_FULLCTX; break; @@ -857,8 +855,8 @@ else error = p->p_sysent->sv_errtbl[error]; } - frame.tf_rax = error; - frame.tf_rflags |= PSL_C; + frame->tf_rax = error; + frame->tf_rflags |= PSL_C; break; } @@ -866,11 +864,11 @@ * Traced syscall. */ if (orig_tf_rflags & PSL_T) { - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; - ksi.ksi_addr = (void *)frame.tf_rip; + ksi.ksi_addr = (void *)frame->tf_rip; trapsignal(td, &ksi); } @@ -890,7 +888,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.470 2006/12/03 21:02:09 netchild Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp $ cpu HAMMER ident GENERIC @@ -195,6 +195,7 @@ device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet +device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nge # NatSemi DP83820 gigabit Ethernet device nve # nVidia nForce MCP on-board Ethernet Networking device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le') ==== //depot/projects/vimage/src/sys/amd64/ia32/ia32_exception.S#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.4 2004/05/24 11:28:11 bde Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.5 2006/12/17 06:48:39 kmacy Exp $ */ #include @@ -61,6 +61,7 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call ia32_syscall >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 27 19:43: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 58F8016A416; Wed, 27 Dec 2006 19:43:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B70116A40F for ; Wed, 27 Dec 2006 19:43:26 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F193E13C46D for ; Wed, 27 Dec 2006 19:43:25 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBRJhPZp091182 for ; Wed, 27 Dec 2006 19:43:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBRJhPNX091177 for perforce@freebsd.org; Wed, 27 Dec 2006 19:43:25 GMT (envelope-from marcel@freebsd.org) Date: Wed, 27 Dec 2006 19:43:25 GMT Message-Id: <200612271943.kBRJhPNX091177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 112174 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, 27 Dec 2006 19:43:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=112174 Change 112174 by marcel@marcel_nfs on 2006/12/27 19:42:41 Save some WIP. Affected files ... .. //depot/projects/gdb/sys/sys/core.h#2 edit Differences ... ==== //depot/projects/gdb/sys/sys/core.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Marcel Moolenaar + * Copyright (c) 2005, 2006 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,38 +30,50 @@ #define _SYS_CORE_H_ /* - * Process and thread information is stored as a sequence of (tag,size,value) - * triples. The tag describes what information is being provided, the size - * specifies how many bytes the information occupies, and the value is the - * actual information. This scheme allows any consumer to scan the sequence - * and extract whatever information it knows or cares about, without having - * to understand all the information. Also, it avoids the typical problems - * that structure-based approaches have, which is that third-party software - * and cross-tools often need to hardcode structure offsets to access the - * information as they cannot always depend on the original definition of - * the structure. + * The auxiliary information in a core file is constructed according to the + * definitions in this header. The information thus constructed is stored in + * a core file in a file format specific manner. For ELF based core files, + * it is stored in one or more PT_NOTE sections. The PT_NOTE section is the + * container for the information. + * + * The definitions in this header are designed with the following properties + * in mind: + * 1. The creation of a core file and the auxiliary information contained + * in it can be based on independent sub-procedures with limited scope. + * As such, the context in which each bit of information is placed is + * mostly unknown to the procedure that constructs the information. + * 2. The amount of auxiliary information is highly dynamic. Not only is + * there variation between platforms, there's also variation possible + * based on options and settings. + * 3. The tools that process core files and in particular the auxiliary + * information must be able to extract the information they know and + * care about without being programmed for each and every variation. + * + * Auxiliary process and thread information is stored as a sequence of + * (tag,align,size,value) quadruples. The tag describes what information is + * being provided, the size specifies how many bytes the information + * occupies, the align specifies the alignment constraints and the value is + * the actual information. This scheme allows any consumer to scan the + * sequence of quadruples and extract whatever information it knows or cares + * about, without having to understand all the information. Also, it avoids + * the typical problems that structure-based approaches have, which is that + * third-party software and cross-tools often need to hardcode structure + * offsets to access the information as they cannot always depend on the + * original definition of the structure. */ -struct core_triple { - uint16_t ct_tag; - uint16_t ct_size; - uint8_t ct_value[]; + +struct core_quadruple { + uint32_t cq_tag:12; + uint32_t cq_align:4; + uint32_t cq_size:16; + uint8_t cq_data[]; }; -/* - * The __CT_TAG macro encodes its 14-bit argument in such a way that it is - * possible to detect byte-order mismatches. The most-significant bit of - * the two bytes that make up the tag have different values. When there's - * a byte-order mismatch, these values will be opposite. - */ -#define __CT_TAG_HIGH(b) (0x00 | ((b) & 0x7F)) -#define __CT_TAG_LOW(b) (0x80 | ((b) & 0x7F)) -#define __CT_TAG(v) (__CT_TAG_HIGH((v) >> 7) | __CT_TAG_LOW(v)) - -#define CT_TAG_NOTHING __CT_TAG(0x0000) -#define CT_TAG_OSRELDATE __CT_TAG(0x0001) -#define CT_TAG_PID __CT_TAG(0x0002) -#define CT_TAG_COMM __CT_TAG(0x0003) -#define CT_TAG_SIGNAL __CT_TAG(0x0004) -#define CT_TAG_LWPID __CT_TAG(0x0005) +#define CT_TAG_NOTHING 0x000 +#define CT_TAG_OSRELDATE 0x001 +#define CT_TAG_PID 0x002 +#define CT_TAG_COMM 0x003 +#define CT_TAG_SIGNAL 0x004 +#define CT_TAG_LWPID 0x005 #endif /* _SYS_CORE_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Dec 28 04:35:32 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 8C2D616A416; Thu, 28 Dec 2006 04:35:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3639C16A415 for ; Thu, 28 Dec 2006 04:35:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 24A6D13C475 for ; Thu, 28 Dec 2006 04:35:32 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBS4ZWTt032689 for ; Thu, 28 Dec 2006 04:35:32 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBS4ZVbv032686 for perforce@freebsd.org; Thu, 28 Dec 2006 04:35:31 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Dec 2006 04:35:31 GMT Message-Id: <200612280435.kBS4ZVbv032686@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 112190 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, 28 Dec 2006 04:35:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=112190 Change 112190 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 04:34:41 create branch to ascertain how much work is required to bring legacy drivers up to date Affected files ... .. //depot/projects/kmacy_wifi/COPYRIGHT#1 branch .. //depot/projects/kmacy_wifi/LOCKS#1 branch .. //depot/projects/kmacy_wifi/MAINTAINERS#1 branch .. //depot/projects/kmacy_wifi/Makefile#1 branch .. //depot/projects/kmacy_wifi/Makefile.inc1#1 branch .. //depot/projects/kmacy_wifi/ObsoleteFiles.inc#1 branch .. //depot/projects/kmacy_wifi/README#1 branch .. //depot/projects/kmacy_wifi/UPDATING#1 branch .. //depot/projects/kmacy_wifi/bin/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/Makefile.inc#1 branch .. //depot/projects/kmacy_wifi/bin/cat/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/cat/cat.1#1 branch .. //depot/projects/kmacy_wifi/bin/cat/cat.c#1 branch .. //depot/projects/kmacy_wifi/bin/chflags/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/chflags/chflags.1#1 branch .. //depot/projects/kmacy_wifi/bin/chflags/chflags.c#1 branch .. //depot/projects/kmacy_wifi/bin/chio/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/chio/chio.1#1 branch .. //depot/projects/kmacy_wifi/bin/chio/chio.c#1 branch .. //depot/projects/kmacy_wifi/bin/chio/defs.h#1 branch .. //depot/projects/kmacy_wifi/bin/chio/pathnames.h#1 branch .. //depot/projects/kmacy_wifi/bin/chmod/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/chmod/chmod.1#1 branch .. //depot/projects/kmacy_wifi/bin/chmod/chmod.c#1 branch .. //depot/projects/kmacy_wifi/bin/cp/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/cp/cp.1#1 branch .. //depot/projects/kmacy_wifi/bin/cp/cp.c#1 branch .. //depot/projects/kmacy_wifi/bin/cp/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/cp/utils.c#1 branch .. //depot/projects/kmacy_wifi/bin/csh/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/kmacy_wifi/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/kmacy_wifi/bin/csh/config.h#1 branch .. //depot/projects/kmacy_wifi/bin/csh/config_p.h#1 branch .. //depot/projects/kmacy_wifi/bin/csh/host.defs#1 branch .. //depot/projects/kmacy_wifi/bin/csh/iconv.h#1 branch .. //depot/projects/kmacy_wifi/bin/csh/iconv_stub.c#1 branch .. //depot/projects/kmacy_wifi/bin/date/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/date/date.1#1 branch .. //depot/projects/kmacy_wifi/bin/date/date.c#1 branch .. //depot/projects/kmacy_wifi/bin/date/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/date/netdate.c#1 branch .. //depot/projects/kmacy_wifi/bin/date/vary.c#1 branch .. //depot/projects/kmacy_wifi/bin/date/vary.h#1 branch .. //depot/projects/kmacy_wifi/bin/dd/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/dd/args.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/conv.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/conv_tab.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/dd.1#1 branch .. //depot/projects/kmacy_wifi/bin/dd/dd.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/dd.h#1 branch .. //depot/projects/kmacy_wifi/bin/dd/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/dd/gen.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/misc.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/position.c#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.ascii#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.ebcdic#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.ibm#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.lcase#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.oldascii#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.oldibm#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.pareven#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.parnone#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.parodd#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.parset#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.swab#1 branch .. //depot/projects/kmacy_wifi/bin/dd/ref.ucase#1 branch .. //depot/projects/kmacy_wifi/bin/df/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/df/df.1#1 branch .. //depot/projects/kmacy_wifi/bin/df/df.c#1 branch .. //depot/projects/kmacy_wifi/bin/domainname/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/domainname/domainname.1#1 branch .. //depot/projects/kmacy_wifi/bin/domainname/domainname.c#1 branch .. //depot/projects/kmacy_wifi/bin/echo/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/echo/echo.1#1 branch .. //depot/projects/kmacy_wifi/bin/echo/echo.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/ed/POSIX#1 branch .. //depot/projects/kmacy_wifi/bin/ed/README#1 branch .. //depot/projects/kmacy_wifi/bin/ed/buf.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/cbc.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/ed.1#1 branch .. //depot/projects/kmacy_wifi/bin/ed/ed.h#1 branch .. //depot/projects/kmacy_wifi/bin/ed/glbl.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/io.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/main.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/re.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/sub.c#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/=.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/README#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/TODO#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/a.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/a.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/a.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/a1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/a2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/addr.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/addr.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/addr.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/addr1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/addr2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/ascii.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/bang1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/bang1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/bang1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/bang1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/bang2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/c.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/c.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/c.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/c1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/c2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/d.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/d.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/d.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/d.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e2.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e2.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e2.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e3.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e3.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e3.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e3.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e4.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e4.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/e4.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/f1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/f2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g2.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g2.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g2.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g3.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g3.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g3.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g3.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g4.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g4.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g4.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g5.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g5.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/g5.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/h.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/i.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/i.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/i.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/i1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/i2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/i3.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/j.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/j.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/j.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k3.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/k4.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/l.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/l.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/l.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/m.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/m.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/m.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/m.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/n.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/n.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/n.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl2.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl2.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/nl2.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/p.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/p.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/p.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/q.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/q.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/q.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/q1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r2.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r2.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r2.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r3.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r3.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/r3.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s10.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s2.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s2.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s2.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s3.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s3.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s3.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s3.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s4.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s5.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s6.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s7.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s8.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/s9.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t1.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t1.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t1.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t2.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t2.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/t2.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/u.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/u.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/u.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/u.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/v.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/v.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/v.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/w.d#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/w.r#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/w.t#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/w1.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/w2.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/w3.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/x.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/test/z.err#1 branch .. //depot/projects/kmacy_wifi/bin/ed/undo.c#1 branch .. //depot/projects/kmacy_wifi/bin/expr/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/expr/expr.1#1 branch .. //depot/projects/kmacy_wifi/bin/expr/expr.y#1 branch .. //depot/projects/kmacy_wifi/bin/getfacl/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/getfacl/getfacl.1#1 branch .. //depot/projects/kmacy_wifi/bin/getfacl/getfacl.c#1 branch .. //depot/projects/kmacy_wifi/bin/hostname/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/hostname/hostname.1#1 branch .. //depot/projects/kmacy_wifi/bin/hostname/hostname.c#1 branch .. //depot/projects/kmacy_wifi/bin/kenv/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/kenv/kenv.1#1 branch .. //depot/projects/kmacy_wifi/bin/kenv/kenv.c#1 branch .. //depot/projects/kmacy_wifi/bin/kill/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/kill/kill.1#1 branch .. //depot/projects/kmacy_wifi/bin/kill/kill.c#1 branch .. //depot/projects/kmacy_wifi/bin/ln/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/ln/ln.1#1 branch .. //depot/projects/kmacy_wifi/bin/ln/ln.c#1 branch .. //depot/projects/kmacy_wifi/bin/ln/symlink.7#1 branch .. //depot/projects/kmacy_wifi/bin/ls/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/ls/cmp.c#1 branch .. //depot/projects/kmacy_wifi/bin/ls/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/ls/ls.1#1 branch .. //depot/projects/kmacy_wifi/bin/ls/ls.c#1 branch .. //depot/projects/kmacy_wifi/bin/ls/ls.h#1 branch .. //depot/projects/kmacy_wifi/bin/ls/print.c#1 branch .. //depot/projects/kmacy_wifi/bin/ls/util.c#1 branch .. //depot/projects/kmacy_wifi/bin/mkdir/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/mkdir/mkdir.1#1 branch .. //depot/projects/kmacy_wifi/bin/mkdir/mkdir.c#1 branch .. //depot/projects/kmacy_wifi/bin/mv/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/mv/mv.1#1 branch .. //depot/projects/kmacy_wifi/bin/mv/mv.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/pax/ar_io.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/ar_subs.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/buf_subs.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/cache.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/cache.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/cpio.1#1 branch .. //depot/projects/kmacy_wifi/bin/pax/cpio.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/cpio.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/file_subs.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/ftree.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/ftree.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/gen_subs.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/getoldopt.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/options.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/options.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/pat_rep.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/pat_rep.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/pax.1#1 branch .. //depot/projects/kmacy_wifi/bin/pax/pax.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/pax.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/sel_subs.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/sel_subs.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/tables.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/tables.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/tar.1#1 branch .. //depot/projects/kmacy_wifi/bin/pax/tar.c#1 branch .. //depot/projects/kmacy_wifi/bin/pax/tar.h#1 branch .. //depot/projects/kmacy_wifi/bin/pax/tty_subs.c#1 branch .. //depot/projects/kmacy_wifi/bin/ps/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/ps/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/ps/fmt.c#1 branch .. //depot/projects/kmacy_wifi/bin/ps/keyword.c#1 branch .. //depot/projects/kmacy_wifi/bin/ps/nlist.c#1 branch .. //depot/projects/kmacy_wifi/bin/ps/print.c#1 branch .. //depot/projects/kmacy_wifi/bin/ps/ps.1#1 branch .. //depot/projects/kmacy_wifi/bin/ps/ps.c#1 branch .. //depot/projects/kmacy_wifi/bin/ps/ps.h#1 branch .. //depot/projects/kmacy_wifi/bin/pwd/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/pwd/pwd.1#1 branch .. //depot/projects/kmacy_wifi/bin/pwd/pwd.c#1 branch .. //depot/projects/kmacy_wifi/bin/rcp/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/rcp/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/rcp/rcp.1#1 branch .. //depot/projects/kmacy_wifi/bin/rcp/rcp.c#1 branch .. //depot/projects/kmacy_wifi/bin/rcp/util.c#1 branch .. //depot/projects/kmacy_wifi/bin/realpath/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/realpath/realpath.1#1 branch .. //depot/projects/kmacy_wifi/bin/realpath/realpath.c#1 branch .. //depot/projects/kmacy_wifi/bin/rm/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/rm/rm.1#1 branch .. //depot/projects/kmacy_wifi/bin/rm/rm.c#1 branch .. //depot/projects/kmacy_wifi/bin/rmail/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/rmdir/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/rmdir/rmdir.1#1 branch .. //depot/projects/kmacy_wifi/bin/rmdir/rmdir.c#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/file.c#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/mask.c#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/merge.c#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/remove.c#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/setfacl.1#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/setfacl.c#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/setfacl.h#1 branch .. //depot/projects/kmacy_wifi/bin/setfacl/util.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/sh/TOUR#1 branch .. //depot/projects/kmacy_wifi/bin/sh/alias.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/alias.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/arith.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/arith.y#1 branch .. //depot/projects/kmacy_wifi/bin/sh/arith_lex.l#1 branch .. //depot/projects/kmacy_wifi/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/bltin/echo.1#1 branch .. //depot/projects/kmacy_wifi/bin/sh/bltin/echo.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/builtins.def#1 branch .. //depot/projects/kmacy_wifi/bin/sh/cd.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/cd.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/error.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/error.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/eval.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/eval.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/exec.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/exec.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/expand.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/expand.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/cmv#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/dirs#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/kill#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/login#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/newgrp#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/popd#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/pushd#1 branch .. //depot/projects/kmacy_wifi/bin/sh/funcs/suspend#1 branch .. //depot/projects/kmacy_wifi/bin/sh/histedit.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/init.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/input.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/input.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/jobs.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/jobs.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mail.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mail.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/main.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/main.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/memalloc.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/memalloc.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/miscbltin.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mkbuiltins#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mkinit.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mknodes.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mksyntax.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mktokens#1 branch .. //depot/projects/kmacy_wifi/bin/sh/myhistedit.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mystring.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/mystring.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/nodes.c.pat#1 branch .. //depot/projects/kmacy_wifi/bin/sh/nodetypes#1 branch .. //depot/projects/kmacy_wifi/bin/sh/options.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/options.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/output.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/output.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/parser.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/parser.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/redir.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/redir.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/sh.1#1 branch .. //depot/projects/kmacy_wifi/bin/sh/shell.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/show.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/show.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/trap.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/trap.h#1 branch .. //depot/projects/kmacy_wifi/bin/sh/var.c#1 branch .. //depot/projects/kmacy_wifi/bin/sh/var.h#1 branch .. //depot/projects/kmacy_wifi/bin/sleep/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/sleep/sleep.1#1 branch .. //depot/projects/kmacy_wifi/bin/sleep/sleep.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/stty/cchar.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/extern.h#1 branch .. //depot/projects/kmacy_wifi/bin/stty/gfmt.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/key.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/modes.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/print.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/stty.1#1 branch .. //depot/projects/kmacy_wifi/bin/stty/stty.c#1 branch .. //depot/projects/kmacy_wifi/bin/stty/stty.h#1 branch .. //depot/projects/kmacy_wifi/bin/stty/util.c#1 branch .. //depot/projects/kmacy_wifi/bin/sync/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/sync/sync.8#1 branch .. //depot/projects/kmacy_wifi/bin/sync/sync.c#1 branch .. //depot/projects/kmacy_wifi/bin/test/Makefile#1 branch .. //depot/projects/kmacy_wifi/bin/test/TEST.README#1 branch .. //depot/projects/kmacy_wifi/bin/test/TEST.csh#1 branch .. //depot/projects/kmacy_wifi/bin/test/TEST.sh#1 branch .. //depot/projects/kmacy_wifi/bin/test/test.1#1 branch .. //depot/projects/kmacy_wifi/bin/test/test.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/AUTHORS#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/BUGS#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/COPYING#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/ChangeLog#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/INSTALL#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/NEWS#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/README#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/README.ldap#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/README.y2k#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amd.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amd.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/autil.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/clock.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/conf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/map.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/opts.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/restart.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/sched.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/amq.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/amq.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/amq.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/bootstrap#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/doc/version.texi#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/util.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/amindent#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/autopat#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/mkconf#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/tasks#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/kmacy_wifi/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/AUTHORS#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/ChangeLog#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/FAQ#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/INSTALL#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Makefile.am#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/NEWS#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/README#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/array.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/atan.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/div.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/exp.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/fact.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/jn.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/ln.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/mul.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/raise.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/signum#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/sine.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/Test/timetest#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/acconfig.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/aclocal.m4#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/bc.y#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/const.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/execute.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/global.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/global.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/load.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/main.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/proto.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/scan.l#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/storage.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/bc/util.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/config.h.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/configure#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/configure.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/array.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/dc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/dc.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/eval.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/misc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/stack.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/dc/string.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/doc/bc.1#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/doc/dc.1#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/h/number.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/install-sh#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/lib/number.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/missing#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/kmacy_wifi/contrib/bc/stamp-h.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/CHANGES#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/FAQ#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/README#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/acconfig.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/config.guess#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/config.sub#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/config.threads.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/configure.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/doc/rfc/rfc3425.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 28 10:23:49 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 DF64716A415; Thu, 28 Dec 2006 10:23:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AFAC916A407 for ; Thu, 28 Dec 2006 10:23:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9C80013C474 for ; Thu, 28 Dec 2006 10:23:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSANmuq083136 for ; Thu, 28 Dec 2006 10:23:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSAKn97082219 for perforce@freebsd.org; Thu, 28 Dec 2006 10:20:49 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Dec 2006 10:20:49 GMT Message-Id: <200612281020.kBSAKn97082219@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 112200 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, 28 Dec 2006 10:23:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=112200 Change 112200 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 10:19:15 IFC and make LINT build Affected files ... .. //depot/projects/kmacy_wifi/MAINTAINERS#2 integrate .. //depot/projects/kmacy_wifi/Makefile#2 integrate .. //depot/projects/kmacy_wifi/Makefile.inc1#2 integrate .. //depot/projects/kmacy_wifi/ObsoleteFiles.inc#2 integrate .. //depot/projects/kmacy_wifi/UPDATING#2 integrate .. //depot/projects/kmacy_wifi/bin/cat/cat.1#2 integrate .. //depot/projects/kmacy_wifi/bin/chmod/chmod.1#2 integrate .. //depot/projects/kmacy_wifi/bin/cp/cp.1#2 integrate .. //depot/projects/kmacy_wifi/bin/cp/cp.c#2 integrate .. //depot/projects/kmacy_wifi/bin/cp/extern.h#2 integrate .. //depot/projects/kmacy_wifi/bin/cp/utils.c#2 integrate .. //depot/projects/kmacy_wifi/bin/date/netdate.c#2 integrate .. //depot/projects/kmacy_wifi/bin/df/df.c#2 integrate .. //depot/projects/kmacy_wifi/bin/domainname/domainname.1#2 integrate .. //depot/projects/kmacy_wifi/bin/ed/main.c#2 integrate .. //depot/projects/kmacy_wifi/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/kmacy_wifi/bin/hostname/hostname.1#2 integrate .. //depot/projects/kmacy_wifi/bin/hostname/hostname.c#2 integrate .. //depot/projects/kmacy_wifi/bin/ls/ls.1#2 integrate .. //depot/projects/kmacy_wifi/bin/ls/print.c#2 integrate .. //depot/projects/kmacy_wifi/bin/mkdir/mkdir.c#2 integrate .. //depot/projects/kmacy_wifi/bin/pax/cpio.c#2 integrate .. //depot/projects/kmacy_wifi/bin/pax/pax.1#2 integrate .. //depot/projects/kmacy_wifi/bin/pax/tar.c#2 integrate .. //depot/projects/kmacy_wifi/bin/ps/ps.1#2 integrate .. //depot/projects/kmacy_wifi/bin/rm/rm.1#2 integrate .. //depot/projects/kmacy_wifi/bin/rm/rm.c#2 integrate .. //depot/projects/kmacy_wifi/bin/setfacl/setfacl.1#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/expand.c#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/histedit.c#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/jobs.c#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/jobs.h#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/main.c#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/parser.c#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/parser.h#2 integrate .. //depot/projects/kmacy_wifi/bin/sh/sh.1#2 integrate .. //depot/projects/kmacy_wifi/bin/test/test.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/CHANGES#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/FAQ#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/README#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/configure.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/bind9/version#2 integrate .. //depot/projects/kmacy_wifi/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/kmacy_wifi/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/cvs/src/log.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/builtins.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/c-common.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/c-common.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cccp.1#2 delete .. //depot/projects/kmacy_wifi/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/combine.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config.gcc#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config.host#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/kmacy_wifi/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/kmacy_wifi/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/config/x-linux#1 branch .. //depot/projects/kmacy_wifi/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/kmacy_wifi/contrib/gcc/configure#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/configure.ac#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/coverage.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cpp.1#2 delete .. //depot/projects/kmacy_wifi/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/cse.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/expmed.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/flow.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/function.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/gcc.1#2 delete .. //depot/projects/kmacy_wifi/contrib/gcc/gcc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/gcov.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/gcse.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/global.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/hooks.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/hooks.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/local-alloc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/longlong.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/loop.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/md5.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/md5.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/mips-tdump.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/mips-tfile.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/mklibgcc.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/optabs.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/reg-stack.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/regrename.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/regs.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/rtl.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/sched-rgn.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/simplify-rtx.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/stmt.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/toplev.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/tree.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/unroll.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gcc/version.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/kmacy_wifi/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/todo#1 branch .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/LICENSE#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/Makefile.aut#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/NEWS#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/README#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/brac.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/ch.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/charset.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/charset.h#1 branch .. //depot/projects/kmacy_wifi/contrib/less/cmd.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/command.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/configure#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/configure.ac#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/decode.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/defines.ds#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/defines.h.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/defines.o2#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/defines.o9#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/defines.wn#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/edit.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/filename.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/forwback.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/funcs.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/ifile.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/input.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/jump.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/less.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/less.man#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/less.nro#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lessecho.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lessecho.man#1 branch .. //depot/projects/kmacy_wifi/contrib/less/lessecho.nro#1 branch .. //depot/projects/kmacy_wifi/contrib/less/lesskey.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lesskey.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lesskey.man#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lesskey.nro#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lglob.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/line.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/linenum.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/lsystem.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/main.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/mark.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/mkhelp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/optfunc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/option.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/option.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/opttbl.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/os.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/output.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/pckeys.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/position.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/position.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/prompt.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/screen.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/scrsize.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/search.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/signal.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/tags.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/ttyin.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/less/version.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libbegemot/rpoll.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libbegemot/rpoll.man#2 integrate .. //depot/projects/kmacy_wifi/contrib/libf2c/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/contrib/libobjc/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/contrib/libobjc/README#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/README.dag#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/VERSION#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/configure#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/configure.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/kmacy_wifi/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/kmacy_wifi/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/kmacy_wifi/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/kmacy_wifi/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/kmacy_wifi/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/kmacy_wifi/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/kmacy_wifi/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/README#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/TODO#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/VERSION#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bsm/audit.h#2 delete .. //depot/projects/kmacy_wifi/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/kmacy_wifi/contrib/openbsm/bsm/audit_kevents.h#2 delete .. //depot/projects/kmacy_wifi/contrib/openbsm/bsm/audit_record.h#2 delete .. //depot/projects/kmacy_wifi/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/configure#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/kmacy_wifi/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/kmacy_wifi/contrib/pf/pfctl/pfctl_altq.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/AUTHORS#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/COPYING#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/ChangeLog#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/FREEBSD-Xlist#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/INSTALL#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/NEWS#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/PORTS#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/README#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/README-alpha#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/THANKS#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/TODO#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/doc/header.texi#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/doc/version.texi#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/addext.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/basename.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/error.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/error.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/getline.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/getline.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/hash.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/hash.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/human.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/human.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/memset.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/quote.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/quote.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/rename.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/utime.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/arith.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/buffer.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/common.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/compare.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/create.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/delete.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/extract.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/incremen.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/list.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/mangle.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/misc.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/names.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/rmt.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/rmt.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/system.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/tar.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/tar.h#2 delete .. //depot/projects/kmacy_wifi/contrib/tar/src/update.c#2 delete .. //depot/projects/kmacy_wifi/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/FILES#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/configure#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/kmacy_wifi/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/kmacy_wifi/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/kmacy_wifi/contrib/top/sigconv.awk#2 integrate .. //depot/projects/kmacy_wifi/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/kmacy_wifi/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/CREDITS#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/INSTALL#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/LICENCE#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/OVERVIEW#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/README#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/README.platform#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/README.tun#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/acss.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/atomicio.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/atomicio.h#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/audit.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/audit.h#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-rh-rsa.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth-skey.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth.h#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth1.c#2 integrate .. //depot/projects/kmacy_wifi/crypto/openssh/auth2-chall.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 28 13:35:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A850D16A49E; Thu, 28 Dec 2006 13:35:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E4C1016A407 for ; Thu, 28 Dec 2006 13:35:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2F2E913C46D for ; Thu, 28 Dec 2006 13:35:01 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSDZ1P6025100 for ; Thu, 28 Dec 2006 13:35:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSDYvAZ025086 for perforce@freebsd.org; Thu, 28 Dec 2006 13:34:57 GMT (envelope-from jhb@freebsd.org) Date: Thu, 28 Dec 2006 13:34:57 GMT Message-Id: <200612281334.kBSDYvAZ025086@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 112214 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, 28 Dec 2006 13:35:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=112214 Change 112214 by jhb@jhb_zion on 2006/12/28 13:34:32 IFC @112213. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#26 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#63 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#57 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_exception.S#4 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#23 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#15 integrate .. //depot/projects/smpng/sys/amd64/include/atomic.h#29 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic.c#15 integrate .. //depot/projects/smpng/sys/amd64/isa/atpic_vector.S#6 integrate .. //depot/projects/smpng/sys/amd64/isa/icu.h#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#14 integrate .. //depot/projects/smpng/sys/boot/arm/at91/Makefile.inc#5 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/main.c#5 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/eeprom.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.c#6 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/lib.h#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/smpng/sys/boot/common/bootstrap.h#11 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#22 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#40 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#44 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#37 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#37 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#37 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#37 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#41 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#29 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.h#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#42 integrate .. //depot/projects/smpng/sys/conf/files#194 integrate .. //depot/projects/smpng/sys/conf/files.amd64#50 integrate .. //depot/projects/smpng/sys/conf/files.arm#12 integrate .. //depot/projects/smpng/sys/conf/files.i386#105 integrate .. //depot/projects/smpng/sys/conf/files.pc98#87 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#34 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#59 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#4 integrate .. //depot/projects/smpng/sys/conf/options#131 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#15 integrate .. //depot/projects/smpng/sys/dev/aac/aac_linux.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_battery.c#19 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#37 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#47 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#28 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#85 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#49 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#13 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#42 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#50 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#50 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#46 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#25 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#35 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#11 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#82 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#5 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#47 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#47 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#46 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#28 integrate .. //depot/projects/smpng/sys/fs/msdosfs/bpb.h#5 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#23 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#122 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#29 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#104 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/vm86bios.s#7 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#24 integrate .. //depot/projects/smpng/sys/i386/include/atomic.h#47 integrate .. //depot/projects/smpng/sys/i386/isa/atpic.c#18 integrate .. //depot/projects/smpng/sys/i386/isa/atpic_vector.s#14 integrate .. //depot/projects/smpng/sys/i386/isa/icu.h#13 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#14 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#38 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#36 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#37 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#43 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#108 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#129 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#97 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#30 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#65 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#30 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#57 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#34 integrate .. //depot/projects/smpng/sys/kern/tty.c#69 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#51 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#97 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#98 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/smpng/sys/kern/vfs_mount.c#67 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#120 integrate .. //depot/projects/smpng/sys/modules/Makefile#133 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#31 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#13 integrate .. //depot/projects/smpng/sys/modules/ufs/Makefile#5 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#78 integrate .. //depot/projects/smpng/sys/net/if_media.h#20 integrate .. //depot/projects/smpng/sys/net80211/_ieee80211.h#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#24 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_nat.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.h#6 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#67 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mmu_oea.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_label.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#17 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#7 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#15 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#44 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#21 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#8 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#34 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#39 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#14 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#10 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#19 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#35 integrate .. //depot/projects/smpng/sys/sparc64/include/param.h#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#41 integrate .. //depot/projects/smpng/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/smpng/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_init.c#4 integrate .. //depot/projects/smpng/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/smpng/sys/sun4v/sun4v/exception.S#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hcall.S#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/interrupt.S#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#9 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tsb.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte_hash.c#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/wbuf.S#4 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#42 delete .. //depot/projects/smpng/sys/sys/mount.h#56 integrate .. //depot/projects/smpng/sys/sys/mouse.h#7 integrate .. //depot/projects/smpng/sys/sys/mutex.h#68 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#18 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#50 integrate .. //depot/projects/smpng/sys/sys/sysent.h#23 integrate .. //depot/projects/smpng/sys/sys/systm.h#76 integrate .. //depot/projects/smpng/sys/sys/umtx.h#20 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#89 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#15 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.109 2006/05/01 21:36:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.110 2006/12/17 06:48:39 kmacy Exp $ */ /* @@ -60,6 +60,7 @@ jz 2f ; \ addl $(32 * index),%eax ; \ 1: ; \ + movq %rsp, %rsi ; \ movl %eax, %edi ; /* pass the IRQ */ \ call lapic_handle_intr ; \ MEXITCOUNT ; \ @@ -98,7 +99,7 @@ IDTVEC(timerint) PUSH_FRAME FAKE_MCOUNT(TF_RIP(%rsp)) - + movq %rsp, %rdi call lapic_handle_timer MEXITCOUNT jmp doreti ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#16 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.154 2005/10/17 23:10:31 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.155 2006/12/20 04:40:38 davidxu Exp $ */ #include @@ -206,6 +206,11 @@ movq %rbx, (%rax) movq %rbx, PCPU(RSP0) + movl TD_TID(%rsi), %eax + movq %r8, PCPU(CURPCB) + movl %eax, PCPU(CURTID) + movq %rsi, PCPU(CURTHREAD) /* into next thread */ + /* Restore context. */ movq PCB_RBX(%r8),%rbx movq PCB_RSP(%r8),%rsp @@ -217,9 +222,6 @@ movq PCB_RIP(%r8),%rax movq %rax,(%rsp) - movq %r8, PCPU(CURPCB) - movq %rsi, PCPU(CURTHREAD) /* into next thread */ - /* Test if debug registers should be restored. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) jz 1f ==== //depot/projects/smpng/sys/amd64/amd64/exception.S#17 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.127 2005/08/27 16:03:40 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $ */ #include "opt_atpic.h" @@ -165,6 +165,7 @@ .globl calltrap .type calltrap,@function calltrap: + movq %rsp, %rdi call trap MEXITCOUNT jmp doreti /* Handle any pending ASTs */ @@ -267,6 +268,7 @@ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) @@ -363,6 +365,7 @@ /* Note: this label is also used by ddb and gdb: */ nmi_calltrap: FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call trap MEXITCOUNT testl %ebx,%ebx ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#18 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.159 2006/11/30 04:17:04 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.160 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_compat.h" #include "opt_kstack_pages.h" @@ -79,6 +79,7 @@ ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_TID, offsetof(struct thread, td_tid)); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); @@ -190,6 +191,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_TSSP, offsetof(struct pcpu, pc_tssp)); ASSYM(PC_RSP0, offsetof(struct pcpu, pc_rsp0)); +ASSYM(PC_CURTID, offsetof(struct pcpu, pc_curtid)); ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#26 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.33 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.34 2006/12/17 06:48:39 kmacy Exp $"); #include "opt_hwpmc_hooks.h" @@ -610,18 +610,18 @@ } void -lapic_handle_intr(int vector, struct trapframe frame) +lapic_handle_intr(int vector, struct trapframe *frame) { struct intsrc *isrc; if (vector == -1) panic("Couldn't get vector from ISR!"); isrc = intr_lookup_source(apic_idt_to_irq(vector)); - intr_execute_handlers(isrc, &frame); + intr_execute_handlers(isrc, frame); } void -lapic_handle_timer(struct trapframe frame) +lapic_handle_timer(struct trapframe *frame) { struct lapic *la; @@ -654,16 +654,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); else - hardclock_cpu(TRAPF_USERMODE(&frame)); + hardclock_cpu(TRAPF_USERMODE(frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(TRAPF_USERMODE(&frame)); + statclock(TRAPF_USERMODE(frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -671,7 +671,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); + profclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); } critical_exit(); } ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#63 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.666 2006/12/06 18:27:17 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1164,6 +1164,7 @@ PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); PCPU_SET(curpcb, thread0.td_pcb); + PCPU_SET(curtid, thread0.td_tid); PCPU_SET(tssp, &common_tss[0]); /* ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#57 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.312 2006/11/28 20:04:00 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.313 2006/12/17 06:48:39 kmacy Exp $"); /* * AMD64 Trap and System call handling @@ -94,8 +94,8 @@ #endif #include -extern void trap(struct trapframe frame); -extern void syscall(struct trapframe frame); +extern void trap(struct trapframe *frame); +extern void syscall(struct trapframe *frame); static int trap_pfault(struct trapframe *, int); static void trap_fatal(struct trapframe *, vm_offset_t); @@ -155,8 +155,7 @@ */ void -trap(frame) - struct trapframe frame; +trap(struct trapframe *frame) { struct thread *td = curthread; struct proc *p = td->td_proc; @@ -165,7 +164,7 @@ ksiginfo_t ksi; PCPU_LAZY_INC(cnt.v_trap); - type = frame.tf_trapno; + type = frame->tf_trapno; #ifdef SMP #ifdef STOP_NMI @@ -192,12 +191,12 @@ * the NMI was handled by it and we can return immediately. */ if (type == T_NMI && pmc_intr && - (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame.tf_rip, - TRAPF_USERMODE(&frame))) + (*pmc_intr)(PCPU_GET(cpuid), (uintptr_t) frame->tf_rip, + TRAPF_USERMODE(frame))) goto out; #endif - if ((frame.tf_rflags & PSL_I) == 0) { + if ((frame->tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled * interrupts and then trapped. Enabling interrupts @@ -205,7 +204,7 @@ * interrupts disabled until they are accidentally * enabled later. */ - if (ISPL(frame.tf_cs) == SEL_UPL) + if (ISPL(frame->tf_cs) == SEL_UPL) printf( "pid %ld (%s): trap %d with interrupts disabled\n", (long)curproc->p_pid, curproc->p_comm, type); @@ -226,7 +225,7 @@ } } - code = frame.tf_err; + code = frame->tf_err; if (type == T_PAGEFLT) { /* * If we get a page fault while in a critical section, then @@ -245,15 +244,15 @@ if (td->td_critnest != 0 || WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL, "Kernel page fault") != 0) - trap_fatal(&frame, frame.tf_addr); + trap_fatal(frame, frame->tf_addr); } - if (ISPL(frame.tf_cs) == SEL_UPL) { + if (ISPL(frame->tf_cs) == SEL_UPL) { /* user trap */ td->td_pticks = 0; - td->td_frame = &frame; - addr = frame.tf_rip; + td->td_frame = frame; + addr = frame->tf_rip; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -266,7 +265,7 @@ case T_BPTFLT: /* bpt instruction fault */ case T_TRCTRAP: /* trace trap */ enable_intr(); - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; i = SIGTRAP; ucode = (type == T_TRCTRAP ? TRAP_TRACE : TRAP_BRKPT); break; @@ -298,12 +297,12 @@ break; case T_PAGEFLT: /* page fault */ - addr = frame.tf_addr; + addr = frame->tf_addr; #ifdef KSE if (td->td_pflags & TDP_SA) thread_user_enter(td); #endif - i = trap_pfault(&frame, TRUE); + i = trap_pfault(frame, TRUE); if (i == -1) goto userout; if (i == 0) @@ -334,7 +333,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap(type, 0, &frame); + kdb_trap(type, 0, frame); } #endif /* KDB */ goto userout; @@ -380,7 +379,7 @@ ("kernel trap doesn't have ucred")); switch (type) { case T_PAGEFLT: /* page fault */ - (void) trap_pfault(&frame, FALSE); + (void) trap_pfault(frame, FALSE); goto out; case T_DNA: @@ -413,12 +412,12 @@ * selectors and pointers when the user changes * them. */ - if (frame.tf_rip == (long)doreti_iret) { - frame.tf_rip = (long)doreti_iret_fault; + if (frame->tf_rip == (long)doreti_iret) { + frame->tf_rip = (long)doreti_iret_fault; goto out; } if (PCPU_GET(curpcb)->pcb_onfault != NULL) { - frame.tf_rip = + frame->tf_rip = (long)PCPU_GET(curpcb)->pcb_onfault; goto out; } @@ -434,8 +433,8 @@ * problem here and not every time the kernel is * entered. */ - if (frame.tf_rflags & PSL_NT) { - frame.tf_rflags &= ~PSL_NT; + if (frame->tf_rflags & PSL_NT) { + frame->tf_rflags &= ~PSL_NT; goto out; } break; @@ -470,7 +469,7 @@ */ #ifdef KDB /* XXX Giant */ - if (kdb_trap(type, 0, &frame)) + if (kdb_trap(type, 0, frame)) goto out; #endif break; @@ -487,7 +486,7 @@ */ if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap(type, 0, &frame); + kdb_trap(type, 0, frame); } #endif /* KDB */ goto out; @@ -497,7 +496,7 @@ #endif /* DEV_ISA */ } - trap_fatal(&frame, 0); + trap_fatal(frame, 0); goto out; } @@ -517,13 +516,13 @@ uprintf("fatal process exception: %s", trap_msg[type]); if ((type == T_PAGEFLT) || (type == T_PROTFLT)) - uprintf(", fault VA = 0x%lx", frame.tf_addr); + uprintf(", fault VA = 0x%lx", frame->tf_addr); uprintf("\n"); } #endif user: - userret(td, &frame); + userret(td, frame); mtx_assert(&Giant, MA_NOTOWNED); userout: out: @@ -723,8 +722,7 @@ * A system call is essentially treated as a trap. */ void -syscall(frame) - struct trapframe frame; +syscall(struct trapframe *frame) { caddr_t params; struct sysent *callp; @@ -746,7 +744,7 @@ PCPU_LAZY_INC(cnt.v_syscall); #ifdef DIAGNOSTIC - if (ISPL(frame.tf_cs) != SEL_UPL) { + if (ISPL(frame->tf_cs) != SEL_UPL) { mtx_lock(&Giant); /* try to stabilize the system XXX */ panic("syscall"); /* NOT REACHED */ @@ -757,25 +755,25 @@ reg = 0; regcnt = 6; td->td_pticks = 0; - td->td_frame = &frame; + td->td_frame = frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); #ifdef KSE if (p->p_flag & P_SA) thread_user_enter(td); #endif - params = (caddr_t)frame.tf_rsp + sizeof(register_t); - code = frame.tf_rax; - orig_tf_rflags = frame.tf_rflags; + params = (caddr_t)frame->tf_rsp + sizeof(register_t); + code = frame->tf_rax; + orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { /* * The prep code is MP aware. */ - (*p->p_sysent->sv_prepsyscall)(&frame, (int *)args, &code, ¶ms); + (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { - code = frame.tf_rdi; + code = frame->tf_rdi; reg++; regcnt--; } @@ -797,7 +795,7 @@ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; - argp = &frame.tf_rdi; + argp = &frame->tf_rdi; argp += reg; bcopy(argp, args, sizeof(args[0]) * regcnt); if (narg > regcnt) { @@ -817,7 +815,7 @@ if (error == 0) { td->td_retval[0] = 0; - td->td_retval[1] = frame.tf_rdx; + td->td_retval[1] = frame->tf_rdx; STOPEVENT(p, S_SCE, narg); @@ -830,9 +828,9 @@ switch (error) { case 0: - frame.tf_rax = td->td_retval[0]; - frame.tf_rdx = td->td_retval[1]; - frame.tf_rflags &= ~PSL_C; + frame->tf_rax = td->td_retval[0]; + frame->tf_rdx = td->td_retval[1]; + frame->tf_rflags &= ~PSL_C; break; case ERESTART: @@ -842,8 +840,8 @@ * (which was holding the value of %rcx) is restored for * the next iteration. */ - frame.tf_rip -= frame.tf_err; - frame.tf_r10 = frame.tf_rcx; + frame->tf_rip -= frame->tf_err; + frame->tf_r10 = frame->tf_rcx; td->td_pcb->pcb_flags |= PCB_FULLCTX; break; @@ -857,8 +855,8 @@ else error = p->p_sysent->sv_errtbl[error]; } - frame.tf_rax = error; - frame.tf_rflags |= PSL_C; + frame->tf_rax = error; + frame->tf_rflags |= PSL_C; break; } @@ -866,11 +864,11 @@ * Traced syscall. */ if (orig_tf_rflags & PSL_T) { - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; - ksi.ksi_addr = (void *)frame.tf_rip; + ksi.ksi_addr = (void *)frame->tf_rip; trapsignal(td, &ksi); } @@ -890,7 +888,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); ==== //depot/projects/smpng/sys/amd64/ia32/ia32_exception.S#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.4 2004/05/24 11:28:11 bde Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.5 2006/12/17 06:48:39 kmacy Exp $ */ #include @@ -61,6 +61,7 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) + movq %rsp, %rdi call ia32_syscall MEXITCOUNT jmp doreti ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#23 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.16 2006/07/28 20:22:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.17 2006/12/17 06:48:39 kmacy Exp $"); /* * 386 Trap and System call handling @@ -86,10 +86,10 @@ extern inthand_t IDTVEC(int0x80_syscall), IDTVEC(rsvd); extern const char *freebsd32_syscallnames[]; -void ia32_syscall(struct trapframe frame); /* Called from asm code */ +void ia32_syscall(struct trapframe *frame); /* Called from asm code */ void -ia32_syscall(struct trapframe frame) +ia32_syscall(struct trapframe *frame) { caddr_t params; int i; @@ -111,18 +111,18 @@ PCPU_LAZY_INC(cnt.v_syscall); td->td_pticks = 0; - td->td_frame = &frame; + td->td_frame = frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - params = (caddr_t)frame.tf_rsp + sizeof(u_int32_t); - code = frame.tf_rax; - orig_tf_rflags = frame.tf_rflags; + params = (caddr_t)frame->tf_rsp + sizeof(u_int32_t); + code = frame->tf_rax; + orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { /* * The prep code is MP aware. */ - (*p->p_sysent->sv_prepsyscall)(&frame, args, &code, ¶ms); + (*p->p_sysent->sv_prepsyscall)(frame, args, &code, ¶ms); } else { /* * Need to check if this is a 32 bit or 64 bit syscall. @@ -177,7 +177,7 @@ if (error == 0) { td->td_retval[0] = 0; - td->td_retval[1] = frame.tf_rdx; + td->td_retval[1] = frame->tf_rdx; STOPEVENT(p, S_SCE, narg); @@ -190,9 +190,9 @@ switch (error) { case 0: - frame.tf_rax = td->td_retval[0]; - frame.tf_rdx = td->td_retval[1]; - frame.tf_rflags &= ~PSL_C; + frame->tf_rax = td->td_retval[0]; + frame->tf_rdx = td->td_retval[1]; + frame->tf_rflags &= ~PSL_C; break; case ERESTART: @@ -200,7 +200,7 @@ * Reconstruct pc, assuming lcall $X,y is 7 bytes, * int 0x80 is 2 bytes. We saved this in tf_err. */ - frame.tf_rip -= frame.tf_err; + frame->tf_rip -= frame->tf_err; break; case EJUSTRETURN: @@ -213,8 +213,8 @@ else error = p->p_sysent->sv_errtbl[error]; } - frame.tf_rax = error; - frame.tf_rflags |= PSL_C; + frame->tf_rax = error; + frame->tf_rflags |= PSL_C; break; } @@ -222,11 +222,11 @@ * Traced syscall. */ if (orig_tf_rflags & PSL_T) { - frame.tf_rflags &= ~PSL_T; + frame->tf_rflags &= ~PSL_T; ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; ksi.ksi_code = TRAP_TRACE; - ksi.ksi_addr = (void *)frame.tf_rip; + ksi.ksi_addr = (void *)frame->tf_rip; trapsignal(td, &ksi); } @@ -246,7 +246,7 @@ /* * Handle reschedule and other end-of-syscall issues */ - userret(td, &frame); + userret(td, frame); CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#15 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.20 2006/11/13 22:23:33 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.21 2006/12/17 06:48:40 kmacy Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -202,8 +202,8 @@ void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); -void lapic_handle_intr(int vector, struct trapframe frame); -void lapic_handle_timer(struct trapframe frame); +void lapic_handle_intr(int vector, struct trapframe *frame); +void lapic_handle_timer(struct trapframe *frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/smpng/sys/amd64/include/atomic.h#29 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.39 2005/09/27 17:39:10 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.41 2006/12/28 08:15:14 bde Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -67,7 +67,7 @@ * Kernel modules call real functions which are built into the kernel. * This allows kernel modules to be portable between UP and SMP systems. */ -#if defined(KLD_MODULE) || !(defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)) +#if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM) #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -79,7 +79,7 @@ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) -#else /* !KLD_MODULE && __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */ +#else /* !KLD_MODULE && __GNUCLIKE_ASM */ /* * For userland, assume the SMP case and use lock prefixes so that @@ -116,19 +116,19 @@ static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) { - int res = exp; + u_char res; __asm __volatile ( " " __XSTRING(MPLOCKED) " " " cmpxchgl %2,%1 ; " - " setz %%al ; " - " movzbl %%al,%0 ; " + " sete %0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res), /* 0 (result) */ + : "=a" (res), /* 0 */ "=m" (*dst) /* 1 */ : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ + "a" (exp), /* 3 */ + "m" (*dst) /* 4 */ : "memory"); return (res); @@ -137,19 +137,19 @@ static __inline int atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) { - long res = exp; + u_char res; __asm __volatile ( " " __XSTRING(MPLOCKED) " " " cmpxchgq %2,%1 ; " - " setz %%al ; " - " movzbq %%al,%0 ; " + " sete %0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res), /* 0 (result) */ + : "=a" (res), /* 0 */ "=m" (*dst) /* 1 */ : "r" (src), /* 2 */ - "m" (*dst) /* 3 */ + "a" (exp), /* 3 */ + "m" (*dst) /* 4 */ : "memory"); return (res); @@ -209,7 +209,7 @@ : "=a" (res), /* 0 (result) */\ "=m" (*p) /* 1 */ \ : "m" (*p) /* 2 */ \ - : "memory"); \ + : "memory"); \ \ return (res); \ } \ @@ -229,7 +229,7 @@ #endif /* SMP */ -#endif /* KLD_MODULE || !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ +#endif /* KLD_MODULE || !__GNUCLIKE_ASM */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v); @@ -262,7 +262,7 @@ #if !defined(WANT_FUNCTIONS) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 28 15:44: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 33BBE16A416; Thu, 28 Dec 2006 15:44:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E178116A415 for ; Thu, 28 Dec 2006 15:44:06 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D1EA713C47A for ; Thu, 28 Dec 2006 15:44:06 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSFi6Vf048423 for ; Thu, 28 Dec 2006 15:44:06 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSFi42u048390 for perforce@freebsd.org; Thu, 28 Dec 2006 15:44:04 GMT (envelope-from piso@freebsd.org) Date: Thu, 28 Dec 2006 15:44:04 GMT Message-Id: <200612281544.kBSFi42u048390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112220 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, 28 Dec 2006 15:44:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=112220 Change 112220 by piso@piso_newluxor on 2006/12/28 15:43:09 IFC@112213 Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#14 integrate .. //depot/projects/soc2005/libalias/bin/cat/cat.1#2 integrate .. //depot/projects/soc2005/libalias/bin/chmod/chmod.1#2 integrate .. //depot/projects/soc2005/libalias/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/soc2005/libalias/bin/rm/rm.1#3 integrate .. //depot/projects/soc2005/libalias/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/soc2005/libalias/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/soc2005/libalias/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/soc2005/libalias/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/soc2005/libalias/etc/rc.subr#6 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/man/apropos/apropos.man#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/man/man/man.man#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_private.h#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_compression_none.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_read_support_format_cpio.c#4 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/soc2005/libalias/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/soc2005/libalias/lib/libelf/Makefile#3 integrate .. //depot/projects/soc2005/libalias/lib/libelf/Version.map#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/_libelf.h#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_getphnum.3#1 branch .. //depot/projects/soc2005/libalias/lib/libelf/elf_phnum.c#1 branch .. //depot/projects/soc2005/libalias/lib/libelf/elf_scn.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_shnum.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_shstrndx.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_strptr.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_update.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/elf_update.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf_getehdr.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_ar.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_checksum.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_ehdr.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_extended.c#1 branch .. //depot/projects/soc2005/libalias/lib/libelf/libelf_phdr.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/mirror/gmirror.8#4 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifieee80211.c#5 integrate .. //depot/projects/soc2005/libalias/share/man/man1/builtin.1#3 integrate .. //depot/projects/soc2005/libalias/share/man/man1/intro.1#2 integrate .. //depot/projects/soc2005/libalias/share/man/man8/rc.subr.8#4 integrate .. //depot/projects/soc2005/libalias/share/man/man9/mutex.9#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#19 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/soc2005/libalias/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pci.c#10 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_auereg.h#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/soc2005/libalias/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/atomic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mac.c#6 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sig.c#5 integrate .. //depot/projects/soc2005/libalias/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/soc2005/libalias/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/net/if_media.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_inet.c#7 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_posix_sem.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_socket.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_sysv_msg.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_sysv_sem.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_sysv_shm.c#5 integrate .. //depot/projects/soc2005/libalias/sys/security/mac/mac_vfs.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/mdesc/mdesc_init.c#4 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/soc2005/libalias/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/mac_policy.h#9 delete .. //depot/projects/soc2005/libalias/sys/sys/systm.h#8 integrate .. //depot/projects/soc2005/libalias/tools/regression/sockets/pr_atomic/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/regression/sockets/pr_atomic/pr_atomic.c#1 branch .. //depot/projects/soc2005/libalias/usr.bin/biff/biff.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/calendar/calendars/calendar.freebsd#9 integrate .. //depot/projects/soc2005/libalias/usr.bin/enigma/enigma.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/hexdump/od.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/id/groups.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/join/join.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/kdump/mksubr#4 integrate .. //depot/projects/soc2005/libalias/usr.bin/logname/logname.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/nl/nl.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/printenv/printenv.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/systat/swap.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tail/tail.1#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/soc2005/libalias/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/tsort/tsort.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/vis/vis.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/wc/wc.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ckdist/ckdist.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kbdmap/kbdmap.1#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ntp/doc/ntp.conf.5#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/vidcontrol/vidcontrol.1#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#14 (text+ko) ==== @@ -21,6 +21,14 @@ developers choose to disable these features on build machines to maximize performance. +20061221: + Support for PCI Message Signalled Interrupts has been + re-enabled in the bge driver, only for those chips which are + believed to support it properly. If there are any problems, + MSI can be disabled completely by setting the + 'hw.pci.enable_msi' and 'hw.pci.enable_msix' tunables to 0 + in the loader. + 20061214: Support for PCI Message Signalled Interrupts has been disabled again in the bge driver. Many revisions of the @@ -695,4 +703,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.469 2006/12/15 00:30:37 jdp Exp $ +$FreeBSD: src/UPDATING,v 1.470 2006/12/22 03:03:31 jdp Exp $ ==== //depot/projects/soc2005/libalias/bin/cat/cat.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.25 2005/01/16 16:41:55 ru Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.27 2006/12/23 09:25:23 ru Exp $ .\" .Dd March 21, 2004 .Dt CAT 1 @@ -52,7 +52,7 @@ If .Ar file is a single dash -.Pq Sq \&- +.Pq Sq Fl or absent, .Nm reads from the standard input. @@ -111,7 +111,7 @@ .Dl "cat file1" .Pp will print the contents of -.Ar file1 +.Pa file1 to the standard output. .Pp The command: @@ -119,13 +119,13 @@ .Dl "cat file1 file2 > file3" .Pp will sequentially print the contents of -.Ar file1 +.Pa file1 and -.Ar file2 +.Pa file2 to the file -.Ar file3 , +.Pa file3 , truncating -.Ar file3 +.Pa file3 if it already exists. See the manual page for your shell (i.e., .Xr sh 1 ) @@ -136,21 +136,21 @@ .Dl "cat file1 - file2 - file3" .Pp will print the contents of -.Ar file1 , +.Pa file1 , print data it receives from the standard input until it receives an .Dv EOF .Pq Sq ^D character, print the contents of -.Ar file2 , +.Pa file2 , read and output contents of the standard input again, then finally output the contents of -.Ar file3 . +.Pa file3 . Note that if the standard input referred to a file, the second dash on the command-line would have no effect, since the entire contents of the file would have already been read and printed by .Nm when it encountered the first -.Ql \&- +.Sq Fl operand. .Sh SEE ALSO .Xr head 1 , @@ -190,7 +190,9 @@ Because of the shell language mechanism used to perform output redirection, the command .Dq Li cat file1 file2 > file1 -will cause the original data in file1 to be destroyed! +will cause the original data in +.Pa file1 +to be destroyed! .Pp The .Nm ==== //depot/projects/soc2005/libalias/bin/chmod/chmod.1#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.39 2005/02/13 23:45:45 ru Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.40 2006/12/22 07:28:38 ru Exp $ .\" -.Dd March 31, 1994 +.Dd December 22, 2006 .Dt CHMOD 1 .Os .Sh NAME @@ -228,6 +228,8 @@ each permission bit specified in .Ar perm , for which the corresponding bit in the file mode creation mask +(see +.Xr umask 2 ) is clear, is set. Otherwise, the mode bits represented by the specified .Ar who @@ -252,7 +254,9 @@ .It = The mode bits specified by the .Ar who -value are cleared, or, if no who value is specified, the owner, group +value are cleared, or, if no +.Ar who +value is specified, the owner, group and other mode bits are cleared. Then, if no value is supplied for .Ar who , ==== //depot/projects/soc2005/libalias/bin/mkdir/mkdir.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.21 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.23 2006/12/27 11:28:00 ru Exp $ .\" .Dd January 25, 1994 .Dt MKDIR 1 @@ -48,13 +48,13 @@ .Nm utility creates the directories named as operands, in the order specified, using mode -.Li rwxrwxrwx (\&0777) +.Dq Li rwxrwxrwx +(0777) as modified by the current .Xr umask 2 . .Pp The options are as follows: -.Pp -.Bl -tag -width indent +.Bl -tag -width ".Fl m Ar mode" .It Fl m Ar mode Set the file permission bits of the final created directory to the specified mode. @@ -64,11 +64,11 @@ .Xr chmod 1 command. If a symbolic mode is specified, the operation characters -.Dq + +.Ql + and -.Dq - +.Ql - are interpreted relative to an initial mode of -.Dq a=rwx . +.Dq Li a=rwx . .It Fl p Create intermediate directories as required. If this option is not specified, the full path prefix of each @@ -76,7 +76,8 @@ On the other hand, with this option specified, no error will be reported if a directory given as an operand already exists. Intermediate directories are created with permission bits of -.Li rwxrwxrwx (\&0777) +.Dq Li rwxrwxrwx +(0777) as modified by the current umask, plus write and search permission for the owner. .It Fl v ==== //depot/projects/soc2005/libalias/bin/rm/rm.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.43 2006/12/26 13:57:40 ru Exp $ .\" -.Dd October 30, 2006 +.Dd December 26, 2006 .Dt RM 1 .Os .Sh NAME @@ -56,7 +56,7 @@ output) for confirmation. .Pp The options are as follows: -.Bl -tag -width Fl +.Bl -tag -width indent .It Fl d Attempt to remove directories as well as other types of files. .It Fl f @@ -97,7 +97,9 @@ to generate an error message and exit. The file will not be removed or overwritten. .It Fl R -Attempt to remove the file hierarchy rooted in each file argument. +Attempt to remove the file hierarchy rooted in each +.Ar file +argument. The .Fl R option implies the @@ -119,7 +121,8 @@ .It Fl W Attempt to undelete the named files. Currently, this option can only be used to recover -files covered by whiteouts. +files covered by whiteouts in a union file system (see +.Xr undelete 2 ) . .El .Pp The @@ -141,7 +144,7 @@ which performs an .Xr unlink 2 operation on the passed argument. -.Pp +.Sh EXIT STATUS The .Nm utility exits 0 if all of the named files or file hierarchies were removed, @@ -152,7 +155,7 @@ If an error occurs, .Nm exits with a value >0. -.Sh NOTE +.Sh NOTES The .Nm command uses @@ -166,12 +169,15 @@ with a dash .Pq Sq - . For example: -.Dl rm -- -filename +.Pp +.Dl "rm -- -filename" +.Pp The same behavior can be obtained by using an absolute or relative path reference. For example: -.Dl rm /home/user/-filename -.Dl rm ./-filename +.Pp +.Dl "rm /home/user/-filename" +.Dl "rm ./-filename" .Pp When .Fl P ==== //depot/projects/soc2005/libalias/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.14 2005/05/31 12:57:44 tjr Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.15 2006/12/27 12:14:56 ru Exp $ .\" .Dd March 21, 2004 .Dt RMDIR 1 @@ -76,12 +76,14 @@ The .Nm utility exits with one of the following values: -.Bl -tag -width Ds -.It Li \&0 -Each directory entry specified by a dir operand +.Bl -tag -width indent +.It Li 0 +Each directory entry specified by a +.Ar directory +operand referred to an empty directory and was removed successfully. -.It Li \&>\&0 +.It Li >0 An error occurred. .El .Sh SEE ALSO @@ -89,7 +91,7 @@ .Sh STANDARDS The .Nm -command is expected to be +utility is expected to be .St -p1003.2 compatible. .Sh HISTORY ==== //depot/projects/soc2005/libalias/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -431,11 +431,13 @@ .ds doc-operating-system-NetBSD-1.6 1.6 .ds doc-operating-system-NetBSD-1.6.1 1.6.1 .ds doc-operating-system-NetBSD-1.6.2 1.6.2 +.ds doc-operating-system-NetBSD-1.6.3 1.6.3 .ds doc-operating-system-NetBSD-2.0 2.0 .ds doc-operating-system-NetBSD-2.0.1 2.0.1 .ds doc-operating-system-NetBSD-2.0.2 2.0.2 .ds doc-operating-system-NetBSD-2.1 2.1 .ds doc-operating-system-NetBSD-3.0 3.0 +.ds doc-operating-system-NetBSD-4.0 4.0 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -480,13 +482,24 @@ .ds doc-operating-system-FreeBSD-5.2.1 5.2.1 .ds doc-operating-system-FreeBSD-5.3 5.3 .ds doc-operating-system-FreeBSD-5.4 5.4 +.ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 .ds doc-operating-system-Darwin-8.1.0 8.1.0 .ds doc-operating-system-Darwin-8.2.0 8.2.0 .ds doc-operating-system-Darwin-8.3.0 8.3.0 +.ds doc-operating-system-Darwin-8.4.0 8.4.0 +.ds doc-operating-system-Darwin-8.5.0 8.5.0 +. +.ds doc-operating-system-DragonFly-1.0 1.0 +.ds doc-operating-system-DragonFly-1.1 1.1 +.ds doc-operating-system-DragonFly-1.2 1.2 +.ds doc-operating-system-DragonFly-1.3 1.3 +.ds doc-operating-system-DragonFly-1.4 1.4 +.ds doc-operating-system-DragonFly-1.5 1.5 . .de Os . ie "\$1"" \ ==== //depot/projects/soc2005/libalias/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -260,6 +260,70 @@ .. . . +.\" NS Dx user macro +.\" NS print DragonFly +.\" NS +.\" NS modifies: +.\" NS doc-arg-ptr +.\" NS doc-curr-font +.\" NS doc-curr-size +.\" NS doc-macro-name +.\" NS +.\" NS local variable: +.\" NS doc-str-Dx +.\" NS doc-str-Dx1 +.\" NS +.\" NS width register `Dx' defined in doc-common +. +.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common +. +.de Dx +. nr doc-curr-font \n[.f] +. nr doc-curr-size \n[.ps] +. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +. +. \" default value if no argument +. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx] +. +. if !\n[doc-arg-limit] \ +. if \n[.$] \{\ +. ds doc-macro-name Dx +. doc-parse-args \$@ +. \} +. +. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +. nr doc-arg-ptr +1 +. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \ +. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]] +. el \{\ +. tmc mdoc warning: .Dx: Unknown DragonFly version +. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +. \}\} +. el \ +. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +. \} +. el \ +. nr doc-arg-ptr -1 +. \} +. +. \" replace current argument with result +. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1] +. nr doc-type\n[doc-arg-ptr] 2 +. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +. +. \" recompute space vector for remaining arguments +. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +. nr doc-arg-limit \n[doc-arg-ptr] +. if \n[doc-num-args] \ +. doc-parse-space-vector +. +. doc-print-recursive +.. +. +. .\" NS Fx user macro .\" NS print FreeBSD .\" NS @@ -543,6 +607,12 @@ .als doc-str-St--isoC-90 doc-str-St--isoC .ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999 .as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq]) +.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 +.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq]) +.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994 +.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) +.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 +.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) . .\" POSIX Part 1: System API .ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 @@ -604,6 +674,8 @@ . .\" Miscellaneous .ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985 +.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994 +.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) .ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989 . .de St ==== //depot/projects/soc2005/libalias/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -183,6 +183,7 @@ . It "BSD Macro" . It "NetBSD Macro" . It "FreeBSD Macro" +. It "DragonFly Macro" . It "OpenBSD Macro" . It "BSD/OS Macro" . It "UNIX Macro" @@ -869,8 +870,10 @@ 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, 5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1 +.It DragonFly +1.0, 1.1, 1.2, 1.3, 1.4, 1.5 .It Darwin -8.0.0, 8.1.0, 8.2.0, 8.3.0 +8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0 .El .Ed .Pp @@ -2169,6 +2172,25 @@ command above in section .Sx "TITLE MACROS" . . +.Ss "DragonFly Macro" +. +.Pp +.Dl Usage: .Dx Oo Ao version Ac Oc ... +.Pp +.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n +.It Li .Dx +.Dx +.It Li ".Dx 1.4 ." +.Dx 1.4 . +.El +.Pp +For possible values of +.Ao version Ac +see the description of the +.Ql .Os +command above in section +.Sx "TITLE MACROS" . +. .Ss "OpenBSD Macro" . .Pp ==== //depot/projects/soc2005/libalias/etc/rc.subr#6 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.71 2006/11/26 22:02:09 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.72 2006/12/27 13:15:33 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -408,12 +408,25 @@ # returned a zero exit code. # # required_dirs n If set, check for the existence of the given -# directories before running the default -# (re)start command. +# directories before running a (re)start command. # # required_files n If set, check for the readability of the given -# files before running the default (re)start -# command. +# files before running a (re)start command. +# +# required_modules n If set, ensure the given kernel modules are +# loaded before running a (re)start command. +# The check and possible loads are actually +# done after start_precmd so that the modules +# aren't loaded in vain, should the precmd +# return a non-zero status to indicate a error. +# If a word in the list looks like "foo:bar", +# "foo" is the KLD file name and "bar" is the +# module name. If a word looks like "foo~bar", +# "foo" is the KLD file name and "bar" is a +# egrep(1) pattern matching the module name. +# Otherwise the module name is assumed to be +# the same as the KLD file name, which is most +# common. See load_kld(). # # required_vars n If set, perform checkyesno on each of the # listed variables before running the default @@ -562,49 +575,31 @@ if [ "$_elem" != "$rc_arg" ]; then continue fi - # if there's a custom ${XXX_cmd}, # run that instead of the default # - eval _cmd=\$${rc_arg}_cmd _precmd=\$${rc_arg}_precmd \ - _postcmd=\$${rc_arg}_postcmd + eval _cmd=\$${rc_arg}_cmd \ + _precmd=\$${rc_arg}_precmd \ + _postcmd=\$${rc_arg}_postcmd + if [ -n "$_cmd" ]; then - # if the precmd failed and force - # isn't set, exit - # - if [ -n "$_precmd" ]; then - debug "run_rc_command: evaluating ${_precmd}()." - eval $_precmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - - if [ -n "$_cmd" ]; then - debug "run_rc_command: evaluating ${_cmd}()." - eval $_cmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - - if [ -n "$_postcmd" ]; then - debug "run_rc_command: evaluating ${_postcmd}()." - eval $_postcmd $rc_extra_args - _return=$? - fi + _run_rc_precmd || return 1 + _run_rc_doit "$_cmd $rc_extra_args" || return 1 + _run_rc_postcmd return $_return fi case "$rc_arg" in # default operations... status) + _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then echo "${name} is running as pid $rc_pid." else echo "${name} is not running." return 1 fi + _run_rc_postcmd ;; start) @@ -618,45 +613,8 @@ return 1 fi - # check for required variables, - # directories, and files - # - for _f in $required_vars; do - if ! checkyesno $_f; then - warn "\$${_f} is not enabled." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done - for _f in $required_dirs; do - if [ ! -d "${_f}/." ]; then - warn "${_f} is not a directory." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done - for _f in $required_files; do - if [ ! -r "${_f}" ]; then - warn "${_f} is not readable." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done + _run_rc_precmd || return 1 - # if the precmd failed and force - # isn't set, exit - # - if [ -n "${_precmd}" ]; then - debug "run_rc_command: evaluating ${_precmd}()." - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - # setup the full command to run # echo "Starting ${name}." @@ -680,106 +638,52 @@ fi fi - # run the full command; - # if the cmd failed and force - # isn't set, exit + # run the full command # - debug "run_rc_command: _doit: $_doit" - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 + _run_rc_doit "$_doit" || return 1 # finally, run postcmd # - if [ -n "${_postcmd}" ]; then - debug "run_rc_command: evaluating ${_postcmd}()." - eval $_postcmd - fi + _run_rc_postcmd ;; stop) if [ -z "$rc_pid" ]; then [ -n "$rc_fast" ] && return 0 - if [ -n "$pidfile" ]; then - echo 1>&2 \ - "${name} not running? (check $pidfile)." - else - echo 1>&2 "${name} not running?" - fi + _run_rc_notrunning return 1 fi - # if the precmd failed and force - # isn't set, exit - # - if [ -n "$_precmd" ]; then - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi + _run_rc_precmd || return 1 # send the signal to stop # echo "Stopping ${name}." - _doit="kill -${sig_stop:-TERM} $rc_pid" - if [ -n "$_user" ]; then - _doit="su -m $_user -c 'sh -c \"$_doit\"'" - fi - - # if the stop cmd failed and force - # isn't set, exit - # - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 + _doit=$(_run_rc_killcmd "${sig_stop:-TERM}") + _run_rc_doit "$_doit" || return 1 # wait for the command to exit, # and run postcmd. wait_for_pids $rc_pid - if [ -n "$_postcmd" ]; then - eval $_postcmd - _return=$? - fi + + _run_rc_postcmd ;; reload) if [ -z "$rc_pid" ]; then - if [ -n "$pidfile" ]; then - echo 1>&2 \ - "${name} not running? (check $pidfile)." - else - echo 1>&2 "${name} not running?" - fi + _run_rc_notrunning return 1 fi - echo "Reloading ${name} config files." - if [ -n "$_precmd" ]; then - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - _doit="kill -${sig_reload:-HUP} $rc_pid" - if [ -n "$_user" ]; then - _doit="su -m $_user -c 'sh -c \"$_doit\"'" - fi - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 - if [ -n "$_postcmd" ]; then - eval $_postcmd - _return=$? - fi + + _run_rc_precmd || return 1 + + _doit=$(_run_rc_killcmd "${sig_reload:-HUP}") + _run_rc_doit "$_doit" || return 1 + + _run_rc_postcmd ;; restart) - if [ -n "$_precmd" ]; then - eval $_precmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi # prevent restart being called more # than once by any given script # @@ -788,20 +692,23 @@ fi _rc_restart_done=true - # run stop in a subshell to keep variables for start + _run_rc_precmd || return 1 + + # run those in a subshell to keep global variables ( run_rc_command ${_rc_prefix}stop $rc_extra_args ) - run_rc_command ${_rc_prefix}start $rc_extra_args + ( run_rc_command ${_rc_prefix}start $rc_extra_args ) + _return=$? + [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 - if [ -n "$_postcmd" ]; then - eval $_postcmd $rc_extra_args - _return=$? - fi + _run_rc_postcmd ;; poll) + _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then wait_for_pids $rc_pid fi + _run_rc_postcmd ;; rcvar) @@ -829,6 +736,83 @@ } # +# Helper functions for run_rc_command: common code. +# They use such global variables besides the exported rc_* ones: +# +# name R/W +# ------------------ +# _precmd R +# _postcmd R +# _return W +# +_run_rc_precmd() +{ + check_required_before "$rc_arg" || return 1 + + if [ -n "$_precmd" ]; then + debug "run_rc_command: ${rc_arg}_precmd: $_precmd $rc_extra_args" + eval "$_precmd $rc_extra_args" + _return=$? + + # If precmd failed and force isn't set, request exit. + if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then + return 1 + fi + fi + + check_required_after "$rc_arg" || return 1 + + return 0 +} + +_run_rc_postcmd() +{ + if [ -n "$_postcmd" ]; then + debug "run_rc_command: ${rc_arg}_postcmd: $_postcmd $rc_extra_args" + eval "$_postcmd $rc_extra_args" + _return=$? + fi + return 0 +} + +_run_rc_doit() +{ + debug "run_rc_command: doit: $*" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 28 22:06: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 C973516A415; Thu, 28 Dec 2006 22:06:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88AE116A407 for ; Thu, 28 Dec 2006 22:06:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 78B7E13C470 for ; Thu, 28 Dec 2006 22:06:31 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSM6V1t035527 for ; Thu, 28 Dec 2006 22:06:31 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSM6Uwp035524 for perforce@freebsd.org; Thu, 28 Dec 2006 22:06:30 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Dec 2006 22:06:30 GMT Message-Id: <200612282206.kBSM6Uwp035524@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 112248 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, 28 Dec 2006 22:06:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=112248 Change 112248 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 22:05:46 IFC Affected files ... .. //depot/projects/kmacy_wifi/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/kmacy_wifi/bin/rm/rm.1#3 integrate .. //depot/projects/kmacy_wifi/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/kmacy_wifi/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/kmacy_wifi/etc/rc.subr#3 integrate .. //depot/projects/kmacy_wifi/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/kmacy_wifi/gnu/usr.bin/man/man/man.man#2 integrate .. //depot/projects/kmacy_wifi/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/kmacy_wifi/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/kmacy_wifi/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/kmacy_wifi/lib/libc/sys/recv.2#3 integrate .. //depot/projects/kmacy_wifi/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/kmacy_wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/kmacy_wifi/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/kmacy_wifi/share/man/man1/builtin.1#3 integrate .. //depot/projects/kmacy_wifi/share/man/man1/intro.1#2 integrate .. //depot/projects/kmacy_wifi/share/man/man8/rc.subr.8#3 integrate .. //depot/projects/kmacy_wifi/share/man/man9/kqueue.9#2 integrate .. //depot/projects/kmacy_wifi/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/kmacy_wifi/sys/conf/files#3 integrate .. //depot/projects/kmacy_wifi/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/kmacy_wifi/sys/dev/pci/pci.c#3 integrate .. //depot/projects/kmacy_wifi/sys/kern/kern_mac.c#3 delete .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/kmacy_wifi/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/kmacy_wifi/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/kmacy_wifi/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/kmacy_wifi/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/kmacy_wifi/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/kmacy_wifi/usr.bin/biff/biff.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/kmacy_wifi/usr.bin/enigma/enigma.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/hexdump/od.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/logname/logname.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/printenv/printenv.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/tail/tail.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/tsort/tsort.1#2 integrate .. //depot/projects/kmacy_wifi/usr.bin/ypwhich/ypwhich.1#2 integrate .. //depot/projects/kmacy_wifi/usr.sbin/ckdist/ckdist.1#2 integrate .. //depot/projects/kmacy_wifi/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/kmacy_wifi/usr.sbin/kbdmap/kbdmap.1#2 integrate Differences ... ==== //depot/projects/kmacy_wifi/bin/mkdir/mkdir.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.21 2005/01/16 16:41:57 ru Exp $ +.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.23 2006/12/27 11:28:00 ru Exp $ .\" .Dd January 25, 1994 .Dt MKDIR 1 @@ -48,13 +48,13 @@ .Nm utility creates the directories named as operands, in the order specified, using mode -.Li rwxrwxrwx (\&0777) +.Dq Li rwxrwxrwx +(0777) as modified by the current .Xr umask 2 . .Pp The options are as follows: -.Pp -.Bl -tag -width indent +.Bl -tag -width ".Fl m Ar mode" .It Fl m Ar mode Set the file permission bits of the final created directory to the specified mode. @@ -64,11 +64,11 @@ .Xr chmod 1 command. If a symbolic mode is specified, the operation characters -.Dq + +.Ql + and -.Dq - +.Ql - are interpreted relative to an initial mode of -.Dq a=rwx . +.Dq Li a=rwx . .It Fl p Create intermediate directories as required. If this option is not specified, the full path prefix of each @@ -76,7 +76,8 @@ On the other hand, with this option specified, no error will be reported if a directory given as an operand already exists. Intermediate directories are created with permission bits of -.Li rwxrwxrwx (\&0777) +.Dq Li rwxrwxrwx +(0777) as modified by the current umask, plus write and search permission for the owner. .It Fl v ==== //depot/projects/kmacy_wifi/bin/rm/rm.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 -.\" $FreeBSD: src/bin/rm/rm.1,v 1.41 2006/10/31 02:22:36 delphij Exp $ +.\" $FreeBSD: src/bin/rm/rm.1,v 1.43 2006/12/26 13:57:40 ru Exp $ .\" -.Dd October 30, 2006 +.Dd December 26, 2006 .Dt RM 1 .Os .Sh NAME @@ -56,7 +56,7 @@ output) for confirmation. .Pp The options are as follows: -.Bl -tag -width Fl +.Bl -tag -width indent .It Fl d Attempt to remove directories as well as other types of files. .It Fl f @@ -97,7 +97,9 @@ to generate an error message and exit. The file will not be removed or overwritten. .It Fl R -Attempt to remove the file hierarchy rooted in each file argument. +Attempt to remove the file hierarchy rooted in each +.Ar file +argument. The .Fl R option implies the @@ -119,7 +121,8 @@ .It Fl W Attempt to undelete the named files. Currently, this option can only be used to recover -files covered by whiteouts. +files covered by whiteouts in a union file system (see +.Xr undelete 2 ) . .El .Pp The @@ -141,7 +144,7 @@ which performs an .Xr unlink 2 operation on the passed argument. -.Pp +.Sh EXIT STATUS The .Nm utility exits 0 if all of the named files or file hierarchies were removed, @@ -152,7 +155,7 @@ If an error occurs, .Nm exits with a value >0. -.Sh NOTE +.Sh NOTES The .Nm command uses @@ -166,12 +169,15 @@ with a dash .Pq Sq - . For example: -.Dl rm -- -filename +.Pp +.Dl "rm -- -filename" +.Pp The same behavior can be obtained by using an absolute or relative path reference. For example: -.Dl rm /home/user/-filename -.Dl rm ./-filename +.Pp +.Dl "rm /home/user/-filename" +.Dl "rm ./-filename" .Pp When .Fl P ==== //depot/projects/kmacy_wifi/bin/rmdir/rmdir.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.14 2005/05/31 12:57:44 tjr Exp $ +.\" $FreeBSD: src/bin/rmdir/rmdir.1,v 1.15 2006/12/27 12:14:56 ru Exp $ .\" .Dd March 21, 2004 .Dt RMDIR 1 @@ -76,12 +76,14 @@ The .Nm utility exits with one of the following values: -.Bl -tag -width Ds -.It Li \&0 -Each directory entry specified by a dir operand +.Bl -tag -width indent +.It Li 0 +Each directory entry specified by a +.Ar directory +operand referred to an empty directory and was removed successfully. -.It Li \&>\&0 +.It Li >0 An error occurred. .El .Sh SEE ALSO @@ -89,7 +91,7 @@ .Sh STANDARDS The .Nm -command is expected to be +utility is expected to be .St -p1003.2 compatible. .Sh HISTORY ==== //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-common#2 (text+ko) ==== @@ -431,11 +431,13 @@ .ds doc-operating-system-NetBSD-1.6 1.6 .ds doc-operating-system-NetBSD-1.6.1 1.6.1 .ds doc-operating-system-NetBSD-1.6.2 1.6.2 +.ds doc-operating-system-NetBSD-1.6.3 1.6.3 .ds doc-operating-system-NetBSD-2.0 2.0 .ds doc-operating-system-NetBSD-2.0.1 2.0.1 .ds doc-operating-system-NetBSD-2.0.2 2.0.2 .ds doc-operating-system-NetBSD-2.1 2.1 .ds doc-operating-system-NetBSD-3.0 3.0 +.ds doc-operating-system-NetBSD-4.0 4.0 . .ds doc-operating-system-FreeBSD-1.0 1.0 .ds doc-operating-system-FreeBSD-1.1 1.1 @@ -480,13 +482,24 @@ .ds doc-operating-system-FreeBSD-5.2.1 5.2.1 .ds doc-operating-system-FreeBSD-5.3 5.3 .ds doc-operating-system-FreeBSD-5.4 5.4 +.ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.0 6.0 .ds doc-operating-system-FreeBSD-6.1 6.1 +.ds doc-operating-system-FreeBSD-7.0 7.0 . .ds doc-operating-system-Darwin-8.0.0 8.0.0 .ds doc-operating-system-Darwin-8.1.0 8.1.0 .ds doc-operating-system-Darwin-8.2.0 8.2.0 .ds doc-operating-system-Darwin-8.3.0 8.3.0 +.ds doc-operating-system-Darwin-8.4.0 8.4.0 +.ds doc-operating-system-Darwin-8.5.0 8.5.0 +. +.ds doc-operating-system-DragonFly-1.0 1.0 +.ds doc-operating-system-DragonFly-1.1 1.1 +.ds doc-operating-system-DragonFly-1.2 1.2 +.ds doc-operating-system-DragonFly-1.3 1.3 +.ds doc-operating-system-DragonFly-1.4 1.4 +.ds doc-operating-system-DragonFly-1.5 1.5 . .de Os . ie "\$1"" \ ==== //depot/projects/kmacy_wifi/contrib/groff/tmac/doc-syms#2 (text+ko) ==== @@ -260,6 +260,70 @@ .. . . +.\" NS Dx user macro +.\" NS print DragonFly +.\" NS +.\" NS modifies: +.\" NS doc-arg-ptr +.\" NS doc-curr-font +.\" NS doc-curr-size +.\" NS doc-macro-name +.\" NS +.\" NS local variable: +.\" NS doc-str-Dx +.\" NS doc-str-Dx1 +.\" NS +.\" NS width register `Dx' defined in doc-common +. +.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common +. +.de Dx +. nr doc-curr-font \n[.f] +. nr doc-curr-size \n[.ps] +. ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u] +. +. \" default value if no argument +. ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx] +. +. if !\n[doc-arg-limit] \ +. if \n[.$] \{\ +. ds doc-macro-name Dx +. doc-parse-args \$@ +. \} +. +. if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\ +. nr doc-arg-ptr +1 +. ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\ +. ie \A\*[doc-arg\n[doc-arg-ptr]] \{\ +. ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \ +. as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]] +. el \{\ +. tmc mdoc warning: .Dx: Unknown DragonFly version +. tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c]) +. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +. \}\} +. el \ +. as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]] +. \} +. el \ +. nr doc-arg-ptr -1 +. \} +. +. \" replace current argument with result +. ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1] +. nr doc-type\n[doc-arg-ptr] 2 +. ds doc-space\n[doc-arg-ptr] "\*[doc-space] +. +. \" recompute space vector for remaining arguments +. nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr]) +. nr doc-arg-limit \n[doc-arg-ptr] +. if \n[doc-num-args] \ +. doc-parse-space-vector +. +. doc-print-recursive +.. +. +. .\" NS Fx user macro .\" NS print FreeBSD .\" NS @@ -543,6 +607,12 @@ .als doc-str-St--isoC-90 doc-str-St--isoC .ds doc-str-St--isoC-99 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999 .as doc-str-St--isoC-99 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq]) +.ds doc-str-St--isoC-amd1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995 +.as doc-str-St--isoC-amd1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq]) +.ds doc-str-St--isoC-tcor1 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994 +.as doc-str-St--isoC-tcor1 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq]) +.ds doc-str-St--isoC-tcor2 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995 +.as doc-str-St--isoC-tcor2 " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq]) . .\" POSIX Part 1: System API .ds doc-str-St--p1003.1 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1 @@ -604,6 +674,8 @@ . .\" Miscellaneous .ds doc-str-St--ieee754 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985 +.ds doc-str-St--ieee1275-94 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994 +.as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) .ds doc-str-St--iso8802-3 \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989 . .de St ==== //depot/projects/kmacy_wifi/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ==== @@ -183,6 +183,7 @@ . It "BSD Macro" . It "NetBSD Macro" . It "FreeBSD Macro" +. It "DragonFly Macro" . It "OpenBSD Macro" . It "BSD/OS Macro" . It "UNIX Macro" @@ -869,8 +870,10 @@ 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1, 5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1 +.It DragonFly +1.0, 1.1, 1.2, 1.3, 1.4, 1.5 .It Darwin -8.0.0, 8.1.0, 8.2.0, 8.3.0 +8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0 .El .Ed .Pp @@ -2169,6 +2172,25 @@ command above in section .Sx "TITLE MACROS" . . +.Ss "DragonFly Macro" +. +.Pp +.Dl Usage: .Dx Oo Ao version Ac Oc ... +.Pp +.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n +.It Li .Dx +.Dx +.It Li ".Dx 1.4 ." +.Dx 1.4 . +.El +.Pp +For possible values of +.Ao version Ac +see the description of the +.Ql .Os +command above in section +.Sx "TITLE MACROS" . +. .Ss "OpenBSD Macro" . .Pp ==== //depot/projects/kmacy_wifi/etc/rc.subr#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.71 2006/11/26 22:02:09 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.72 2006/12/27 13:15:33 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -408,12 +408,25 @@ # returned a zero exit code. # # required_dirs n If set, check for the existence of the given -# directories before running the default -# (re)start command. +# directories before running a (re)start command. # # required_files n If set, check for the readability of the given -# files before running the default (re)start -# command. +# files before running a (re)start command. +# +# required_modules n If set, ensure the given kernel modules are +# loaded before running a (re)start command. +# The check and possible loads are actually +# done after start_precmd so that the modules +# aren't loaded in vain, should the precmd +# return a non-zero status to indicate a error. +# If a word in the list looks like "foo:bar", +# "foo" is the KLD file name and "bar" is the +# module name. If a word looks like "foo~bar", +# "foo" is the KLD file name and "bar" is a +# egrep(1) pattern matching the module name. +# Otherwise the module name is assumed to be +# the same as the KLD file name, which is most +# common. See load_kld(). # # required_vars n If set, perform checkyesno on each of the # listed variables before running the default @@ -562,49 +575,31 @@ if [ "$_elem" != "$rc_arg" ]; then continue fi - # if there's a custom ${XXX_cmd}, # run that instead of the default # - eval _cmd=\$${rc_arg}_cmd _precmd=\$${rc_arg}_precmd \ - _postcmd=\$${rc_arg}_postcmd + eval _cmd=\$${rc_arg}_cmd \ + _precmd=\$${rc_arg}_precmd \ + _postcmd=\$${rc_arg}_postcmd + if [ -n "$_cmd" ]; then - # if the precmd failed and force - # isn't set, exit - # - if [ -n "$_precmd" ]; then - debug "run_rc_command: evaluating ${_precmd}()." - eval $_precmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - - if [ -n "$_cmd" ]; then - debug "run_rc_command: evaluating ${_cmd}()." - eval $_cmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - - if [ -n "$_postcmd" ]; then - debug "run_rc_command: evaluating ${_postcmd}()." - eval $_postcmd $rc_extra_args - _return=$? - fi + _run_rc_precmd || return 1 + _run_rc_doit "$_cmd $rc_extra_args" || return 1 + _run_rc_postcmd return $_return fi case "$rc_arg" in # default operations... status) + _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then echo "${name} is running as pid $rc_pid." else echo "${name} is not running." return 1 fi + _run_rc_postcmd ;; start) @@ -618,45 +613,8 @@ return 1 fi - # check for required variables, - # directories, and files - # - for _f in $required_vars; do - if ! checkyesno $_f; then - warn "\$${_f} is not enabled." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done - for _f in $required_dirs; do - if [ ! -d "${_f}/." ]; then - warn "${_f} is not a directory." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done - for _f in $required_files; do - if [ ! -r "${_f}" ]; then - warn "${_f} is not readable." - if [ -z "$rc_force" ]; then - return 1 - fi - fi - done + _run_rc_precmd || return 1 - # if the precmd failed and force - # isn't set, exit - # - if [ -n "${_precmd}" ]; then - debug "run_rc_command: evaluating ${_precmd}()." - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - # setup the full command to run # echo "Starting ${name}." @@ -680,106 +638,52 @@ fi fi - # run the full command; - # if the cmd failed and force - # isn't set, exit + # run the full command # - debug "run_rc_command: _doit: $_doit" - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 + _run_rc_doit "$_doit" || return 1 # finally, run postcmd # - if [ -n "${_postcmd}" ]; then - debug "run_rc_command: evaluating ${_postcmd}()." - eval $_postcmd - fi + _run_rc_postcmd ;; stop) if [ -z "$rc_pid" ]; then [ -n "$rc_fast" ] && return 0 - if [ -n "$pidfile" ]; then - echo 1>&2 \ - "${name} not running? (check $pidfile)." - else - echo 1>&2 "${name} not running?" - fi + _run_rc_notrunning return 1 fi - # if the precmd failed and force - # isn't set, exit - # - if [ -n "$_precmd" ]; then - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi + _run_rc_precmd || return 1 # send the signal to stop # echo "Stopping ${name}." - _doit="kill -${sig_stop:-TERM} $rc_pid" - if [ -n "$_user" ]; then - _doit="su -m $_user -c 'sh -c \"$_doit\"'" - fi - - # if the stop cmd failed and force - # isn't set, exit - # - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 + _doit=$(_run_rc_killcmd "${sig_stop:-TERM}") + _run_rc_doit "$_doit" || return 1 # wait for the command to exit, # and run postcmd. wait_for_pids $rc_pid - if [ -n "$_postcmd" ]; then - eval $_postcmd - _return=$? - fi + + _run_rc_postcmd ;; reload) if [ -z "$rc_pid" ]; then - if [ -n "$pidfile" ]; then - echo 1>&2 \ - "${name} not running? (check $pidfile)." - else - echo 1>&2 "${name} not running?" - fi + _run_rc_notrunning return 1 fi - echo "Reloading ${name} config files." - if [ -n "$_precmd" ]; then - eval $_precmd - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi - _doit="kill -${sig_reload:-HUP} $rc_pid" - if [ -n "$_user" ]; then - _doit="su -m $_user -c 'sh -c \"$_doit\"'" - fi - eval $_doit - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 - if [ -n "$_postcmd" ]; then - eval $_postcmd - _return=$? - fi + + _run_rc_precmd || return 1 + + _doit=$(_run_rc_killcmd "${sig_reload:-HUP}") + _run_rc_doit "$_doit" || return 1 + + _run_rc_postcmd ;; restart) - if [ -n "$_precmd" ]; then - eval $_precmd $rc_extra_args - _return=$? - [ $_return -ne 0 ] && [ -z "$rc_force" ] && - return 1 - fi # prevent restart being called more # than once by any given script # @@ -788,20 +692,23 @@ fi _rc_restart_done=true - # run stop in a subshell to keep variables for start + _run_rc_precmd || return 1 + + # run those in a subshell to keep global variables ( run_rc_command ${_rc_prefix}stop $rc_extra_args ) - run_rc_command ${_rc_prefix}start $rc_extra_args + ( run_rc_command ${_rc_prefix}start $rc_extra_args ) + _return=$? + [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 - if [ -n "$_postcmd" ]; then - eval $_postcmd $rc_extra_args - _return=$? - fi + _run_rc_postcmd ;; poll) + _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then wait_for_pids $rc_pid fi + _run_rc_postcmd ;; rcvar) @@ -829,6 +736,83 @@ } # +# Helper functions for run_rc_command: common code. +# They use such global variables besides the exported rc_* ones: +# +# name R/W +# ------------------ +# _precmd R +# _postcmd R +# _return W +# +_run_rc_precmd() +{ + check_required_before "$rc_arg" || return 1 + + if [ -n "$_precmd" ]; then + debug "run_rc_command: ${rc_arg}_precmd: $_precmd $rc_extra_args" + eval "$_precmd $rc_extra_args" + _return=$? + + # If precmd failed and force isn't set, request exit. + if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then + return 1 + fi + fi + + check_required_after "$rc_arg" || return 1 + + return 0 +} + +_run_rc_postcmd() +{ + if [ -n "$_postcmd" ]; then + debug "run_rc_command: ${rc_arg}_postcmd: $_postcmd $rc_extra_args" + eval "$_postcmd $rc_extra_args" + _return=$? + fi + return 0 +} + +_run_rc_doit() +{ + debug "run_rc_command: doit: $*" + eval "$@" + _return=$? + + # If command failed and force isn't set, request exit. + if [ $_return -ne 0 ] && [ -z "$rc_force" ]; then + return 1 + fi + + return 0 +} + +_run_rc_notrunning() +{ + local _pidmsg + + if [ -n "$pidfile" ]; then + _pidmsg=" (check $pidfile)." + else + _pidmsg= + fi + echo 1>&2 "${name} not running?${_pidmsg}" +} + +_run_rc_killcmd() +{ + local _cmd + + _cmd="kill -$1 $rc_pid" + if [ -n "$_user" ]; then + _cmd="su -m ${_user} -c 'sh -c \"${_cmd}\"'" + fi + echo "$_cmd" +} + +# # run_rc_script file arg # Start the script `file' with `arg', and correctly handle the # return value from the script. If `file' ends with `.sh', it's @@ -1486,6 +1470,74 @@ done } +# check_required_{before|after} command +# Check for things required by the command before and after its precmd, +# respectively. The two separate functions are needed because some +# conditions should prevent precmd from being run while other things +# depend on precmd having already been run. +# +check_required_before() +{ + local _f + + case "$1" in + start) + for _f in $required_vars; do + if ! checkyesno $_f; then + warn "\$${_f} is not enabled." + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + + for _f in $required_dirs; do + if [ ! -d "${_f}/." ]; then + warn "${_f} is not a directory." + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + + for _f in $required_files; do + if [ ! -r "${_f}" ]; then + warn "${_f} is not readable." + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + ;; + esac + + return 0 +} + +check_required_after() +{ + local _f _args + + case "$1" in + start) + for _f in $required_modules; do + case "${_f}" in + *~*) _args="-e ${_f#*~} ${_f%%~*}" ;; + *:*) _args="-m ${_f#*:} ${_f%%:*}" ;; + *) _args="${_f}" ;; + esac + if ! load_kld ${_args}; then + if [ -z "$rc_force" ]; then + return 1 + fi + fi + done + ;; + esac + + return 0 +} + fi _rc_subr_loaded=: ==== //depot/projects/kmacy_wifi/gnu/usr.bin/groff/tmac/mdoc.local#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.56 2006/12/05 17:01:23 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.57 2006/12/25 09:09:47 ru Exp $ .\" .\" %beginstrip% . @@ -66,7 +66,6 @@ .ds doc-default-operating-system FreeBSD\~7.0 . .\" FreeBSD releases not found in doc-common -.ds doc-operating-system-FreeBSD-5.5 5.5 .ds doc-operating-system-FreeBSD-6.2 6.2 .ds doc-operating-system-FreeBSD-6.3 6.3 .ds doc-operating-system-FreeBSD-7.0 7.0 ==== //depot/projects/kmacy_wifi/gnu/usr.bin/man/man/man.man#2 (text+ko) ==== @@ -12,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.\" $FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.26 2005/12/05 14:22:11 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/man/man.man,v 1.27 2006/12/25 15:09:06 ru Exp $ .\" .Dd December 3, 2005 .Dt MAN 1 @@ -31,7 +31,9 @@ .Op Ar section .Ar name ... .Sh DESCRIPTION -.Nm Man +The +.Nm +utility formats and displays the on-line manual pages. This version knows about the @@ -41,7 +43,9 @@ environment variables, so you can have your own set(s) of personal man pages and choose whatever program you like to display the formatted pages. -If section is specified, +If +.Ar section +is specified, .Nm only looks in that section of the manual. You may also specify the @@ -49,11 +53,12 @@ run on the source files via command line options or environment variables. If enabled by the system administrator, formatted man -pages will also be compressed with the `%compress%' command to save -space. +pages will also be compressed with the +.Dq Li "%compress%" +command to save space. .Pp The options are as follows: -.Bl -tag -width Fl +.Bl -tag -width ".Fl P Ar pager" .It Fl M Ar path Specify an alternate manpath. By default, @@ -72,7 +77,7 @@ By default, .Nm uses -.Nm %pager% . +.Dq Li "%pager%" . This option overrides the .Ev PAGER environment variable. @@ -172,8 +177,8 @@ .Sm on .El .Pp -For example, for -.Dq de_DE.ISO8859-1 +For example, for the +.Dq Li de_DE.ISO8859-1 locale, .Nm will search in the following subdirectories of the @@ -195,10 +200,18 @@ .Pa /usr/share/man directory. .It Fl p Ar string -Specify the sequence of preprocessors to run before nroff or troff. +Specify the sequence of preprocessors to run before +.Xr nroff 1 +or +.Xr troff 1 . Not all installations will have a full set of preprocessors. Some of the preprocessors and the letters used to designate them are: -eqn (e), grap (g), pic (p), tbl (t), vgrind (v), refer (r). +.Nm eqn Pq e , +.Nm grap Pq g , +.Nm pic Pq p , +.Nm tbl Pq t , +.Nm vgrind Pq v , +.Nm refer Pq r . This option overrides the .Ev MANROFFSEQ environment variable. @@ -245,9 +258,15 @@ If .Ev MANROFFSEQ is set, its value is used to determine the set of preprocessors run >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 28 22:13: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 40A5816A4FE; Thu, 28 Dec 2006 22:13:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF31A16A407 for ; Thu, 28 Dec 2006 22:13:41 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CEC9C13C478 for ; Thu, 28 Dec 2006 22:13:41 +0000 (UTC) (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.6/8.13.6) with ESMTP id kBSMDfwU037526 for ; Thu, 28 Dec 2006 22:13:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSMDf05037523 for perforce@freebsd.org; Thu, 28 Dec 2006 22:13:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 28 Dec 2006 22:13:41 GMT Message-Id: <200612282213.kBSMDf05037523@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 112251 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, 28 Dec 2006 22:13:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=112251 Change 112251 by rwatson@rwatson_peppercorn on 2006/12/28 22:13:08 Update comments on byte order and IP tokens + token API. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#59 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#59 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#58 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#59 $ */ #include @@ -419,6 +419,8 @@ /* * token ID 1 byte * ip header 20 bytes + * + * The IP header should be submitted in network byte order. */ token_t * au_to_ip(struct ip *ip) @@ -431,9 +433,6 @@ return (NULL); ADD_U_CHAR(dptr, AUT_IP); - /* - * XXXRW: Any byte order work needed on the IP header before writing? - */ ADD_MEM(dptr, ip, sizeof(struct ip)); return (t); From owner-p4-projects@FreeBSD.ORG Thu Dec 28 22:16: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 5748116A412; Thu, 28 Dec 2006 22:16:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 232DF16A407 for ; Thu, 28 Dec 2006 22:16:46 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1423913C46E for ; Thu, 28 Dec 2006 22:16:46 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSMGk1Y038010 for ; Thu, 28 Dec 2006 22:16:46 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSMGjxc038007 for perforce@freebsd.org; Thu, 28 Dec 2006 22:16:45 GMT (envelope-from piso@freebsd.org) Date: Thu, 28 Dec 2006 22:16:45 GMT Message-Id: <200612282216.kBSMGjxc038007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112252 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, 28 Dec 2006 22:16:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=112252 Change 112252 by piso@piso_newluxor on 2006/12/28 22:16:40 mainly style fixes: o in case of long line, break it and indent + 4 spaces. o do not initialize vars during declaration. o declare all the vars at the beginning of function. o do not put a new line between cases in a switch statement. o update a comment. Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#14 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#33 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#14 (text+ko) ==== @@ -3293,7 +3293,7 @@ if (ifm->ifm_version != RTM_VERSION) { if (verbose) warnx("routing message version %d " - "not understood", ifm->ifm_version); + "not understood", ifm->ifm_version); continue; } if (ifm->ifm_type == RTM_IFINFO) { @@ -3318,7 +3318,7 @@ if (ifam->ifam_version != RTM_VERSION) { if (verbose) warnx("routing message version %d " - "not understood", ifam->ifam_version); + "not understood", ifam->ifam_version); continue; } if (ifam->ifam_type != RTM_NEWADDR) @@ -3327,9 +3327,10 @@ int i; char *cp = (char *)(ifam + 1); - for (i = 1; i < RTA_IFA; i <<= 1) + for (i = 1; i < RTA_IFA; i <<= 1) { if (ifam->ifam_addrs & i) cp += SA_SIZE((struct sockaddr *)cp); + } if (((struct sockaddr *)cp)->sa_family == AF_INET) { sin = (struct sockaddr_in *)cp; break; @@ -3502,12 +3503,19 @@ setup_redir_addr(char *spool_buf, int len, int *_ac, char ***_av) { - char **av = *_av, *sep; /* Token separator. */ + char **av, *sep; /* Token separator. */ /* Temporary buffer used to hold server pool ip's. */ char tmp_spool_buf[NAT_BUF_LEN]; - int ac = *_ac, i, space = 0, lsnat = 0; - int sof_redir = sizeof(struct cfg_redir); + int ac, i, space, lsnat, sof_redir, sof_spool; struct cfg_redir *r; + struct cfg_spool *tmp; + + av = *_av; + ac = *_ac; + space = 0; + lsnat = 0; + sof_redir = sizeof(struct cfg_redir); + sof_spool = sizeof(struct cfg_spool); if (len >= sof_redir) { r = (struct cfg_redir *)spool_buf; @@ -3539,9 +3547,6 @@ /* Setup LSNAT server pool. */ if (sep) { - int sof_spool = sizeof(struct cfg_spool); - struct cfg_spool *tmp; - sep = strtok(tmp_spool_buf, ","); while (sep != NULL) { tmp = (struct cfg_spool *)spool_buf; @@ -3566,13 +3571,21 @@ setup_redir_port(char *spool_buf, int len, int *_ac, char ***_av) { - char **av = *_av, *sep, *protoName; + char **av, *sep, *protoName; char tmp_spool_buf[NAT_BUF_LEN]; - int ac = *_ac, space = 0, lsnat = 0; - int sof_redir = sizeof(struct cfg_redir); + int ac, space, lsnat, sof_redir, sof_spool; struct cfg_redir *r; - u_short numLocalPorts = 0; - port_range portRange; + struct cfg_spool *tmp; + u_short numLocalPorts; + port_range portRange; + + av = *_av; + ac = *_ac; + space = 0; + lsnat = 0; + sof_redir = sizeof(struct cfg_redir); + sof_spool = sizeof(struct cfg_spool); + numLocalPorts = 0; if (len >= sof_redir) { r = (struct cfg_redir *)spool_buf; @@ -3599,7 +3612,8 @@ errx (EX_DATAERR, "redirect_port: missing local address"); sep = strchr(*av, ','); - if (sep) { /* LSNAT redirection syntax. */ + /* LSNAT redirection syntax. */ + if (sep) { r->laddr.s_addr = INADDR_NONE; r->lport = ~0; numLocalPorts = 1; @@ -3608,15 +3622,15 @@ lsnat = 1; } else { if (StrToAddrAndPortRange (*av, &r->laddr, protoName, - &portRange) != 0) + &portRange) != 0) errx(EX_DATAERR, "redirect_port:" - "invalid local port range"); + "invalid local port range"); r->lport = GETLOPORT(portRange); numLocalPorts = GETNUMPORTS(portRange); - } + } INC_ARGCV(); - + /* * Extract public port and optionally address. */ @@ -3626,14 +3640,14 @@ sep = strchr (*av, ':'); if (sep) { if (StrToAddrAndPortRange (*av, &r->paddr, protoName, - &portRange) != 0) + &portRange) != 0) errx(EX_DATAERR, "redirect_port:" - "invalid public port range"); + "invalid public port range"); } else { r->paddr.s_addr = INADDR_ANY; if (StrToPortRange (*av, protoName, &portRange) != 0) errx(EX_DATAERR, "redirect_port:" - "invalid public port range"); + "invalid public port range"); } r->pport = GETLOPORT(portRange); @@ -3651,17 +3665,17 @@ sep = strchr (*av, ':'); if (sep) { if (StrToAddrAndPortRange (*av, &r->raddr, protoName, - &portRange) != 0) - errx(EX_DATAERR, "redirect_port:" - "invalid remote port range"); + &portRange) != 0) + errx(EX_DATAERR, "redirect_port:" + "invalid remote port range"); } else { SETLOPORT(portRange, 0); SETNUMPORTS(portRange, 1); StrToAddr (*av, &r->raddr); } INC_ARGCV(); - } else { - SETLOPORT(portRange, 0); + } else { + SETLOPORT(portRange, 0); SETNUMPORTS(portRange, 1); r->raddr.s_addr = INADDR_ANY; } @@ -3673,21 +3687,18 @@ */ if (numLocalPorts != r->pport_cnt) errx(EX_DATAERR, "redirect_port:" - "port ranges must be equal in size"); - + "port ranges must be equal in size"); + /* Remote port range is allowed to be '0' which means all ports. */ if (r->rport_cnt != numLocalPorts && (r->rport_cnt != 1 || r->rport != 0)) errx(EX_DATAERR, "redirect_port: remote port must" - "be 0 or equal to local port range in size"); + "be 0 or equal to local port range in size"); /* * Setup LSNAT server pool. */ if (lsnat) { - int sof_spool = sizeof(struct cfg_spool); - struct cfg_spool *tmp; - sep = strtok(tmp_spool_buf, ","); while (sep != NULL) { tmp = (struct cfg_spool *)spool_buf; @@ -3696,12 +3707,12 @@ len -= sof_spool; space += sof_spool; if (StrToAddrAndPortRange(sep, &tmp->addr, protoName, - &portRange) != 0) + &portRange) != 0) errx(EX_DATAERR, "redirect_port:" - "invalid local port range"); + "invalid local port range"); if (GETNUMPORTS(portRange) != 1) errx(EX_DATAERR, "redirect_port: local port" - "must be single in this context"); + "must be single in this context"); tmp->port = GETLOPORT(portRange); r->spool_cnt++; /* Point to the next possible cfg_spool. */ @@ -3718,12 +3729,15 @@ setup_redir_proto(char *spool_buf, int len, int *_ac, char ***_av) { - char **av = *_av; - int ac = *_ac, i, space; + char **av; + int ac, i, space, sof_redir;; struct protoent *protoent; - int sof_redir = sizeof(struct cfg_redir); struct cfg_redir *r; + av = *_av; + ac = *_ac; + sof_redir = sizeof(struct cfg_redir); + if (len >= sof_redir) { r = (struct cfg_redir *)spool_buf; /* Skip cfg_redir at beginning of buf. */ @@ -3789,14 +3803,19 @@ static void print_nat_config(char *buf) { - struct cfg_nat *n = (struct cfg_nat *)buf; - int i, cnt, flag = 1, off = sizeof(*n); - int sof_redir = sizeof(struct cfg_redir); - int sof_spool = sizeof(struct cfg_spool); + struct cfg_nat *n; + int i, cnt, flag, off; + int sof_redir, sof_spool; struct cfg_redir *t; struct cfg_spool *s; struct protoent *p; + n = (struct cfg_nat *)buf; + flag = 1; + off = sizeof(*n); + sof_redir = sizeof(struct cfg_redir); + sof_spool = sizeof(struct cfg_spool); + printf("ipfw nat %u config", n->id); if (strlen(n->if_name) != 0) printf(" if %s", n->if_name); @@ -3827,7 +3846,7 @@ } } /* Print all the redirect's data configuration. */ - for (cnt=0; cnt < n->redir_cnt; cnt++) { + for (cnt = 0; cnt < n->redir_cnt; cnt++) { t = (struct cfg_redir *)&buf[off]; off += sof_redir; switch (t->mode) { @@ -3836,7 +3855,7 @@ if (t->spool_cnt == 0) printf(" %s", inet_ntoa(t->laddr)); else - for (i=0; i < t->spool_cnt; i++) { + for (i = 0; i < t->spool_cnt; i++) { s = (struct cfg_spool *)&buf[off]; if (i) printf(","); @@ -3854,14 +3873,14 @@ printf("%s:%u", inet_ntoa(t->laddr), t->lport); if (t->pport_cnt > 1) printf("-%u", t->lport + - t->pport_cnt - 1); + t->pport_cnt - 1); } else for (i=0; i < t->spool_cnt; i++) { s = (struct cfg_spool *)&buf[off]; if (i) printf(","); printf("%s:%u", inet_ntoa(s->addr), - s->port); + s->port); off += sof_spool; } @@ -3878,14 +3897,14 @@ printf(":%u", t->rport); if (!t->spool_cnt && t->rport_cnt > 1) printf("-%u", t->rport + - t->rport_cnt - 1); + t->rport_cnt - 1); } } break; case REDIR_PROTO: p = getprotobynumber(t->proto); printf(" redirect_proto %s %s", p->p_name, - inet_ntoa(t->laddr)); + inet_ntoa(t->laddr)); if (t->paddr.s_addr != 0) { printf(" %s", inet_ntoa(t->paddr)); if (t->raddr.s_addr) @@ -3905,11 +3924,13 @@ { struct cfg_nat *n; /* Nat instance configuration. */ struct in_addr ip; - int i, len = NAT_BUF_LEN; - /* Offset in buf: save space for n at the beginning. */ - int off = sizeof(*n); + int i, len, off, sof_redir, tok; char *id, buf[NAT_BUF_LEN]; /* Buffer for serialized data. */ + sof_redir = sizeof(struct cfg_redir); + len = NAT_BUF_LEN; + /* Offset in buf: save space for n at the beginning. */ + off = sizeof(*n); memset(buf, 0, sizeof(buf)); n = (struct cfg_nat *)buf; @@ -3926,81 +3947,67 @@ errx(EX_DATAERR, "missing option"); while (ac > 0) { - int tok = match_token(nat_params, *av); - int sof_redir = sizeof(struct cfg_redir); - - ac--; av++; - - switch (tok) { - case TOK_IP: - if (ac == 0) - errx(EX_DATAERR, "missing option"); - if (!inet_aton(av[0], &(n->ip))) - errx(EX_DATAERR, "bad ip address ``%s''", av[0]); - ac--; av++; - break; - - case TOK_IF: - set_addr_dynamic(av[0], n); - ac--; av++; - break; - - case TOK_ALOG: - n->mode |= PKT_ALIAS_LOG; - break; - - case TOK_DENY_INC: - n->mode |= PKT_ALIAS_DENY_INCOMING; - break; - - case TOK_SAME_PORTS: - n->mode |= PKT_ALIAS_SAME_PORTS; - break; - - case TOK_UNREG_ONLY: - n->mode |= PKT_ALIAS_UNREGISTERED_ONLY; - break; - - case TOK_RESET_ADDR: - n->mode |= PKT_ALIAS_RESET_ON_ADDR_CHANGE; - break; - - case TOK_ALIAS_REV: - n->mode |= PKT_ALIAS_REVERSE; - break; - - case TOK_PROXY_ONLY: - n->mode |= PKT_ALIAS_PROXY_ONLY; - break; - - /* - * All the setup_redir_* functions work directly in the final - * buffer, see above for details. - */ - case TOK_REDIR_ADDR: - case TOK_REDIR_PORT: - case TOK_REDIR_PROTO: - switch (tok) { - case TOK_REDIR_ADDR: - i = setup_redir_addr(&buf[off], len, &ac, &av); - break; - - case TOK_REDIR_PORT: - i = setup_redir_port(&buf[off], len, &ac, &av); - break; - - case TOK_REDIR_PROTO: - i = setup_redir_proto(&buf[off], len, &ac, &av); - break; - } - n->redir_cnt++; - off += i; - len -= i; - break; - - default: - errx(EX_DATAERR, "unrecognised option ``%s''", av[-1]); - } + tok = match_token(nat_params, *av); + ac--; av++; + switch (tok) { + case TOK_IP: + if (ac == 0) + errx(EX_DATAERR, "missing option"); + if (!inet_aton(av[0], &(n->ip))) + errx(EX_DATAERR, "bad ip address ``%s''", + av[0]); + ac--; av++; + break; + case TOK_IF: + set_addr_dynamic(av[0], n); + ac--; av++; + break; + case TOK_ALOG: + n->mode |= PKT_ALIAS_LOG; + break; + case TOK_DENY_INC: + n->mode |= PKT_ALIAS_DENY_INCOMING; + break; + case TOK_SAME_PORTS: + n->mode |= PKT_ALIAS_SAME_PORTS; + break; + case TOK_UNREG_ONLY: + n->mode |= PKT_ALIAS_UNREGISTERED_ONLY; + break; + case TOK_RESET_ADDR: + n->mode |= PKT_ALIAS_RESET_ON_ADDR_CHANGE; + break; + case TOK_ALIAS_REV: + n->mode |= PKT_ALIAS_REVERSE; + break; + case TOK_PROXY_ONLY: + n->mode |= PKT_ALIAS_PROXY_ONLY; + break; + /* + * All the setup_redir_* functions work directly in the final + * buffer, see above for details. + */ + case TOK_REDIR_ADDR: + case TOK_REDIR_PORT: + case TOK_REDIR_PROTO: + switch (tok) { + case TOK_REDIR_ADDR: + i = setup_redir_addr(&buf[off], len, &ac, &av); + break; + case TOK_REDIR_PORT: + i = setup_redir_port(&buf[off], len, &ac, &av); + break; + case TOK_REDIR_PROTO: + i = setup_redir_proto(&buf[off], len, &ac, &av); + break; + } + n->redir_cnt++; + off += i; + len -= i; + break; + default: + errx(EX_DATAERR, "unrecognised option ``%s''", av[-1]); + } } i = do_cmd(IP_FW_NAT_CFG, buf, off); @@ -5851,12 +5858,16 @@ show_nat(int ac, char **av) { struct cfg_nat *n; struct cfg_redir *e; - int cmd, i, nbytes, do_cfg, do_rule = 0, frule, lrule, nalloc = 1024, - size = 0, nat_cnt, r; - u_int8_t *data = NULL, *p; + int cmd, i, nbytes, do_cfg, do_rule, frule, lrule, nalloc, size; + int nat_cnt, r; + u_int8_t *data, *p; char **lav, *endptr; - ac--; av++; + do_rule = 0; + nalloc = 1024; + size = 0; + data = NULL; + ac--; av++; /* Parse parameters. */ for (cmd = IP_FW_NAT_GET_LOG, do_cfg = 0; ac != 0; ac--, av++) { @@ -5883,22 +5894,23 @@ err(EX_OSERR, "getsockopt(IP_FW_GET_%s)", (cmd == IP_FW_NAT_GET_LOG) ? "LOG" : "CONFIG"); } - if (nbytes == 0) + if (nbytes == 0) exit(0); if (do_cfg) { nat_cnt = *((int *)data); for (i = sizeof(nat_cnt); nat_cnt; nat_cnt--) { n = (struct cfg_nat *)&data[i]; - if (do_rule) - if (!(frule <= n->id && lrule >= n->id)) + if (do_rule) { + if (!(frule <= n->id && lrule >= n->id)) continue; + } print_nat_config(&data[i]); i += sizeof(struct cfg_nat); e = (struct cfg_redir *)&data[i]; if (e->mode == REDIR_ADDR || e->mode == REDIR_PORT || e->mode == REDIR_PROTO) i += sizeof(struct cfg_redir) + e->spool_cnt * - sizeof(struct cfg_spool); + sizeof(struct cfg_spool); } } else { for (i = 0; 1; i += LIBALIAS_BUF_SIZE + sizeof(int)) { @@ -5906,9 +5918,10 @@ if (p == data + nbytes) break; bcopy(p, &r, sizeof(int)); - if (do_rule) + if (do_rule) { if (!(frule <= r && lrule >= r)) continue; + } printf("nat %u: %s\n", r, p+sizeof(int)); } } ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#33 (text+ko) ==== @@ -2055,7 +2055,7 @@ if (ifa->ifa_addr->sa_family != AF_INET) continue; ptr->ip = ((struct sockaddr_in *) - (ifa->ifa_addr))->sin_addr; + (ifa->ifa_addr))->sin_addr; LibAliasSetAddress(ptr->lib, ptr->ip); } mtx_unlock(&ifp->if_addr_mtx); @@ -2071,9 +2071,8 @@ IPFW_WLOCK_ASSERT(&layer3_chain); for (rule = layer3_chain.rules; rule; rule = rule->next) { ipfw_insn_nat *cmd = (ipfw_insn_nat *)ACTION_PTR(rule); - if (cmd->o.opcode != O_NAT) - continue; + continue; if (cmd->nat != NULL && cmd->nat->id == i) cmd->nat = NULL; } @@ -2084,7 +2083,7 @@ struct cfg_nat *ptr; LIST_FOREACH(ptr, &layer3_chain.nat, _next) - if (ptr->id == i) + if (ptr->id == i) return(ptr); return (NULL); } @@ -2118,12 +2117,12 @@ switch (r->mode) { case REDIR_PORT: num = r->pport_cnt; + /* FALLTHROUGH */ case REDIR_ADDR: case REDIR_PROTO: /* Delete all libalias redirect entry. */ for (i = 0; i < num; i++) - LibAliasRedirectDelete(n->lib, - r->alink[i]); + LibAliasRedirectDelete(n->lib, r->alink[i]); /* Del spool cfg if any. */ LIST_FOREACH_SAFE(s, &r->spool_chain, _next, tmp_s) { LIST_REMOVE(s, _next); @@ -2133,7 +2132,7 @@ LIST_REMOVE(r, _next); free(r, M_IPFW); break; - default: + default: printf("unknown redirect mode: %u\n", r->mode); /* XXX - panic?!?!? */ break; @@ -2143,14 +2142,16 @@ static int add_redir_spool_cfg(char *buf, struct cfg_nat *ptr) { - int sof_alinkp = sizeof(struct alias_link *); - int sof_redir = sizeof(struct cfg_redir); - int sof_spool = sizeof(struct cfg_spool); + int sof_alinkp, sof_redir, sof_spool; struct cfg_redir *r, *ser_r; struct cfg_spool *s, *ser_s; int cnt, off, i; char *panic_err; + sof_alinkp = sizeof(struct alias_link *); + sof_redir = sizeof(struct cfg_redir); + sof_spool = sizeof(struct cfg_spool); + for(cnt = 0, off = 0; cnt < ptr->redir_cnt; cnt++) { ser_r = (struct cfg_redir *)&buf[off]; r = malloc(sof_redir, M_IPFW, M_WAITOK | M_ZERO); @@ -2158,12 +2159,11 @@ LIST_INIT(&r->spool_chain); off += sof_redir; r->alink = malloc(sof_alinkp*r->pport_cnt, - M_IPFW, M_WAITOK | M_ZERO); + M_IPFW, M_WAITOK | M_ZERO); switch (r->mode) { case REDIR_ADDR: - r->alink[0] = LibAliasRedirectAddr(ptr->lib, - r->laddr, - r->paddr); + r->alink[0] = LibAliasRedirectAddr(ptr->lib, r->laddr, + r->paddr); break; case REDIR_PORT: for (i = 0 ; i < r->pport_cnt; i++) { @@ -2171,16 +2171,10 @@ u_short remotePortCopy = r->rport + i; if (r->rport_cnt == 1 && r->rport == 0) remotePortCopy = 0; - r->alink[i] = - LibAliasRedirectPort( - ptr->lib, - r->laddr, - htons(r->lport + i), - r->raddr, - htons(remotePortCopy), - r->paddr, - htons(r->pport + i), - r->proto); + r->alink[i] = LibAliasRedirectPort(ptr->lib, + r->laddr, htons(r->lport + i), r->raddr, + htons(remotePortCopy), r->paddr, + htons(r->pport + i), r->proto); if (r->alink[i] == NULL) { r->alink[0] = NULL; break; @@ -2188,13 +2182,10 @@ } break; case REDIR_PROTO: - r->alink[0] = LibAliasRedirectProto(ptr->lib, - r->laddr, - r->raddr, - r->paddr, - r->proto); + r->alink[0] = LibAliasRedirectProto(ptr->lib ,r->laddr, + r->raddr, r->paddr, r->proto); break; - default: + default: printf("unknown redirect mode: %u\n", r->mode); break; } @@ -2205,11 +2196,10 @@ for (i = 0; i < r->spool_cnt; i++) { ser_s = (struct cfg_spool *)&buf[off]; s = malloc(sof_redir, M_IPFW, - M_WAITOK | M_ZERO); + M_WAITOK | M_ZERO); memcpy(s, ser_s, sof_spool); LibAliasAddServer(ptr->lib, r->alink[0], - s->addr, - htons(s->port)); + s->addr, htons(s->port)); off += sof_spool; /* Hook spool entry. */ HOOK_SPOOL(&r->spool_chain, s); @@ -3456,9 +3446,10 @@ struct cfg_nat *t; struct mbuf *mcl; /* XXX - libalias duct tape */ - int ldt = 0; + int ldt; char *c; + ldt = 0; args->rule = f; /* Report matching rule. */ retval = 0; t = ((ipfw_insn_nat *)cmd)->nat; @@ -3469,7 +3460,7 @@ goto done; } else ((ipfw_insn_nat *)cmd)->nat = - t; + t; } if ((mcl = m_megapullup(m, m->m_pkthdr.len)) == NULL) @@ -3525,7 +3516,7 @@ * too. * * TODO: -make libalias mbuf aware (so - * it can handle delayed checksum) + * it can handle delayed checksum and tso) */ if (mcl->m_pkthdr.rcvif == NULL && @@ -3536,10 +3527,10 @@ c = mtod(mcl, char *); if (oif == NULL) retval = LibAliasIn(t->lib, c, - MCLBYTES); + MCLBYTES); else retval = LibAliasOut(t->lib, c, - MCLBYTES); + MCLBYTES); if (retval != PKT_ALIAS_OK) { /* XXX - should i add some logging? */ m_free(mcl); @@ -3549,7 +3540,7 @@ goto done; } mcl->m_pkthdr.len = mcl->m_len = - ntohs(ip->ip_len); + ntohs(ip->ip_len); /* * XXX - libalias checksum offload @@ -3575,7 +3566,7 @@ ip->ip_src.s_addr, ip->ip_dst.s_addr, htons(ip->ip_p + ip->ip_len - - (ip->ip_hl << 2)) + (ip->ip_hl << 2)) ); switch (ip->ip_p) { @@ -3588,17 +3579,16 @@ th->th_x2 = 0; th->th_sum = cksum; mcl->m_pkthdr.csum_data = - offsetof(struct tcphdr, - th_sum); + offsetof(struct tcphdr, + th_sum); break; case IPPROTO_UDP: uh = (struct udphdr *)(ip + 1); uh->uh_sum = cksum; mcl->m_pkthdr.csum_data = - offsetof(struct udphdr, - uh_sum); - break; - + offsetof(struct udphdr, + uh_sum); + break; } /* * No hw checksum offloading: do it @@ -3608,7 +3598,7 @@ CSUM_DELAY_DATA) == 0) { in_delayed_cksum(mcl); mcl->m_pkthdr.csum_flags &= - ~CSUM_DELAY_DATA; + ~CSUM_DELAY_DATA; } ip->ip_len = htons(ip->ip_len); } @@ -4577,11 +4567,10 @@ char *buf; buf = malloc(NAT_BUF_LEN, M_IPFW, M_WAITOK | M_ZERO); - error = sooptcopyin(sopt, buf, NAT_BUF_LEN, - sizeof(struct cfg_nat)); + sizeof(struct cfg_nat)); ser_n = (struct cfg_nat *)buf; - + /* * Find/create nat rule. */ @@ -4590,7 +4579,7 @@ if (ptr == NULL) { /* New rule: allocate and init new instance. */ ptr = malloc(sizeof(struct cfg_nat), - M_IPFW, M_NOWAIT | M_ZERO); + M_IPFW, M_NOWAIT | M_ZERO); if (ptr == NULL) { free(buf, M_IPFW); IPFW_WUNLOCK(&layer3_chain); @@ -4604,7 +4593,7 @@ return(EINVAL); } LIST_INIT(&ptr->redir_chain); - } else { + } else { /* Entry already present: temporarly unhook it. */ UNHOOK_NAT(ptr); flush_nat_ptrs(ser_n->id); @@ -4669,13 +4658,16 @@ struct cfg_nat *n; struct cfg_redir *r; struct cfg_spool *s; - int sof_nat = sizeof(struct cfg_nat); - int sof_redir = sizeof(struct cfg_redir); - int sof_spool = sizeof(struct cfg_spool); - int nat_cnt = 0, off = sizeof(nat_cnt); + int sof_nat, sof_redir, sof_spool; + int nat_cnt, off; + sof_nat = sizeof(struct cfg_nat); + sof_redir = sizeof(struct cfg_redir); + sof_spool = sizeof(struct cfg_spool); + nat_cnt = 0; + off = sizeof(nat_cnt); + data = malloc(NAT_BUF_LEN, M_IPFW, M_WAITOK | M_ZERO); - IPFW_RLOCK(&layer3_chain); /* Serialize all the data. */ LIST_FOREACH(n, &layer3_chain.nat, _next) { @@ -4686,18 +4678,19 @@ LIST_FOREACH(r, &n->redir_chain, _next) { if (off + sof_redir < NAT_BUF_LEN) { bcopy(r, &data[off], - sof_redir); + sof_redir); off += sof_redir; - LIST_FOREACH(s, - &r->spool_chain, - _next) { - if (off + sof_spool < - NAT_BUF_LEN) { - bcopy(s, &data[off], - sof_spool); - off += sof_spool; - } else - goto nospace; + LIST_FOREACH(s, &r->spool_chain, + _next) { + if (off + sof_spool < + NAT_BUF_LEN) { + bcopy(s, + &data[off], + sof_spool); + off += + sof_spool; + } else + goto nospace; } } else goto nospace; @@ -4713,17 +4706,20 @@ nospace: IPFW_RUNLOCK(&layer3_chain); printf("serialized data buffer not big enough:" - "please increase NAT_BUF_LEN\n"); + "please increase NAT_BUF_LEN\n"); free(data, M_IPFW); } break; case IP_FW_NAT_GET_LOG: { - u_int8_t *data = NULL; + u_int8_t *data; struct cfg_nat *ptr; - int sof = LIBALIAS_BUF_SIZE; - int i, size, cnt = 0; + int i, size, cnt, sof; + + data = NULL; + sof = LIBALIAS_BUF_SIZE; + cnt = 0; IPFW_RLOCK(&layer3_chain); size = i = 0; @@ -4922,7 +4918,7 @@ callout_reset(&ipfw_timeout, hz, ipfw_tick, NULL); LIST_INIT(&layer3_chain.nat); ifaddr_event_tag = EVENTHANDLER_REGISTER(ifaddr_event, ifaddr_change, - NULL, EVENTHANDLER_PRI_ANY); + NULL, EVENTHANDLER_PRI_ANY); return (0); } From owner-p4-projects@FreeBSD.ORG Thu Dec 28 22:19: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 2EE8216A412; Thu, 28 Dec 2006 22:19:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F279016A40F for ; Thu, 28 Dec 2006 22:19:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E3F4013C49D for ; Thu, 28 Dec 2006 22:19:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSMJoBF038150 for ; Thu, 28 Dec 2006 22:19:50 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSMJouR038147 for perforce@freebsd.org; Thu, 28 Dec 2006 22:19:50 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Dec 2006 22:19:50 GMT Message-Id: <200612282219.kBSMJouR038147@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 112253 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, 28 Dec 2006 22:19:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=112253 Change 112253 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 22:19:33 declare missing macro declare ifp Affected files ... .. //depot/projects/kmacy_wifi/sys/net80211/_ieee80211.h#3 edit .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#4 edit Differences ... ==== //depot/projects/kmacy_wifi/sys/net80211/_ieee80211.h#3 (text+ko) ==== @@ -146,6 +146,8 @@ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM) #define IEEE80211_CHAN_G \ (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN) +#define IEEE80211_CHAN_T \ + (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) #define IEEE80211_CHAN_108A \ (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) #define IEEE80211_CHAN_108G \ @@ -171,6 +173,8 @@ (((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G) #define IEEE80211_IS_CHAN_ANYG(_c) \ (IEEE80211_IS_CHAN_PUREG(_c) || IEEE80211_IS_CHAN_G(_c)) +#define IEEE80211_IS_CHAN_T(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T) #define IEEE80211_IS_CHAN_ST(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST) #define IEEE80211_IS_CHAN_108A(_c) \ ==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#4 (text+ko) ==== @@ -151,6 +151,7 @@ if ((ic->ic_modecaps & (1<ic_sup_rates[m].rs_nrates == 0) \ ic->ic_sup_rates[m] = def; \ } while (0) + struct ifnet *ifp = ic->ic_ifp; struct ieee80211_channel *c; int i; @@ -183,7 +184,7 @@ ic->ic_modecaps |= 1<ic_modecaps |= 1<ic_modecaps |= 1<ic_modecaps |= 1< X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 529A216A40F; Thu, 28 Dec 2006 22:28:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B28C16A403 for ; Thu, 28 Dec 2006 22:28:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F0CF313C46E for ; Thu, 28 Dec 2006 22:28:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSMS3AV039839 for ; Thu, 28 Dec 2006 22:28:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSMS3fT039832 for perforce@freebsd.org; Thu, 28 Dec 2006 22:28:03 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Dec 2006 22:28:03 GMT Message-Id: <200612282228.kBSMS3fT039832@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 112255 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, 28 Dec 2006 22:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=112255 Change 112255 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 22:28:01 didn't mean to change macro in use Affected files ... .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#5 edit Differences ... ==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#5 (text+ko) ==== @@ -184,7 +184,7 @@ ic->ic_modecaps |= 1<ic_modecaps |= 1<ic_modecaps |= 1<ic_modecaps |= 1< X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C39CA16A47C; Thu, 28 Dec 2006 23:52:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9F1A316A407 for ; Thu, 28 Dec 2006 23:52:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3E99713C487 for ; Thu, 28 Dec 2006 23:52:55 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBSNqt4B055339 for ; Thu, 28 Dec 2006 23:52:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBSNqsGo055336 for perforce@freebsd.org; Thu, 28 Dec 2006 23:52:54 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Dec 2006 23:52:54 GMT Message-Id: <200612282352.kBSNqsGo055336@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 112260 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, 28 Dec 2006 23:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=112260 Change 112260 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/28 23:52:15 compile fix for 64-bit Affected files ... .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211_ioctl.c#3 edit Differences ... ==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211_ioctl.c#3 (text+ko) ==== @@ -1060,7 +1060,7 @@ sr = req->sr; KASSERT(len <= 65535 && ielen <= 65535, - ("len %zu ssid %u ie %zu", len, se->se_ssid[1], ielen)); + ("len %u ssid %u ie %u", len, se->se_ssid[1], ielen)); sr->isr_ssid_len = se->se_ssid[1]; sr->isr_ie_len = ielen; sr->isr_len = len; From owner-p4-projects@FreeBSD.ORG Fri Dec 29 12:15: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 7D1C016A47B; Fri, 29 Dec 2006 12:15:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CAEA716A740 for ; Fri, 29 Dec 2006 11:45:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D68AF13C44B for ; Fri, 29 Dec 2006 11:45:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBT7hJnf076325 for ; Fri, 29 Dec 2006 07:43:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBT7hJFG076322 for perforce@freebsd.org; Fri, 29 Dec 2006 07:43:19 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Dec 2006 07:43:19 GMT Message-Id: <200612290743.kBT7hJFG076322@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 112274 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, 29 Dec 2006 12:15:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=112274 Change 112274 by kmacy@kmacy_storage:sam_wifi on 2006/12/29 07:42:53 size_t isn't the same as an int on 64-bit platforms - fix a KASSERT Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#63 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#63 (text+ko) ==== @@ -450,7 +450,7 @@ sr = req->sr; KASSERT(len <= 65535 && ielen <= 65535, - ("len %zu ssid %u ie %zu", len, se->se_ssid[1], ielen)); + ("len %u ssid %u ie %u", len, se->se_ssid[1], ielen)); sr->isr_ssid_len = se->se_ssid[1]; sr->isr_ie_len = ielen; sr->isr_len = len; From owner-p4-projects@FreeBSD.ORG Fri Dec 29 12:15: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 0735516A56A; Fri, 29 Dec 2006 12:15:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B2F8D16A82A for ; Fri, 29 Dec 2006 11:45:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7516013C47E for ; Fri, 29 Dec 2006 11:45:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBT7Z7Qq074859 for ; Fri, 29 Dec 2006 07:35:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBT7Z7Y0074856 for perforce@freebsd.org; Fri, 29 Dec 2006 07:35:07 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Dec 2006 07:35:07 GMT Message-Id: <200612290735.kBT7Z7Y0074856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 112272 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, 29 Dec 2006 12:15:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=112272 Change 112272 by sam@sam_ebb on 2006/12/29 07:34:39 remove local cruft Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#62 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#62 (text+ko) ==== @@ -260,7 +260,6 @@ return error; } -#define COMPAT_FREEBSD6 #ifdef COMPAT_FREEBSD6 #define IEEE80211_IOC_SCAN_RESULTS_OLD 24 From owner-p4-projects@FreeBSD.ORG Fri Dec 29 12:15: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 9ED4316A5EF; Fri, 29 Dec 2006 12:15:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B8D5016A82F for ; Fri, 29 Dec 2006 11:45:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E03D513C48A for ; Fri, 29 Dec 2006 11:45:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBT7Z7Mb074853 for ; Fri, 29 Dec 2006 07:35:07 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBT7Z7QM074840 for perforce@freebsd.org; Fri, 29 Dec 2006 07:35:07 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Dec 2006 07:35:07 GMT Message-Id: <200612290735.kBT7Z7QM074840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 112271 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, 29 Dec 2006 12:15:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=112271 Change 112271 by sam@sam_ebb on 2006/12/29 07:34:08 bring compat code into the new world order Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#61 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#61 (text+ko) ==== @@ -260,6 +260,7 @@ return error; } +#define COMPAT_FREEBSD6 #ifdef COMPAT_FREEBSD6 #define IEEE80211_IOC_SCAN_RESULTS_OLD 24 @@ -281,86 +282,120 @@ /* variable length SSID followed by IE data */ }; +struct oscanreq { + struct scan_result_old *sr; + size_t space; +}; + +static size_t +old_scan_space(const struct ieee80211_scan_entry *se, int *ielen) +{ + size_t len; + + *ielen = 0; + if (se->se_wpa_ie != NULL) + *ielen += 2+se->se_wpa_ie[1]; + if (se->se_wme_ie != NULL) + *ielen += 2+se->se_wme_ie[1]; + /* + * NB: ie's can be no more than 255 bytes and the max 802.11 + * packet is <3Kbytes so we are sure this doesn't overflow + * 16-bits; if this is a concern we can drop the ie's. + */ + len = sizeof(struct scan_result_old) + se->se_ssid[1] + *ielen; + return roundup(len, sizeof(u_int32_t)); +} + static void -old_get_scan_result(struct scan_result_old *sr, - const struct ieee80211_node *ni) +old_get_scan_space(void *arg, const struct ieee80211_scan_entry *se) +{ + struct oscanreq *req = arg; + int ielen; + + req->space += old_scan_space(se, &ielen); +} + +static void +old_get_scan_result(void *arg, const struct ieee80211_scan_entry *se) { - struct ieee80211com *ic = ni->ni_ic; - u_int ielen; + struct oscanreq *req = arg; + struct scan_result_old *sr; + int ielen, len, nr, nxr; + u_int8_t *cp; + + len = old_scan_space(se, &ielen); + if (len > req->space) + return; + sr = req->sr; memset(sr, 0, sizeof(*sr)); - sr->isr_ssid_len = ni->ni_esslen; - ielen = 0; - if (ni->ni_wpa_ie != NULL) - ielen += 2+ni->ni_wpa_ie[1]; - if (ni->ni_wme_ie != NULL) - ielen += 2+ni->ni_wme_ie[1]; + sr->isr_ssid_len = se->se_ssid[1]; /* NB: beware of overflow, isr_ie_len is 8 bits */ sr->isr_ie_len = (ielen > 255 ? 0 : ielen); - sr->isr_len = sizeof(*sr) + sr->isr_ssid_len + sr->isr_ie_len; - sr->isr_len = roundup(sr->isr_len, sizeof(u_int32_t)); - if (ni->ni_chan != IEEE80211_CHAN_ANYC) { - sr->isr_freq = ni->ni_chan->ic_freq; - sr->isr_flags = ni->ni_chan->ic_flags; + sr->isr_len = len; + sr->isr_freq = se->se_chan->ic_freq; + sr->isr_flags = se->se_chan->ic_flags; + sr->isr_rssi = se->se_rssi; + sr->isr_noise = se->se_noise; + sr->isr_intval = se->se_intval; + sr->isr_capinfo = se->se_capinfo; + sr->isr_erp = se->se_erp; + IEEE80211_ADDR_COPY(sr->isr_bssid, se->se_bssid); + nr = min(se->se_rates[1], IEEE80211_RATE_MAXSIZE); + memcpy(sr->isr_rates, se->se_rates+2, nr); + nxr = min(se->se_xrates[1], IEEE80211_RATE_MAXSIZE - nr); + memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr); + sr->isr_nrates = nr + nxr; + + cp = (u_int8_t *)(sr+1); + memcpy(cp, se->se_ssid+2, sr->isr_ssid_len); + cp += sr->isr_ssid_len; + if (sr->isr_ie_len) { + if (se->se_wpa_ie != NULL) { + memcpy(cp, se->se_wpa_ie, 2+se->se_wpa_ie[1]); + cp += 2+se->se_wpa_ie[1]; + } + if (se->se_wme_ie != NULL) { + memcpy(cp, se->se_wme_ie, 2+se->se_wme_ie[1]); + cp += 2+se->se_wme_ie[1]; + } } - sr->isr_rssi = ic->ic_node_getrssi(ni); - sr->isr_intval = ni->ni_intval; - sr->isr_capinfo = ni->ni_capinfo; - sr->isr_erp = ni->ni_erp; - IEEE80211_ADDR_COPY(sr->isr_bssid, ni->ni_bssid); - sr->isr_nrates = ni->ni_rates.rs_nrates; - if (sr->isr_nrates > 15) - sr->isr_nrates = 15; - memcpy(sr->isr_rates, ni->ni_rates.rs_rates, sr->isr_nrates); + + req->space -= len; + req->sr = (struct scan_result_old *)(((u_int8_t *)sr) + len); } static int old_getscanresults(struct ieee80211com *ic, struct ieee80211req *ireq) { - union { - struct scan_result_old res; - char data[512]; /* XXX shrink? */ - } u; - struct scan_result_old *sr = &u.res; - struct ieee80211_node_table *nt; - struct ieee80211_node *ni; - int error, space; - u_int8_t *p, *cp; + struct oscanreq req; + int error; + + if (ireq->i_len < sizeof(struct scan_result_old)) + return EFAULT; - p = ireq->i_data; - space = ireq->i_len; error = 0; - /* XXX locking */ - nt = &ic->ic_scan; - TAILQ_FOREACH(ni, &nt->nt_node, ni_list) { - /* NB: skip pre-scan node state */ - if (ni->ni_chan == IEEE80211_CHAN_ANYC) - continue; - old_get_scan_result(sr, ni); - if (sr->isr_len > sizeof(u)) - continue; /* XXX */ - if (space < sr->isr_len) - break; - cp = (u_int8_t *)(sr+1); - memcpy(cp, ni->ni_essid, ni->ni_esslen); - cp += ni->ni_esslen; - if (sr->isr_ie_len) { - if (ni->ni_wpa_ie != NULL) { - memcpy(cp, ni->ni_wpa_ie, 2+ni->ni_wpa_ie[1]); - cp += 2+ni->ni_wpa_ie[1]; - } - if (ni->ni_wme_ie != NULL) { - memcpy(cp, ni->ni_wme_ie, 2+ni->ni_wme_ie[1]); - cp += 2+ni->ni_wme_ie[1]; - } - } - error = copyout(sr, p, sr->isr_len); - if (error) - break; - p += sr->isr_len; - space -= sr->isr_len; - } - ireq->i_len -= space; + req.space = 0; + ieee80211_scan_iterate(ic, old_get_scan_space, &req); + if (req.space > ireq->i_len) + req.space = ireq->i_len; + if (req.space > 0) { + size_t space; + void *p; + + space = req.space; + /* XXX M_WAITOK after driver lock released */ + MALLOC(p, void *, space, M_TEMP, M_NOWAIT | M_ZERO); + if (p == NULL) + return ENOMEM; + req.sr = p; + ieee80211_scan_iterate(ic, old_get_scan_result, &req); + ireq->i_len = space - req.space; + error = copyout(p, ireq->i_data, ireq->i_len); + FREE(p, M_TEMP); + } else + ireq->i_len = 0; + return error; } #endif /* COMPAT_FREEBSD6 */ @@ -970,6 +1005,11 @@ case IEEE80211_IOC_WPAIE2: error = ieee80211_ioctl_getwpaie(ic, ireq, ireq->i_type); break; +#ifdef COMPAT_FREEBSD6 + case IEEE80211_IOC_SCAN_RESULTS_OLD: + error = old_getscanresults(ic, ireq); + break; +#endif case IEEE80211_IOC_SCAN_RESULTS: error = ieee80211_ioctl_getscanresults(ic, ireq); break; From owner-p4-projects@FreeBSD.ORG Fri Dec 29 12:15: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 E6FE316A654; Fri, 29 Dec 2006 12:15:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D57F16A890 for ; Fri, 29 Dec 2006 11:45:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29FAE13C4C5 for ; Fri, 29 Dec 2006 11:45:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBT6LWtD059465 for ; Fri, 29 Dec 2006 06:21:32 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBT6IieB058914 for perforce@freebsd.org; Fri, 29 Dec 2006 06:18:44 GMT (envelope-from sam@freebsd.org) Date: Fri, 29 Dec 2006 06:18:44 GMT Message-Id: <200612290618.kBT6IieB058914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 112269 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, 29 Dec 2006 12:15:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=112269 Change 112269 by sam@sam_ebb on 2006/12/29 06:17:30 IFC @ 112268 ath mostly works in sta mode; looks to have some rough edges Affected files ... .. //depot/projects/wifi/MAINTAINERS#13 integrate .. //depot/projects/wifi/Makefile#14 integrate .. //depot/projects/wifi/Makefile.inc1#28 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#8 integrate .. //depot/projects/wifi/UPDATING#24 integrate .. //depot/projects/wifi/bin/cat/cat.1#5 integrate .. //depot/projects/wifi/bin/chmod/chmod.1#5 integrate .. //depot/projects/wifi/bin/cp/cp.1#5 integrate .. //depot/projects/wifi/bin/cp/cp.c#5 integrate .. //depot/projects/wifi/bin/cp/extern.h#3 integrate .. //depot/projects/wifi/bin/cp/utils.c#4 integrate .. //depot/projects/wifi/bin/date/netdate.c#2 integrate .. //depot/projects/wifi/bin/df/df.c#3 integrate .. //depot/projects/wifi/bin/domainname/domainname.1#3 integrate .. //depot/projects/wifi/bin/ed/main.c#4 integrate .. //depot/projects/wifi/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/wifi/bin/hostname/hostname.1#4 integrate .. //depot/projects/wifi/bin/hostname/hostname.c#3 integrate .. //depot/projects/wifi/bin/ls/ls.1#9 integrate .. //depot/projects/wifi/bin/ls/print.c#4 integrate .. //depot/projects/wifi/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/wifi/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/wifi/bin/pax/cpio.c#2 integrate .. //depot/projects/wifi/bin/pax/pax.1#5 integrate .. //depot/projects/wifi/bin/pax/tar.c#3 integrate .. //depot/projects/wifi/bin/ps/ps.1#9 integrate .. //depot/projects/wifi/bin/rm/rm.1#8 integrate .. //depot/projects/wifi/bin/rm/rm.c#6 integrate .. //depot/projects/wifi/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/wifi/bin/setfacl/setfacl.1#7 integrate .. //depot/projects/wifi/bin/sh/expand.c#5 integrate .. //depot/projects/wifi/bin/sh/histedit.c#4 integrate .. //depot/projects/wifi/bin/sh/jobs.c#6 integrate .. //depot/projects/wifi/bin/sh/jobs.h#2 integrate .. //depot/projects/wifi/bin/sh/main.c#3 integrate .. //depot/projects/wifi/bin/sh/parser.c#4 integrate .. //depot/projects/wifi/bin/sh/parser.h#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#12 integrate .. //depot/projects/wifi/bin/test/test.1#4 integrate .. //depot/projects/wifi/contrib/bind9/CHANGES#4 integrate .. //depot/projects/wifi/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/wifi/contrib/bind9/FAQ#4 integrate .. //depot/projects/wifi/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/wifi/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/bind9/README#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkconf.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/check/named-checkzone.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/include/dig/dig.h#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.1#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dig/nslookup.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/aclconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/client.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/control.h#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/main.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.5#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.conf.html#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/unix/os.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/update.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/named/zoneconf.c#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc-confgen.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.5#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.conf.html#3 integrate .. //depot/projects/wifi/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/wifi/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/wifi/contrib/bind9/configure.in#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch03.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch04.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch05.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch07.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch08.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.ch09.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.html#4 integrate .. //depot/projects/wifi/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/Makefile.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/api#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/config.h.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/configure.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/dst_api.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/dst/hmac_link.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/include/netdb.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/dns_ho.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gai_strerror.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getaddrinfo.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/irs_data.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/ev_connects.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/eventlib_p.h#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/isc/memcluster.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/nameser/ns_verify.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port_after.h.in#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/port_before.h.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_init.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_send.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind/resolv/res_sendsigned.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/api#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/adb.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/name.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/rdataset.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/validator.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/include/dns/zone.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/name.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/wifi/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/wifi/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/dns/zone.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/sockaddr.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/timer.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/entropy.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isc/unix/socket.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/namedconf.c#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/api#4 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/getaddrinfo.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/lwconfig.c#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_buffer.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_config.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_context.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gabn.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gethostent.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getipnode.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_gnba.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_inetntop.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_noop.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_noop.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_packet.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_packet.html#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_resutil.3#3 integrate .. //depot/projects/wifi/contrib/bind9/lib/lwres/man/lwres_resutil.html#3 integrate .. //depot/projects/wifi/contrib/bind9/libtool.m4#3 integrate .. //depot/projects/wifi/contrib/bind9/ltmain.sh#3 integrate .. //depot/projects/wifi/contrib/bind9/make/rules.in#3 integrate .. //depot/projects/wifi/contrib/bind9/version#4 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.c#7 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/wifi/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/wifi/contrib/cvs/src/log.c#2 integrate .. //depot/projects/wifi/contrib/gcc/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/gcc/ansidecl.h#2 integrate .. //depot/projects/wifi/contrib/gcc/builtins.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-common.c#3 integrate .. //depot/projects/wifi/contrib/gcc/c-common.h#2 integrate .. //depot/projects/wifi/contrib/gcc/c-decl.c#4 integrate .. //depot/projects/wifi/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-pch.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-typeck.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cccp.1#2 delete .. //depot/projects/wifi/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/wifi/contrib/gcc/combine.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config.gcc#3 integrate .. //depot/projects/wifi/contrib/gcc/config.host#2 integrate .. //depot/projects/wifi/contrib/gcc/config.in#3 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm-protos.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/host-linux.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/host-solaris.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/i386/i386.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/hpux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/host-darwin.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux64.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000-protos.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.md#3 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/sysv4.h#3 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2-gas-bi.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.c#3 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/x-linux#1 branch .. //depot/projects/wifi/contrib/gcc/config/x-solaris#1 branch .. //depot/projects/wifi/contrib/gcc/configure#3 integrate .. //depot/projects/wifi/contrib/gcc/configure.ac#3 integrate .. //depot/projects/wifi/contrib/gcc/coverage.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/call.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/class.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/cp-tree.def#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/cp-tree.h#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/cvt.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl2.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/error.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/init.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/method.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/name-lookup.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/name-lookup.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/parser.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/pt.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/search.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/semantics.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cp/typeck.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cpp.1#2 delete .. //depot/projects/wifi/contrib/gcc/cppfiles.c#3 integrate .. //depot/projects/wifi/contrib/gcc/cpphash.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cse.c#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/cpp.1#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/gcc.1#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/gcov.1#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/hostconfig.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/include/gcc-common.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/wifi/contrib/gcc/expmed.c#3 integrate .. //depot/projects/wifi/contrib/gcc/f/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/gcc/f/g77.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/f/g77spec.c#2 integrate .. //depot/projects/wifi/contrib/gcc/flow.c#3 integrate .. //depot/projects/wifi/contrib/gcc/fold-const.c#3 integrate .. //depot/projects/wifi/contrib/gcc/function.c#3 integrate .. //depot/projects/wifi/contrib/gcc/gcc.1#3 delete .. //depot/projects/wifi/contrib/gcc/gcc.c#3 integrate .. //depot/projects/wifi/contrib/gcc/gcov-dump.c#2 integrate .. //depot/projects/wifi/contrib/gcc/gcov.c#2 integrate .. //depot/projects/wifi/contrib/gcc/gcse.c#3 integrate .. //depot/projects/wifi/contrib/gcc/ggc-common.c#2 integrate .. //depot/projects/wifi/contrib/gcc/global.c#2 integrate .. //depot/projects/wifi/contrib/gcc/hooks.c#3 integrate .. //depot/projects/wifi/contrib/gcc/hooks.h#3 integrate .. //depot/projects/wifi/contrib/gcc/hosthooks-def.h#2 integrate .. //depot/projects/wifi/contrib/gcc/hosthooks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/local-alloc.c#2 integrate .. //depot/projects/wifi/contrib/gcc/longlong.h#2 integrate .. //depot/projects/wifi/contrib/gcc/loop.c#3 integrate .. //depot/projects/wifi/contrib/gcc/md5.c#2 integrate .. //depot/projects/wifi/contrib/gcc/md5.h#2 integrate .. //depot/projects/wifi/contrib/gcc/mips-tdump.c#2 integrate .. //depot/projects/wifi/contrib/gcc/mips-tfile.c#2 integrate .. //depot/projects/wifi/contrib/gcc/mklibgcc.in#3 integrate .. //depot/projects/wifi/contrib/gcc/optabs.c#2 integrate .. //depot/projects/wifi/contrib/gcc/pretty-print.c#2 integrate .. //depot/projects/wifi/contrib/gcc/reg-stack.c#3 integrate .. //depot/projects/wifi/contrib/gcc/regrename.c#3 integrate .. //depot/projects/wifi/contrib/gcc/regs.h#3 integrate .. //depot/projects/wifi/contrib/gcc/rtl.h#3 integrate .. //depot/projects/wifi/contrib/gcc/sched-rgn.c#2 integrate .. //depot/projects/wifi/contrib/gcc/simplify-rtx.c#3 integrate .. //depot/projects/wifi/contrib/gcc/stmt.c#2 integrate .. //depot/projects/wifi/contrib/gcc/toplev.c#3 integrate .. //depot/projects/wifi/contrib/gcc/tree.c#3 integrate .. //depot/projects/wifi/contrib/gcc/unroll.c#2 integrate .. //depot/projects/wifi/contrib/gcc/version.c#3 integrate .. //depot/projects/wifi/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/contrib/gdb/gdb/config/powerpc/fbsd.mh#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/powerpc/fbsd.mt#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/powerpc/nm-fbsd.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/nm-rs6000.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/nm-rs6000ly.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/rs6000.mh#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/rs6000.mt#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/rs6000lynx.mh#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/rs6000lynx.mt#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/tm-rs6000.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/tm-rs6000ly.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/config/rs6000/xm-rs6000.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/ppcfbsd-nat.c#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/ppcfbsd-tdep.c#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/ppcfbsd-tdep.h#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/rs6000-nat.c#1 branch .. //depot/projects/wifi/contrib/gdb/gdb/rs6000-tdep.c#1 branch .. //depot/projects/wifi/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/wifi/contrib/groff/tmac/doc-syms#4 integrate .. //depot/projects/wifi/contrib/groff/tmac/groff_mdoc.man#5 integrate .. //depot/projects/wifi/contrib/ipfilter/BSD/Makefile#4 integrate .. //depot/projects/wifi/contrib/ipfilter/HISTORY#4 integrate .. //depot/projects/wifi/contrib/ipfilter/Makefile#4 integrate .. //depot/projects/wifi/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/ipf.h#4 integrate .. //depot/projects/wifi/contrib/ipfilter/iplang/iplang_y.y#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/ipsend.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/lsock.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/resend.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/wifi/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/wifi/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/man/ipmon.8#4 integrate .. //depot/projects/wifi/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/Makefile#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i11#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i11#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/wifi/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipmon.c#5 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/wifi/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/wifi/contrib/less/LICENSE#2 integrate .. //depot/projects/wifi/contrib/less/Makefile.aut#2 integrate .. //depot/projects/wifi/contrib/less/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/less/Makefile.wnb#2 integrate .. //depot/projects/wifi/contrib/less/NEWS#2 integrate .. //depot/projects/wifi/contrib/less/README#2 integrate .. //depot/projects/wifi/contrib/less/brac.c#2 integrate .. //depot/projects/wifi/contrib/less/ch.c#2 integrate .. //depot/projects/wifi/contrib/less/charset.c#2 integrate .. //depot/projects/wifi/contrib/less/charset.h#1 branch .. //depot/projects/wifi/contrib/less/cmd.h#2 integrate .. //depot/projects/wifi/contrib/less/cmdbuf.c#2 integrate .. //depot/projects/wifi/contrib/less/command.c#2 integrate .. //depot/projects/wifi/contrib/less/configure#2 integrate .. //depot/projects/wifi/contrib/less/configure.ac#2 integrate .. //depot/projects/wifi/contrib/less/decode.c#2 integrate .. //depot/projects/wifi/contrib/less/defines.ds#2 integrate .. //depot/projects/wifi/contrib/less/defines.h.in#2 integrate .. //depot/projects/wifi/contrib/less/defines.o2#2 integrate .. //depot/projects/wifi/contrib/less/defines.o9#2 integrate .. //depot/projects/wifi/contrib/less/defines.wn#2 integrate .. //depot/projects/wifi/contrib/less/edit.c#2 integrate .. //depot/projects/wifi/contrib/less/filename.c#2 integrate .. //depot/projects/wifi/contrib/less/forwback.c#2 integrate .. //depot/projects/wifi/contrib/less/funcs.h#2 integrate .. //depot/projects/wifi/contrib/less/ifile.c#2 integrate .. //depot/projects/wifi/contrib/less/input.c#2 integrate .. //depot/projects/wifi/contrib/less/jump.c#2 integrate .. //depot/projects/wifi/contrib/less/less.h#2 integrate .. //depot/projects/wifi/contrib/less/less.man#2 integrate .. //depot/projects/wifi/contrib/less/less.nro#2 integrate .. //depot/projects/wifi/contrib/less/lessecho.c#2 integrate .. //depot/projects/wifi/contrib/less/lessecho.man#1 branch .. //depot/projects/wifi/contrib/less/lessecho.nro#1 branch .. //depot/projects/wifi/contrib/less/lesskey.c#2 integrate .. //depot/projects/wifi/contrib/less/lesskey.h#2 integrate .. //depot/projects/wifi/contrib/less/lesskey.man#2 integrate .. //depot/projects/wifi/contrib/less/lesskey.nro#2 integrate .. //depot/projects/wifi/contrib/less/lglob.h#2 integrate .. //depot/projects/wifi/contrib/less/line.c#3 integrate .. //depot/projects/wifi/contrib/less/linenum.c#2 integrate .. //depot/projects/wifi/contrib/less/lsystem.c#2 integrate .. //depot/projects/wifi/contrib/less/main.c#2 integrate .. //depot/projects/wifi/contrib/less/mark.c#2 integrate .. //depot/projects/wifi/contrib/less/mkhelp.c#2 integrate .. //depot/projects/wifi/contrib/less/optfunc.c#2 integrate .. //depot/projects/wifi/contrib/less/option.c#2 integrate .. //depot/projects/wifi/contrib/less/option.h#2 integrate .. //depot/projects/wifi/contrib/less/opttbl.c#2 integrate .. //depot/projects/wifi/contrib/less/os.c#2 integrate .. //depot/projects/wifi/contrib/less/output.c#2 integrate .. //depot/projects/wifi/contrib/less/pckeys.h#2 integrate .. //depot/projects/wifi/contrib/less/position.c#2 integrate .. //depot/projects/wifi/contrib/less/position.h#2 integrate .. //depot/projects/wifi/contrib/less/prompt.c#2 integrate .. //depot/projects/wifi/contrib/less/screen.c#2 integrate .. //depot/projects/wifi/contrib/less/scrsize.c#2 integrate .. //depot/projects/wifi/contrib/less/search.c#2 integrate .. //depot/projects/wifi/contrib/less/signal.c#2 integrate .. //depot/projects/wifi/contrib/less/tags.c#2 integrate .. //depot/projects/wifi/contrib/less/ttyin.c#2 integrate .. //depot/projects/wifi/contrib/less/version.c#2 integrate .. //depot/projects/wifi/contrib/libbegemot/rpoll.c#3 integrate .. //depot/projects/wifi/contrib/libbegemot/rpoll.h#2 integrate .. //depot/projects/wifi/contrib/libbegemot/rpoll.man#3 integrate .. //depot/projects/wifi/contrib/libf2c/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/libobjc/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/libobjc/README#2 integrate .. //depot/projects/wifi/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/wifi/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/wifi/contrib/libpcap/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/libpcap/README.dag#2 integrate .. //depot/projects/wifi/contrib/libpcap/VERSION#3 integrate .. //depot/projects/wifi/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/wifi/contrib/libpcap/configure#3 integrate .. //depot/projects/wifi/contrib/libpcap/configure.in#3 integrate .. //depot/projects/wifi/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/wifi/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/wifi/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/wifi/contrib/libpcap/ethertype.h#3 integrate .. //depot/projects/wifi/contrib/libpcap/fad-win32.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/gencode.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/wifi/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dag.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-int.h#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-stdinc.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.3#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.h#3 integrate .. //depot/projects/wifi/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/wifi/contrib/libpcap/scanner.l#3 integrate .. //depot/projects/wifi/contrib/libstdc++/ChangeLog#3 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/c++config#3 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/fstream.tcc#3 integrate .. //depot/projects/wifi/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/ext/demangle.h#2 delete .. //depot/projects/wifi/contrib/libstdc++/include/ext/hashtable.h#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/Makefile#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/cmds.c#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/conf.c#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/extern.h#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/ftpcmd.y#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/ftpd.8#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/ftpd.c#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/ftpd.conf.5#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/logutmp.c#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/logwtmp.c#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/pathnames.h#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/popen.c#2 integrate .. //depot/projects/wifi/contrib/lukemftpd/src/version.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/MKterminfo.sh#2 integrate .. //depot/projects/wifi/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/wifi/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/FREEBSD-upgrade#2 integrate .. //depot/projects/wifi/contrib/openbsm/HISTORY#2 integrate .. //depot/projects/wifi/contrib/openbsm/README#2 integrate .. //depot/projects/wifi/contrib/openbsm/TODO#2 integrate .. //depot/projects/wifi/contrib/openbsm/VERSION#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/audit/audit.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditd/audit_warn.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditd/auditd.8#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditd/auditd.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditd/auditd.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.1#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/bin/auditreduce/auditreduce.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/bsm/audit.h#2 delete .. //depot/projects/wifi/contrib/openbsm/bsm/audit_filter.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/bsm/audit_internal.h#2 delete .. //depot/projects/wifi/contrib/openbsm/bsm/audit_kevents.h#2 delete .. //depot/projects/wifi/contrib/openbsm/bsm/audit_record.h#2 delete .. //depot/projects/wifi/contrib/openbsm/bsm/libbsm.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/compat/strlcat.h#1 branch .. //depot/projects/wifi/contrib/openbsm/config/config.h#2 integrate .. //depot/projects/wifi/contrib/openbsm/config/config.h.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/configure#2 integrate .. //depot/projects/wifi/contrib/openbsm/configure.ac#2 integrate .. //depot/projects/wifi/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/wifi/contrib/openbsm/etc/audit_event#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/au_open.3#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/au_token.3#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_audit.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_control.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_event.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_io.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/bsm_token.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/libbsm/libbsm.3#2 integrate .. //depot/projects/wifi/contrib/openbsm/man/audit.log.5#2 integrate .. //depot/projects/wifi/contrib/openbsm/man/audit_control.5#2 integrate .. //depot/projects/wifi/contrib/openbsm/man/auditon.2#2 integrate .. //depot/projects/wifi/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/test/bsm/generate.c#2 integrate .. //depot/projects/wifi/contrib/openbsm/test/reference/arg32_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/arg32_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/data_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/data_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/file_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/file_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/header32_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/in_addr_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/in_addr_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/ip_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/ip_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/ipc_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/ipc_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/iport_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/iport_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/opaque_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/opaque_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/path_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/path_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/process32_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/process32_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/process32ex_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/process32ex_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/return32_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/return32_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/seq_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/seq_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/subject32_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/subject32_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/subject32ex_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/subject32ex_token-IPv4#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/subject32ex_token-IPv6#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/text_record#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/text_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/reference/trailer_token#1 branch .. //depot/projects/wifi/contrib/openbsm/test/samples/execve-long-args.trail#1 branch .. //depot/projects/wifi/contrib/openbsm/tools/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openbsm/tools/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/wifi/contrib/pf/man/pf.conf.5#6 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl_altq.c#3 integrate .. //depot/projects/wifi/contrib/pnpinfo/pnpinfo.8#3 integrate .. //depot/projects/wifi/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/FREEBSD-upgrade#5 integrate .. //depot/projects/wifi/contrib/sendmail/RELEASE_NOTES#5 integrate .. //depot/projects/wifi/contrib/sendmail/cf/cf/submit.cf#5 integrate .. //depot/projects/wifi/contrib/sendmail/cf/m4/version.m4#5 integrate .. //depot/projects/wifi/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/main.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/queue.c#5 integrate .. //depot/projects/wifi/contrib/sendmail/src/srvrsmtp.c#5 integrate .. //depot/projects/wifi/contrib/sendmail/src/version.c#5 integrate .. //depot/projects/wifi/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/wifi/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/wifi/contrib/tar/ABOUT-NLS#2 delete .. //depot/projects/wifi/contrib/tar/AUTHORS#2 delete .. //depot/projects/wifi/contrib/tar/COPYING#2 delete .. //depot/projects/wifi/contrib/tar/ChangeLog#2 delete .. //depot/projects/wifi/contrib/tar/ChangeLog.1#2 delete .. //depot/projects/wifi/contrib/tar/FREEBSD-Xlist#2 delete .. //depot/projects/wifi/contrib/tar/FREEBSD-upgrade#2 delete .. //depot/projects/wifi/contrib/tar/INSTALL#2 delete .. //depot/projects/wifi/contrib/tar/NEWS#2 delete .. //depot/projects/wifi/contrib/tar/PORTS#2 delete .. //depot/projects/wifi/contrib/tar/README#2 delete .. //depot/projects/wifi/contrib/tar/README-alpha#2 delete .. //depot/projects/wifi/contrib/tar/THANKS#2 delete .. //depot/projects/wifi/contrib/tar/TODO#2 delete .. //depot/projects/wifi/contrib/tar/doc/fdl.texi#2 delete .. //depot/projects/wifi/contrib/tar/doc/freemanuals.texi#2 delete .. //depot/projects/wifi/contrib/tar/doc/getdate.texi#2 delete .. //depot/projects/wifi/contrib/tar/doc/header.texi#2 delete .. //depot/projects/wifi/contrib/tar/doc/tar.texi#2 delete .. //depot/projects/wifi/contrib/tar/doc/version.texi#2 delete .. //depot/projects/wifi/contrib/tar/lib/addext.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/alloca.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/argmatch.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/argmatch.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/backupfile.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/backupfile.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/basename.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/dirname.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/dirname.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/error.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/error.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/exclude.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/exclude.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/fileblocks.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/fnmatch.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/fnmatch.hin#2 delete .. //depot/projects/wifi/contrib/tar/lib/ftruncate.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/full-write.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/full-write.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/getdate.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/getdate.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/getline.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/getline.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/getstr.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/getstr.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/hash.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/hash.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/human.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/human.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/lchown.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/lchown.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/malloc.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/memset.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/mktime.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/modechange.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/modechange.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/msleep.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/prepargs.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/prepargs.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/print-copyr.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/print-copyr.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/quote.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/quote.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/quotearg.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/quotearg.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/readutmp.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/realloc.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/rename.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/rmdir.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/safe-read.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/safe-read.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/save-cwd.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/save-cwd.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/savedir.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/savedir.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/stpcpy.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strcasecmp.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strncasecmp.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strstr.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strtoimax.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strtol.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strtoll.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strtoul.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strtoull.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/strtoumax.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/unicodeio.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/unicodeio.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/utime.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/waitpid.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xalloc.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/xgetcwd.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xmalloc.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xstrdup.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xstrtoimax.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xstrtol.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xstrtol.h#2 delete .. //depot/projects/wifi/contrib/tar/lib/xstrtoul.c#2 delete .. //depot/projects/wifi/contrib/tar/lib/xstrtoumax.c#2 delete .. //depot/projects/wifi/contrib/tar/src/arith.h#2 delete .. //depot/projects/wifi/contrib/tar/src/buffer.c#2 delete .. //depot/projects/wifi/contrib/tar/src/common.h#2 delete .. //depot/projects/wifi/contrib/tar/src/compare.c#2 delete .. //depot/projects/wifi/contrib/tar/src/create.c#2 delete .. //depot/projects/wifi/contrib/tar/src/delete.c#2 delete .. //depot/projects/wifi/contrib/tar/src/extract.c#2 delete .. //depot/projects/wifi/contrib/tar/src/incremen.c#2 delete .. //depot/projects/wifi/contrib/tar/src/list.c#2 delete .. //depot/projects/wifi/contrib/tar/src/mangle.c#2 delete .. //depot/projects/wifi/contrib/tar/src/misc.c#2 delete .. //depot/projects/wifi/contrib/tar/src/names.c#2 delete .. //depot/projects/wifi/contrib/tar/src/rmt.c#2 delete .. //depot/projects/wifi/contrib/tar/src/rmt.h#2 delete .. //depot/projects/wifi/contrib/tar/src/rtapelib.c#2 delete .. //depot/projects/wifi/contrib/tar/src/system.h#2 delete .. //depot/projects/wifi/contrib/tar/src/tar.c#2 delete .. //depot/projects/wifi/contrib/tar/src/tar.h#2 delete .. //depot/projects/wifi/contrib/tar/src/update.c#2 delete .. //depot/projects/wifi/contrib/tcpdump/CHANGES#3 integrate .. //depot/projects/wifi/contrib/tcpdump/CREDITS#3 integrate .. //depot/projects/wifi/contrib/tcpdump/FILES#3 integrate .. //depot/projects/wifi/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/wifi/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/tcpdump/VERSION#3 integrate .. //depot/projects/wifi/contrib/tcpdump/addrtoname.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/configure#3 integrate .. //depot/projects/wifi/contrib/tcpdump/configure.in#3 integrate .. //depot/projects/wifi/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/interface.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/ipproto.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/netdissect.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ospf.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ap1394.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ascii.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-ether.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-fddi.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-fr.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-icmp6.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ip.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ipfc.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ipx.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-isoclns.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-juniper.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-null.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-pflog.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-pim.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-radius.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sll.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-symantec.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-tcp.c#4 integrate .. //depot/projects/wifi/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/wifi/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/wifi/contrib/telnet/telnet/telnet.1#4 integrate .. //depot/projects/wifi/contrib/telnet/telnetd/telnetd.c#4 integrate .. //depot/projects/wifi/contrib/top/sigconv.awk#2 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.8#4 integrate .. //depot/projects/wifi/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/wifi/crypto/openssh/CREDITS#4 integrate .. //depot/projects/wifi/crypto/openssh/ChangeLog#6 integrate .. //depot/projects/wifi/crypto/openssh/FREEBSD-upgrade#5 integrate .. //depot/projects/wifi/crypto/openssh/INSTALL#4 integrate .. //depot/projects/wifi/crypto/openssh/LICENCE#4 integrate .. //depot/projects/wifi/crypto/openssh/Makefile.in#6 integrate .. //depot/projects/wifi/crypto/openssh/OVERVIEW#3 integrate .. //depot/projects/wifi/crypto/openssh/README#6 integrate .. //depot/projects/wifi/crypto/openssh/README.platform#5 integrate .. //depot/projects/wifi/crypto/openssh/README.tun#2 integrate .. //depot/projects/wifi/crypto/openssh/acss.c#3 integrate .. //depot/projects/wifi/crypto/openssh/atomicio.c#3 integrate .. //depot/projects/wifi/crypto/openssh/atomicio.h#3 integrate .. //depot/projects/wifi/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/wifi/crypto/openssh/audit.c#3 integrate .. //depot/projects/wifi/crypto/openssh/audit.h#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-bsdauth.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-chall.c#4 integrate .. //depot/projects/wifi/crypto/openssh/auth-krb5.c#6 integrate .. //depot/projects/wifi/crypto/openssh/auth-options.c#4 integrate .. //depot/projects/wifi/crypto/openssh/auth-options.h#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-pam.c#6 integrate .. //depot/projects/wifi/crypto/openssh/auth-passwd.c#5 integrate .. //depot/projects/wifi/crypto/openssh/auth-rh-rsa.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-rhosts.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-rsa.c#5 integrate .. //depot/projects/wifi/crypto/openssh/auth-shadow.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 29 12:15: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 6657516A6BA; Fri, 29 Dec 2006 12:15:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42A6616A52F for ; Fri, 29 Dec 2006 11:49:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 333A413C474 for ; Fri, 29 Dec 2006 11:49:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBT2YKcf010362 for ; Fri, 29 Dec 2006 02:34:20 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBT2YKTv010359 for perforce@freebsd.org; Fri, 29 Dec 2006 02:34:20 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Dec 2006 02:34:20 GMT Message-Id: <200612290234.kBT2YKTv010359@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 112264 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, 29 Dec 2006 12:15:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=112264 Change 112264 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/29 02:33:57 integrate by hand some channel handling changes so that we don't panic while attaching in ath Affected files ... .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#6 edit .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211_proto.c#3 edit .. //depot/projects/kmacy_wifi/sys/net80211/ieee80211_var.h#3 edit Differences ... ==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#6 (text+ko) ==== @@ -159,7 +159,7 @@ ("invalid number of channels specified: %u", ic->ic_nchans)); memset(ic->ic_chan_avail, 0, sizeof(ic->ic_chan_avail)); ic->ic_modecaps = 1<ic_nchans; i++) { + for (i = 0; i <= IEEE80211_CHAN_MAX; i++) { c = &ic->ic_channels[i]; if (c->ic_flags) { /* @@ -196,10 +196,11 @@ } } } +#if 0 /* initialize candidate channels to all available */ memcpy(ic->ic_chan_active, ic->ic_chan_avail, sizeof(ic->ic_chan_avail)); - +#endif /* fillin well-known rate sets if driver has not specified */ DEFAULTRATES(IEEE80211_MODE_11B, ieee80211_rateset_11b); DEFAULTRATES(IEEE80211_MODE_11G, ieee80211_rateset_11g); @@ -348,11 +349,18 @@ int ieee80211_chan2ieee(struct ieee80211com *ic, const struct ieee80211_channel *c) { - if (c == NULL) { + if (ic->ic_channels <= c && c <= &ic->ic_channels[IEEE80211_CHAN_MAX]) + return c - ic->ic_channels; + else if (c == IEEE80211_CHAN_ANYC) + return IEEE80211_CHAN_ANY; + else if (c != NULL) { + if_printf(ic->ic_ifp, "invalid channel freq %u flags %x\n", + c->ic_freq, c->ic_flags); + return 0; /* XXX */ + } else { if_printf(ic->ic_ifp, "invalid channel (NULL)\n"); return 0; /* XXX */ } - return (c == IEEE80211_CHAN_ANYC ? IEEE80211_CHAN_ANY : c->ic_ieee); } /* ==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211_proto.c#3 (text+ko) ==== @@ -631,7 +631,7 @@ * entering the RUN state with bsschan setup properly * so state will eventually get set correctly */ - if (ic->ic_bsschan != IEEE80211_CHAN_ANYC) + if (ic->ic_bsschan != NULL) mode = ieee80211_chan2mode(ic, ic->ic_bsschan); else mode = IEEE80211_MODE_AUTO; ==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211_var.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Dec 29 12:16: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 6D5E616A6BD; Fri, 29 Dec 2006 12:15:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 531F016A533 for ; Fri, 29 Dec 2006 11:49:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 415A813C478 for ; Fri, 29 Dec 2006 11:49:06 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBT2ZMXM010427 for ; Fri, 29 Dec 2006 02:35:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBT2ZMv4010424 for perforce@freebsd.org; Fri, 29 Dec 2006 02:35:22 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 29 Dec 2006 02:35:22 GMT Message-Id: <200612290235.kBT2ZMv4010424@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 112265 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, 29 Dec 2006 12:16:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=112265 Change 112265 by kmacy@kmacy_storage:kmacy_wifi on 2006/12/29 02:34:51 IFC Affected files ... .. //depot/projects/kmacy_wifi/share/man/man9/kqueue.9#3 integrate .. //depot/projects/kmacy_wifi/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/kmacy_wifi/sys/powerpc/powerpc/vm_machdep.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/audit/audit.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/audit/audit_bsm_token.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/kmacy_wifi/sys/security/audit/audit_worker.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_net.c#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/kmacy_wifi/sys/security/mac/mac_vfs.c#3 integrate Differences ... ==== //depot/projects/kmacy_wifi/share/man/man9/kqueue.9#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/kqueue.9,v 1.4 2006/12/28 19:15:12 jmg Exp $ +.\" $FreeBSD: src/share/man/man9/kqueue.9,v 1.5 2006/12/28 22:28:28 jmg Exp $ .\" -.Dd October 4, 2006 +.Dd December 28, 2006 .Dt KQUEUE 9 .Os .Sh NAME @@ -191,7 +191,7 @@ .Pp Locks .Em must not -be aquired in +be acquire in .Va f_event . If a lock is required in .Va f_event , ==== //depot/projects/kmacy_wifi/sys/dev/drm/drm_agpsupport.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.5 2006/04/09 20:45:44 anholt Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.6 2006/12/28 21:55:47 jhb Exp $"); #include "dev/drm/drmP.h" @@ -46,7 +46,7 @@ drm_device_find_capability(drm_device_t *dev, int cap) { #ifdef __FreeBSD__ -#if __FreeBSD_version >= 700010 +#if __FreeBSD_version >= 602102 return (pci_find_extcap(dev->device, cap, NULL) == 0); #else ==== //depot/projects/kmacy_wifi/sys/powerpc/powerpc/vm_machdep.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.112 2006/09/01 06:05:40 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.113 2006/12/28 23:56:50 marcel Exp $ */ /*- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -89,6 +89,7 @@ #include #include #include +#include #include @@ -206,7 +207,7 @@ void cpu_reset() { - OF_exit(); + OF_reboot(); } /* ==== //depot/projects/kmacy_wifi/sys/security/audit/audit.c#3 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit.c,v 1.22 2006/11/06 13:42:07 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit.c,v 1.23 2006/12/28 22:18:43 rwatson Exp $ */ #include @@ -312,9 +312,9 @@ return (NULL); /* - * XXX: The number of outstanding uncommitted audit records is - * limited to the number of concurrent threads servicing system - * calls in the kernel. + * Note: the number of outstanding uncommitted audit records is + * limited to the number of concurrent threads servicing system calls + * in the kernel. */ ar = uma_zalloc_arg(audit_record_zone, td, M_WAITOK); ar->k_ar.ar_event = event; @@ -503,7 +503,7 @@ * processes, do that here rather than trying to allocate * another audit record. * - * XXXRW: We might wish to be able to continue here in the + * Note: we might wish to be able to continue here in the * future, if the system recovers. That should be possible * by means of checking the condition in a loop around * cv_wait(). It might be desirable to reevaluate whether an ==== //depot/projects/kmacy_wifi/sys/security/audit/audit_bsm_token.c#3 (text) ==== @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 $ - * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.8 2006/09/20 13:14:47 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.9 2006/12/28 22:18:43 rwatson Exp $ */ #include @@ -338,6 +338,8 @@ /* * token ID 1 byte * ip header 20 bytes + * + * The IP header should be submitted in network byte order. */ token_t * au_to_ip(struct ip *ip) @@ -348,9 +350,6 @@ GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(struct ip)); ADD_U_CHAR(dptr, AUT_IP); - /* - * XXXRW: Any byte order work needed on the IP header before writing? - */ ADD_MEM(dptr, ip, sizeof(struct ip)); return (t); ==== //depot/projects/kmacy_wifi/sys/security/audit/audit_trigger.c#2 (text) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_trigger.c,v 1.3 2006/06/08 21:55:39 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_trigger.c,v 1.4 2006/12/28 22:18:43 rwatson Exp $ */ #include @@ -42,12 +42,17 @@ /* * Structures and operations to support the basic character special device - * used to communicate with userland. + * used to communicate with userland. /dev/audit reliably delivers one-byte + * messages to a listening application (or discards them if there is no + * listening application). + * + * Currently, select/poll are not supported on the trigger device. */ struct trigger_info { unsigned int trigger; TAILQ_ENTRY(trigger_info) list; }; + static MALLOC_DEFINE(M_AUDITTRIGGER, "audit_trigger", "Audit trigger events"); static struct cdev *audit_dev; static int audit_isopen = 0; @@ -132,7 +137,7 @@ return (ENODEV); /* - * XXXAUDIT: Use a condition variable instead of msleep/wakeup? + * Note: Use a condition variable instead of msleep/wakeup? */ ti = malloc(sizeof *ti, M_AUDITTRIGGER, M_WAITOK); mtx_lock(&audit_trigger_mtx); ==== //depot/projects/kmacy_wifi/sys/security/audit/audit_worker.c#3 (text) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.12 2006/09/24 13:35:58 rwatson Exp $ + * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.13 2006/12/28 22:18:43 rwatson Exp $ */ #include @@ -226,7 +226,7 @@ audit_in_failure = 1; } else if (audit_in_failure) { /* - * XXXRW: If we want to handle recovery, this is the + * Note: if we want to handle recovery, this is the * spot to do it: unset audit_in_failure, and issue a * wakeup on the cv. */ @@ -246,8 +246,8 @@ * true, since audit_in_failure can only be set of audit_fail_stop is * set. * - * XXXRW: If we handle recovery from audit_in_failure, then we need - * to make panic here conditional. + * Note: if we handle recovery from audit_in_failure, then we need to + * make panic here conditional. */ if (audit_in_failure) { if (audit_q_len == 0 && audit_pre_q_len == 0) { @@ -297,9 +297,9 @@ * the global replacement variables. Signal consumers as needed that the * rotation has taken place. * - * XXXRW: The global variables and CVs used to signal the audit_worker to - * perform a rotation are essentially a message queue of depth 1. It would - * be much nicer to actually use a message queue. + * The global variables and CVs used to signal the audit_worker to perform a + * rotation are essentially a message queue of depth 1. It would be much + * nicer to actually use a message queue. */ static void audit_worker_rotate(struct ucred **audit_credp, struct vnode **audit_vpp, @@ -323,9 +323,6 @@ audit_enabled = (*audit_vpp != NULL); - /* - * XXX: What to do about write failures here? - */ if (old_vp != NULL) { AUDIT_PRINTF(("Closing old audit file\n")); mtx_unlock(&audit_mtx); @@ -520,11 +517,9 @@ * this call, so the caller should not release either. * * XXXAUDIT: Review synchronize communication logic. Really, this is a - * message queue of depth 1. - * - * XXXAUDIT: Enhance the comments below to indicate that we are basically - * acquiring ownership of the communications queue, inserting our message, - * and waiting for an acknowledgement. + * message queue of depth 1. We are essentially acquiring ownership of the + * communications queue, inserting our message, and waiting for an + * acknowledgement. */ void audit_rotate_vnode(struct ucred *cred, struct vnode *vp) ==== //depot/projects/kmacy_wifi/sys/security/mac/mac_inet.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.8 2006/12/22 23:34:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_inet.c,v 1.9 2006/12/28 21:56:39 rwatson Exp $"); #include "opt_mac.h" @@ -270,8 +270,8 @@ mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp) { - /* XXX: assert socket lock. */ INP_LOCK_ASSERT(inp); + SOCK_LOCK_ASSERT(so); MAC_PERFORM(inpcb_sosetlabel, so, so->so_label, inp, inp->inp_label); } ==== //depot/projects/kmacy_wifi/sys/security/mac/mac_internal.h#4 (text+ko) ==== @@ -37,9 +37,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.118 2006/12/28 21:48:38 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_internal.h,v 1.119 2006/12/28 23:23:35 rwatson Exp $ */ +#ifndef _SYS_SECURITY_MAC_MAC_INTERNAL_H_ +#define _SYS_SECURITY_MAC_MAC_INTERNAL_H_ + /* * MAC Framework sysctl namespace. */ @@ -307,3 +310,5 @@ mac_policy_list_unbusy(); \ } \ } while (0) + +#endif /* !_SYS_SECURITY_MAC_MAC_INTERNAL_H_ */ ==== //depot/projects/kmacy_wifi/sys/security/mac/mac_net.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.124 2006/12/22 23:34:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_net.c,v 1.125 2006/12/28 21:57:59 rwatson Exp $"); #include "opt_mac.h" @@ -75,13 +75,6 @@ #define MAC_IFNET_UNLOCK(ifp) mtx_unlock(&mac_ifnet_mtx) /* - * XXXRW: In order to use the MAC label UMA zone for all label allocations, - * we simply store a pointer to a UMA-allocated label in the mbuf tag. This - * is inefficient and should likely change to using a label embedded in the - * tag. - */ - -/* * Retrieve the label associated with an mbuf by searching for the tag. * Depending on the value of mac_labelmbufs, it's possible that a label will * not be present, in which case NULL is returned. Policies must handle the ==== //depot/projects/kmacy_wifi/sys/security/mac/mac_policy.h#3 (text+ko) ==== @@ -35,13 +35,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.83 2006/12/28 21:48:38 rwatson Exp $ + * $FreeBSD: src/sys/security/mac/mac_policy.h,v 1.84 2006/12/28 23:23:35 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. */ -#ifndef _SYS_MAC_POLICY_H_ -#define _SYS_MAC_POLICY_H_ +#ifndef _SYS_SECURITY_MAC_MAC_POLICY_H_ +#define _SYS_SECURITY_MAC_MAC_POLICY_H_ /*- * Pluggable access control policy definition structure. @@ -971,4 +971,4 @@ */ #define LABEL_TO_SLOT(l, s) (l)->l_perpolicy[s] -#endif /* !_SYS_MAC_POLICY_H_ */ +#endif /* !_SYS_SECURITY_MAC_MAC_POLICY_H_ */ ==== //depot/projects/kmacy_wifi/sys/security/mac/mac_vfs.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.117 2006/12/22 23:34:45 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_vfs.c,v 1.118 2006/12/28 22:02:59 rwatson Exp $"); #include "opt_mac.h" @@ -268,6 +268,15 @@ vp->v_label); } +/* + * Functions implementing extended-attribute backed labels for file systems + * that support it. + * + * Where possible, we use EA transactions to make writes to multiple + * attributes across difference policies mutually atomic. We allow work to + * continue on file systems not supporting EA transactions, but generate a + * printf warning. + */ int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp) @@ -279,7 +288,6 @@ error = VOP_OPENEXTATTR(vp, cred, curthread); if (error == EOPNOTSUPP) { - /* XXX: Optionally abort if transactions not supported. */ if (ea_warn_once == 0) { printf("Warning: transactions not supported " "in EA write.\n"); @@ -297,9 +305,8 @@ } error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curthread); - if (error == EOPNOTSUPP) - error = 0; /* XXX */ + error = 0; return (error); } @@ -314,7 +321,6 @@ error = VOP_OPENEXTATTR(vp, cred, curthread); if (error == EOPNOTSUPP) { - /* XXX: Optionally abort if transactions not supported. */ if (ea_warn_once == 0) { printf("Warning: transactions not supported " "in EA write.\n"); @@ -331,9 +337,8 @@ } error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curthread); - if (error == EOPNOTSUPP) - error = 0; /* XXX */ + error = 0; return (error); } From owner-p4-projects@FreeBSD.ORG Fri Dec 29 17:48: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 B76E416A516; Fri, 29 Dec 2006 17:48:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72FF516A512 for ; Fri, 29 Dec 2006 17:48:02 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6383113C45A for ; Fri, 29 Dec 2006 17:48:02 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTHm2WS089967 for ; Fri, 29 Dec 2006 17:48:02 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTHm22G089964 for perforce@freebsd.org; Fri, 29 Dec 2006 17:48:02 GMT (envelope-from piso@freebsd.org) Date: Fri, 29 Dec 2006 17:48:02 GMT Message-Id: <200612291748.kBTHm22G089964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112292 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, 29 Dec 2006 17:48:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=112292 Change 112292 by piso@piso_newluxor on 2006/12/29 17:47:08 o spacing. o s/u_int/uint/g. o anticipate a couple of mtx_unlock(). Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#15 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#34 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#15 (text+ko) ==== @@ -5860,7 +5860,7 @@ struct cfg_redir *e; int cmd, i, nbytes, do_cfg, do_rule, frule, lrule, nalloc, size; int nat_cnt, r; - u_int8_t *data, *p; + uint8_t *data, *p; char **lav, *endptr; do_rule = 0; ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#34 (text+ko) ==== @@ -4580,17 +4580,17 @@ /* New rule: allocate and init new instance. */ ptr = malloc(sizeof(struct cfg_nat), M_IPFW, M_NOWAIT | M_ZERO); - if (ptr == NULL) { + if (ptr == NULL) { + IPFW_WUNLOCK(&layer3_chain); free(buf, M_IPFW); - IPFW_WUNLOCK(&layer3_chain); return (ENOSPC); } ptr->lib = LibAliasInit(NULL); - if (ptr->lib == NULL) { + if (ptr->lib == NULL) { + IPFW_WUNLOCK(&layer3_chain); free(ptr, M_IPFW); - free(buf, M_IPFW); - IPFW_WUNLOCK(&layer3_chain); - return(EINVAL); + free(buf, M_IPFW); + return (EINVAL); } LIST_INIT(&ptr->redir_chain); } else { @@ -4654,7 +4654,7 @@ case IP_FW_NAT_GET_CONFIG: { - u_int8_t *data; + uint8_t *data; struct cfg_nat *n; struct cfg_redir *r; struct cfg_spool *s; @@ -4713,7 +4713,7 @@ case IP_FW_NAT_GET_LOG: { - u_int8_t *data; + uint8_t *data; struct cfg_nat *ptr; int i, size, cnt, sof; From owner-p4-projects@FreeBSD.ORG Fri Dec 29 18:44: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 C919816A5C1; Fri, 29 Dec 2006 18:44:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F1E016A536 for ; Fri, 29 Dec 2006 18:44:22 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A0FE413C448 for ; Fri, 29 Dec 2006 18:44:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTIiGeO001576 for ; Fri, 29 Dec 2006 18:44:16 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTIiGnV001573 for perforce@freebsd.org; Fri, 29 Dec 2006 18:44:16 GMT (envelope-from piso@freebsd.org) Date: Fri, 29 Dec 2006 18:44:16 GMT Message-Id: <200612291844.kBTIiGnV001573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112294 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, 29 Dec 2006 18:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=112294 Change 112294 by piso@piso_newluxor on 2006/12/29 18:44:01 o turn all the "int sof_foo = sizeof(struct foo)" into constants and move them into ip_fw.h o spacing Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#16 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#35 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#16 (text+ko) ==== @@ -3506,7 +3506,7 @@ char **av, *sep; /* Token separator. */ /* Temporary buffer used to hold server pool ip's. */ char tmp_spool_buf[NAT_BUF_LEN]; - int ac, i, space, lsnat, sof_redir, sof_spool; + int ac, i, space, lsnat; struct cfg_redir *r; struct cfg_spool *tmp; @@ -3514,15 +3514,12 @@ ac = *_ac; space = 0; lsnat = 0; - sof_redir = sizeof(struct cfg_redir); - sof_spool = sizeof(struct cfg_spool); - - if (len >= sof_redir) { + if (len >= SOF_REDIR) { r = (struct cfg_redir *)spool_buf; /* Skip cfg_redir at beginning of buf. */ - spool_buf = &spool_buf[sof_redir]; - space = sof_redir; - len -= sof_redir; + spool_buf = &spool_buf[SOF_REDIR]; + space = SOF_REDIR; + len -= SOF_REDIR; } else goto nospace; r->mode = REDIR_ADDR; @@ -3550,15 +3547,15 @@ sep = strtok(tmp_spool_buf, ","); while (sep != NULL) { tmp = (struct cfg_spool *)spool_buf; - if (len < sof_spool) + if (len < SOF_SPOOL) goto nospace; - len -= sof_spool; - space += sof_spool; + len -= SOF_SPOOL; + space += SOF_SPOOL; StrToAddr(sep, &tmp->addr); tmp->port = ~0; r->spool_cnt++; /* Point to the next possible cfg_spool. */ - spool_buf = &spool_buf[sof_spool]; + spool_buf = &spool_buf[SOF_SPOOL]; sep = strtok(NULL, ","); } } @@ -3573,7 +3570,7 @@ { char **av, *sep, *protoName; char tmp_spool_buf[NAT_BUF_LEN]; - int ac, space, lsnat, sof_redir, sof_spool; + int ac, space, lsnat; struct cfg_redir *r; struct cfg_spool *tmp; u_short numLocalPorts; @@ -3583,16 +3580,14 @@ ac = *_ac; space = 0; lsnat = 0; - sof_redir = sizeof(struct cfg_redir); - sof_spool = sizeof(struct cfg_spool); numLocalPorts = 0; - if (len >= sof_redir) { + if (len >= SOF_REDIR) { r = (struct cfg_redir *)spool_buf; /* Skip cfg_redir at beginning of buf. */ - spool_buf = &spool_buf[sof_redir]; - space = sof_redir; - len -= sof_redir; + spool_buf = &spool_buf[SOF_REDIR]; + space = SOF_REDIR; + len -= SOF_REDIR; } else goto nospace; r->mode = REDIR_PORT; @@ -3702,10 +3697,10 @@ sep = strtok(tmp_spool_buf, ","); while (sep != NULL) { tmp = (struct cfg_spool *)spool_buf; - if (len < sof_spool) + if (len < SOF_SPOOL) goto nospace; - len -= sof_spool; - space += sof_spool; + len -= SOF_SPOOL; + space += SOF_SPOOL; if (StrToAddrAndPortRange(sep, &tmp->addr, protoName, &portRange) != 0) errx(EX_DATAERR, "redirect_port:" @@ -3716,7 +3711,7 @@ tmp->port = GETLOPORT(portRange); r->spool_cnt++; /* Point to the next possible cfg_spool. */ - spool_buf = &spool_buf[sof_spool]; + spool_buf = &spool_buf[SOF_SPOOL]; sep = strtok(NULL, ","); } } @@ -3730,20 +3725,18 @@ int *_ac, char ***_av) { char **av; - int ac, i, space, sof_redir;; + int ac, i, space; struct protoent *protoent; struct cfg_redir *r; av = *_av; ac = *_ac; - sof_redir = sizeof(struct cfg_redir); - - if (len >= sof_redir) { + if (len >= SOF_REDIR) { r = (struct cfg_redir *)spool_buf; /* Skip cfg_redir at beginning of buf. */ - spool_buf = &spool_buf[sof_redir]; - space = sof_redir; - len -= sof_redir; + spool_buf = &spool_buf[SOF_REDIR]; + space = SOF_REDIR; + len -= SOF_REDIR; } else goto nospace; r->mode = REDIR_PROTO; @@ -3805,7 +3798,6 @@ print_nat_config(char *buf) { struct cfg_nat *n; int i, cnt, flag, off; - int sof_redir, sof_spool; struct cfg_redir *t; struct cfg_spool *s; struct protoent *p; @@ -3813,9 +3805,6 @@ n = (struct cfg_nat *)buf; flag = 1; off = sizeof(*n); - sof_redir = sizeof(struct cfg_redir); - sof_spool = sizeof(struct cfg_spool); - printf("ipfw nat %u config", n->id); if (strlen(n->if_name) != 0) printf(" if %s", n->if_name); @@ -3848,7 +3837,7 @@ /* Print all the redirect's data configuration. */ for (cnt = 0; cnt < n->redir_cnt; cnt++) { t = (struct cfg_redir *)&buf[off]; - off += sof_redir; + off += SOF_REDIR; switch (t->mode) { case REDIR_ADDR: printf(" redirect_addr"); @@ -3862,7 +3851,7 @@ else printf(" "); printf("%s", inet_ntoa(s->addr)); - off += sof_spool; + off += SOF_SPOOL; } printf(" %s", inet_ntoa(t->paddr)); break; @@ -3881,7 +3870,7 @@ printf(","); printf("%s:%u", inet_ntoa(s->addr), s->port); - off += sof_spool; + off += SOF_SPOOL; } printf(" "); @@ -3924,10 +3913,9 @@ { struct cfg_nat *n; /* Nat instance configuration. */ struct in_addr ip; - int i, len, off, sof_redir, tok; + int i, len, off, tok; char *id, buf[NAT_BUF_LEN]; /* Buffer for serialized data. */ - sof_redir = sizeof(struct cfg_redir); len = NAT_BUF_LEN; /* Offset in buf: save space for n at the beginning. */ off = sizeof(*n); ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw.h#8 (text+ko) ==== @@ -340,7 +340,7 @@ LIST_HEAD(spool_chain, cfg_spool) spool_chain; }; -#define NAT_BUF_LEN 1024 +#define NAT_BUF_LEN 1024 /* Nat configuration data struct. */ struct cfg_nat { /* chain of nat instances */ @@ -356,6 +356,10 @@ LIST_HEAD(redir_chain, cfg_redir) redir_chain; }; +#define SOF_NAT sizeof(struct cfg_nat) +#define SOF_REDIR sizeof(struct cfg_redir) +#define SOF_SPOOL sizeof(struct cfg_spool) + /* Nat command. */ typedef struct _ipfw_insn_nat { ipfw_insn o; ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#35 (text+ko) ==== @@ -2142,23 +2142,18 @@ static int add_redir_spool_cfg(char *buf, struct cfg_nat *ptr) { - int sof_alinkp, sof_redir, sof_spool; struct cfg_redir *r, *ser_r; struct cfg_spool *s, *ser_s; int cnt, off, i; char *panic_err; - sof_alinkp = sizeof(struct alias_link *); - sof_redir = sizeof(struct cfg_redir); - sof_spool = sizeof(struct cfg_spool); - - for(cnt = 0, off = 0; cnt < ptr->redir_cnt; cnt++) { + for (cnt = 0, off = 0; cnt < ptr->redir_cnt; cnt++) { ser_r = (struct cfg_redir *)&buf[off]; - r = malloc(sof_redir, M_IPFW, M_WAITOK | M_ZERO); - memcpy(r, ser_r, sof_redir); + r = malloc(SOF_REDIR, M_IPFW, M_WAITOK | M_ZERO); + memcpy(r, ser_r, SOF_REDIR); LIST_INIT(&r->spool_chain); - off += sof_redir; - r->alink = malloc(sof_alinkp*r->pport_cnt, + off += SOF_REDIR; + r->alink = malloc(sizeof(struct alias_link *) * r->pport_cnt, M_IPFW, M_WAITOK | M_ZERO); switch (r->mode) { case REDIR_ADDR: @@ -2195,12 +2190,12 @@ } else /* LSNAT handling. */ for (i = 0; i < r->spool_cnt; i++) { ser_s = (struct cfg_spool *)&buf[off]; - s = malloc(sof_redir, M_IPFW, + s = malloc(SOF_REDIR, M_IPFW, M_WAITOK | M_ZERO); - memcpy(s, ser_s, sof_spool); + memcpy(s, ser_s, SOF_SPOOL); LibAliasAddServer(ptr->lib, r->alink[0], s->addr, htons(s->port)); - off += sof_spool; + off += SOF_SPOOL; /* Hook spool entry. */ HOOK_SPOOL(&r->spool_chain, s); } @@ -4658,12 +4653,8 @@ struct cfg_nat *n; struct cfg_redir *r; struct cfg_spool *s; - int sof_nat, sof_redir, sof_spool; int nat_cnt, off; - sof_nat = sizeof(struct cfg_nat); - sof_redir = sizeof(struct cfg_redir); - sof_spool = sizeof(struct cfg_spool); nat_cnt = 0; off = sizeof(nat_cnt); @@ -4672,23 +4663,23 @@ /* Serialize all the data. */ LIST_FOREACH(n, &layer3_chain.nat, _next) { nat_cnt++; - if (off + sof_nat < NAT_BUF_LEN) { - bcopy(n, &data[off], sof_nat); - off += sof_nat; + if (off + SOF_NAT < NAT_BUF_LEN) { + bcopy(n, &data[off], SOF_NAT); + off += SOF_NAT; LIST_FOREACH(r, &n->redir_chain, _next) { - if (off + sof_redir < NAT_BUF_LEN) { + if (off + SOF_REDIR < NAT_BUF_LEN) { bcopy(r, &data[off], - sof_redir); - off += sof_redir; + SOF_REDIR); + off += SOF_REDIR; LIST_FOREACH(s, &r->spool_chain, _next) { - if (off + sof_spool < + if (off + SOF_SPOOL < NAT_BUF_LEN) { bcopy(s, &data[off], - sof_spool); + SOF_SPOOL); off += - sof_spool; + SOF_SPOOL; } else goto nospace; } From owner-p4-projects@FreeBSD.ORG Fri Dec 29 19:31: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 9683D16A47C; Fri, 29 Dec 2006 19:31:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6C78416A416 for ; Fri, 29 Dec 2006 19:31:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5CCDC13C44B for ; Fri, 29 Dec 2006 19:31:18 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTJVI8d009941 for ; Fri, 29 Dec 2006 19:31:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTJVIXw009938 for perforce@freebsd.org; Fri, 29 Dec 2006 19:31:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 29 Dec 2006 19:31:18 GMT Message-Id: <200612291931.kBTJVIXw009938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112295 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, 29 Dec 2006 19:31:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=112295 Change 112295 by hselasky@hselasky_mini_itx on 2006/12/29 19:31:17 Fix some regression. Obviously the commands that come from the SCSI layer do not have the appropriate length, and should be zero padded. This is true for ATAPI and UFI. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#7 (text+ko) ==== @@ -2968,16 +2968,19 @@ umass_ufi_transform(struct umass_softc *sc, u_int8_t *cmd_ptr, u_int8_t cmd_len) { - /* A UFI command is always 12 bytes in length */ - if ((cmd_len < UFI_COMMAND_LENGTH) || + if ((cmd_len == 0) || (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { DPRINTF(sc, UDMASS_SCSI, "Invalid command " "length: %d bytes\n", cmd_len); return 0; /* failure */ } + /* An UFI command is always 12 bytes in length */ sc->sc_transfer.cmd_len = UFI_COMMAND_LENGTH; + /* Zero the command data */ + bzero(sc->sc_transfer.cmd_data, UFI_COMMAND_LENGTH); + switch (cmd_ptr[0]) { /* Commands of which the format has been verified. They should work. * Copy the command into the (zeroed out) destination buffer. @@ -2990,7 +2993,6 @@ DPRINTF(sc, UDMASS_UFI, "Converted TEST_UNIT_READY " "to START_UNIT\n"); - bzero(sc->sc_transfer.cmd_data, UFI_COMMAND_LENGTH); sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; sc->sc_transfer.cmd_data[4] = SSS_START; return 1; @@ -3023,8 +3025,7 @@ return 0; /* failure */ } - bcopy(cmd_ptr, sc->sc_transfer.cmd_data, - UFI_COMMAND_LENGTH); + bcopy(cmd_ptr, sc->sc_transfer.cmd_data, cmd_len); return 1; /* success */ } @@ -3035,16 +3036,19 @@ umass_atapi_transform(struct umass_softc *sc, u_int8_t *cmd_ptr, u_int8_t cmd_len) { - /* An ATAPI command is always 12 bytes in length. */ - if ((cmd_len < ATAPI_COMMAND_LENGTH) || + if ((cmd_len == 0) || (cmd_len > sizeof(sc->sc_transfer.cmd_data))) { DPRINTF(sc, UDMASS_SCSI, "Invalid command " "length: %d bytes\n", cmd_len); return 0; /* failure */ } + /* An ATAPI command is always 12 bytes in length. */ sc->sc_transfer.cmd_len = ATAPI_COMMAND_LENGTH; + /* Zero the command data */ + bzero(sc->sc_transfer.cmd_data, ATAPI_COMMAND_LENGTH); + switch (cmd_ptr[0]) { /* Commands of which the format has been verified. They should work. * Copy the command into the destination buffer. @@ -3052,8 +3056,8 @@ case INQUIRY: /* some drives wedge when asked for full inquiry information. */ if (sc->sc_quirks & FORCE_SHORT_INQUIRY) { - bcopy(cmd_ptr, sc->sc_transfer.cmd_data, - ATAPI_COMMAND_LENGTH); + bcopy(cmd_ptr, sc->sc_transfer.cmd_data, cmd_len); + sc->sc_transfer.cmd_data[4] = SHORT_INQUIRY_LENGTH; return 1; } @@ -3063,7 +3067,6 @@ if (sc->sc_quirks & NO_TEST_UNIT_READY) { DPRINTF(sc, UDMASS_SCSI, "Converted TEST_UNIT_READY " "to START_UNIT\n"); - bzero(sc->sc_transfer.cmd_data, ATAPI_COMMAND_LENGTH); sc->sc_transfer.cmd_data[0] = START_STOP_UNIT; sc->sc_transfer.cmd_data[4] = SSS_START; return 1; @@ -3114,8 +3117,7 @@ break;; } - bcopy(cmd_ptr, sc->sc_transfer.cmd_data, - ATAPI_COMMAND_LENGTH); + bcopy(cmd_ptr, sc->sc_transfer.cmd_data, cmd_len); return 1; /* success */ } From owner-p4-projects@FreeBSD.ORG Fri Dec 29 20:06: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 296E716A40F; Fri, 29 Dec 2006 20:06:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E095116A403 for ; Fri, 29 Dec 2006 20:06:02 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D179C13C44B for ; Fri, 29 Dec 2006 20:06:02 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTK62Tb017854 for ; Fri, 29 Dec 2006 20:06:02 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTK62bR017851 for perforce@freebsd.org; Fri, 29 Dec 2006 20:06:02 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 29 Dec 2006 20:06:02 GMT Message-Id: <200612292006.kBTK62bR017851@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 112297 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, 29 Dec 2006 20:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=112297 Change 112297 by mjacob@mjexp on 2006/12/29 20:05:25 Fix some 32 bit compile issues. Affected files ... .. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#8 edit Differences ... ==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#8 (text+ko) ==== @@ -566,8 +566,8 @@ pp1->name, (unsigned long long) pp1->mediasize); #else gctl_error(req, "Provider %s is %zu; Provider %s is %zu", - pp0->name, (intmax_t) pp0->mediasize, - pp1->name, (intmax_t) pp1->mediasize); + pp0->name, (size_t) pp0->mediasize, + pp1->name, (size_t) pp1->mediasize); #endif return; } From owner-p4-projects@FreeBSD.ORG Fri Dec 29 20:42: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 3142216A416; Fri, 29 Dec 2006 20:42:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0819016A407 for ; Fri, 29 Dec 2006 20:42:44 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EACA513C442 for ; Fri, 29 Dec 2006 20:42:43 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTKghdx024801 for ; Fri, 29 Dec 2006 20:42:43 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTKfmSR024564 for perforce@freebsd.org; Fri, 29 Dec 2006 20:41:48 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 29 Dec 2006 20:41:48 GMT Message-Id: <200612292041.kBTKfmSR024564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 112300 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, 29 Dec 2006 20:42:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=112300 Change 112300 by mjacob@mjexp on 2006/12/29 20:41:26 IFC Affected files ... .. //depot/projects/mjexp/UPDATING#4 integrate .. //depot/projects/mjexp/bin/cat/cat.1#2 integrate .. //depot/projects/mjexp/bin/chmod/chmod.1#2 integrate .. //depot/projects/mjexp/bin/domainname/domainname.1#2 integrate .. //depot/projects/mjexp/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/mjexp/bin/rm/rm.1#3 integrate .. //depot/projects/mjexp/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/mjexp/bin/test/test.1#2 integrate .. //depot/projects/mjexp/contrib/bind9/CHANGES#3 integrate .. //depot/projects/mjexp/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/mjexp/contrib/bind9/FAQ#2 integrate .. //depot/projects/mjexp/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/mjexp/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/README#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/aclconf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/config.threads.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/configure.in#3 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/isc/list.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/include/netdb.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gai_strerror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gen_ho.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/gethostent.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getnameinfo.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/getservent_r.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irp_nw.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irpmarshall.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/irs_data.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_ho.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/irs/lcl_pr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/heap.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/hex.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_sign.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/mtctxres.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#1 branch .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dlv_65323.c#2 delete .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdata/generic/dlv_65323.h#2 delete .. //depot/projects/mjexp/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/nothreads/mutex.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/print.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/sockaddr.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/taskpool.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/fsaccess.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/ipv6.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccc/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/cfg.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/include/isccfg/grammar.h#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/isccfg/parser.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/gai_strerror.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/mjexp/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/mjexp/contrib/bind9/libtool.m4#2 integrate .. //depot/projects/mjexp/contrib/bind9/ltmain.sh#2 integrate .. //depot/projects/mjexp/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/mjexp/contrib/bind9/version#3 integrate .. //depot/projects/mjexp/contrib/cvs/src/log.c#2 integrate .. //depot/projects/mjexp/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/mjexp/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/mjexp/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/mjexp/etc/rc.d/abi#2 integrate .. //depot/projects/mjexp/etc/rc.d/syscons#2 integrate .. //depot/projects/mjexp/etc/rc.subr#4 integrate .. //depot/projects/mjexp/etc/snmpd.config#3 integrate .. //depot/projects/mjexp/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/mjexp/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/mjexp/gnu/usr.bin/man/apropos/apropos.man#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/man/man/man.man#2 integrate .. //depot/projects/mjexp/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/mjexp/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/mjexp/include/unistd.h#2 integrate .. //depot/projects/mjexp/lib/bind/bind/config.h#2 integrate .. //depot/projects/mjexp/lib/bind/bind/port_after.h#2 integrate .. //depot/projects/mjexp/lib/bind/bind/port_before.h#2 integrate .. //depot/projects/mjexp/lib/bind/config.h#2 integrate .. //depot/projects/mjexp/lib/bind/dns/code.h#2 integrate .. //depot/projects/mjexp/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/mjexp/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/mjexp/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/mjexp/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write.3#3 integrate .. //depot/projects/mjexp/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/mjexp/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/mjexp/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/mjexp/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/mjexp/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/mjexp/lib/libc/isc/eventlib_p.h#2 integrate .. //depot/projects/mjexp/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/mjexp/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/mjexp/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/mjexp/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/mjexp/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/mjexp/lib/libc/sys/chflags.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/chmod.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/chown.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/kse.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/mkfifo.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/recv.2#2 integrate .. //depot/projects/mjexp/lib/libc/sys/symlink.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/truncate.2#3 integrate .. //depot/projects/mjexp/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/mjexp/lib/libelf/Makefile#2 integrate .. //depot/projects/mjexp/lib/libelf/Version.map#2 integrate .. //depot/projects/mjexp/lib/libelf/_libelf.h#2 integrate .. //depot/projects/mjexp/lib/libelf/elf.3#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_getphnum.3#1 branch .. //depot/projects/mjexp/lib/libelf/elf_getshnum.3#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_phnum.c#1 branch .. //depot/projects/mjexp/lib/libelf/elf_scn.c#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_shnum.c#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_shstrndx.c#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_strptr.3#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_types.m4#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_update.3#2 integrate .. //depot/projects/mjexp/lib/libelf/elf_update.c#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf.h#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_cap.c#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_getehdr.3#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_getphdr.3#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_getsymshndx.3#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_move.c#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/mjexp/lib/libelf/gelf_syminfo.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_align.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_ar.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_checksum.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_convert.m4#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_data.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_ehdr.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_extended.c#1 branch .. //depot/projects/mjexp/lib/libelf/libelf_fsize.m4#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_msize.m4#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_phdr.c#2 integrate .. //depot/projects/mjexp/lib/libelf/libelf_xlate.c#2 integrate .. //depot/projects/mjexp/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/mjexp/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate .. //depot/projects/mjexp/lib/libthr/arch/arm/include/pthread_md.h#2 integrate .. //depot/projects/mjexp/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/mjexp/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/mjexp/lib/libthr/arch/powerpc/include/pthread_md.h#2 integrate .. //depot/projects/mjexp/lib/libthr/arch/sparc64/include/pthread_md.h#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_cond.c#4 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_create.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/mjexp/lib/libthr/thread/thr_umtx.h#4 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/mjexp/release/doc/en_US.ISO8859-1/relnotes/article.sgml#2 integrate .. //depot/projects/mjexp/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/mjexp/sbin/fdisk/fdisk.8#3 integrate .. //depot/projects/mjexp/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/mjexp/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/mjexp/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/mjexp/sbin/ggate/shared/ggate.h#2 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifbridge.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifmedia.c#2 integrate .. //depot/projects/mjexp/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/mjexp/share/man/man1/builtin.1#3 integrate .. //depot/projects/mjexp/share/man/man1/intro.1#2 integrate .. //depot/projects/mjexp/share/man/man4/Makefile#5 integrate .. //depot/projects/mjexp/share/man/man4/aac.4#3 integrate .. //depot/projects/mjexp/share/man/man4/altq.4#3 integrate .. //depot/projects/mjexp/share/man/man4/audit.4#2 integrate .. //depot/projects/mjexp/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/mjexp/share/man/man4/bce.4#3 integrate .. //depot/projects/mjexp/share/man/man4/fast_ipsec.4#2 integrate .. //depot/projects/mjexp/share/man/man4/fdc.4#3 integrate .. //depot/projects/mjexp/share/man/man4/iic.4#2 integrate .. //depot/projects/mjexp/share/man/man4/inet.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ipmi.4#2 integrate .. //depot/projects/mjexp/share/man/man4/joy.4#2 integrate .. //depot/projects/mjexp/share/man/man4/lmc.4#2 integrate .. //depot/projects/mjexp/share/man/man4/man4.i386/padlock.4#2 integrate .. //depot/projects/mjexp/share/man/man4/man4.sparc64/ofw_console.4#2 integrate .. //depot/projects/mjexp/share/man/man4/miibus.4#2 integrate .. //depot/projects/mjexp/share/man/man4/msk.4#1 branch .. //depot/projects/mjexp/share/man/man4/ng_ksocket.4#2 integrate .. //depot/projects/mjexp/share/man/man4/ng_tag.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pty.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/mjexp/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/mjexp/share/man/man4/syscons.4#3 integrate .. //depot/projects/mjexp/share/man/man4/ubtbcmfw.4#3 integrate .. //depot/projects/mjexp/share/man/man4/vlan.4#2 integrate .. //depot/projects/mjexp/share/man/man4/watchdog.4#2 integrate .. //depot/projects/mjexp/share/man/man5/elf.5#3 integrate .. //depot/projects/mjexp/share/man/man5/linsysfs.5#2 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/mjexp/share/man/man7/build.7#2 integrate .. //depot/projects/mjexp/share/man/man7/development.7#2 integrate .. //depot/projects/mjexp/share/man/man7/environ.7#2 integrate .. //depot/projects/mjexp/share/man/man8/rc.subr.8#2 integrate .. //depot/projects/mjexp/share/man/man9/Makefile#4 integrate .. //depot/projects/mjexp/share/man/man9/bpf.9#2 integrate .. //depot/projects/mjexp/share/man/man9/bus_dma.9#2 integrate .. //depot/projects/mjexp/share/man/man9/config_intrhook.9#3 integrate .. //depot/projects/mjexp/share/man/man9/crypto.9#2 integrate .. //depot/projects/mjexp/share/man/man9/ifnet.9#2 integrate .. //depot/projects/mjexp/share/man/man9/kqueue.9#2 integrate .. //depot/projects/mjexp/share/man/man9/mutex.9#3 integrate .. //depot/projects/mjexp/share/man/man9/priv.9#2 integrate .. //depot/projects/mjexp/share/man/man9/socket.9#1 branch .. //depot/projects/mjexp/share/man/man9/sysctl.9#3 integrate .. //depot/projects/mjexp/share/man/man9/usbdi.9#2 integrate .. //depot/projects/mjexp/share/man/man9/utopia.9#2 integrate .. //depot/projects/mjexp/share/man/man9/vm_map_stack.9#2 integrate .. //depot/projects/mjexp/share/man/man9/watchdog.9#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/mjexp/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/mjexp/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/mjexp/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/mjexp/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/mjexp/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/mjexp/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/mjexp/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/mjexp/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/mjexp/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux.h#5 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/mjexp/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/mjexp/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/mjexp/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_wdog.c#2 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/Makefile.inc#4 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/boot0spi/main.c#4 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/arm_init.S#2 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#3 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/emac.c#4 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/emac_init.c#4 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/lib.h#3 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/spi_flash.c#3 integrate .. //depot/projects/mjexp/sys/boot/arm/at91/libat91/spi_flash.h#2 integrate .. //depot/projects/mjexp/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/mjexp/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/mjexp/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/mjexp/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_time.c#2 integrate .. //depot/projects/mjexp/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/mjexp/sys/conf/NOTES#7 integrate .. //depot/projects/mjexp/sys/conf/files#8 integrate .. //depot/projects/mjexp/sys/conf/files.amd64#6 integrate .. //depot/projects/mjexp/sys/conf/files.arm#4 integrate .. //depot/projects/mjexp/sys/conf/files.i386#6 integrate .. //depot/projects/mjexp/sys/conf/files.pc98#6 integrate .. //depot/projects/mjexp/sys/conf/files.powerpc#3 integrate .. //depot/projects/mjexp/sys/conf/files.sparc64#4 integrate .. //depot/projects/mjexp/sys/conf/files.sun4v#3 integrate .. //depot/projects/mjexp/sys/conf/options#6 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/ah.h#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/ah_desc.h#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/ah_devid.h#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/alpha-elf.inc#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/ap30.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/ap43.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/ap51.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/ap61.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/armv4-be-elf.inc#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/armv4-le-elf.inc#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/wackelf.c#1 branch .. //depot/projects/mjexp/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/xscale-be-elf.inc#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/public/xscale-le-elf.inc#2 integrate .. //depot/projects/mjexp/sys/contrib/dev/ath/version.h#2 integrate .. //depot/projects/mjexp/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/mjexp/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/mjexp/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/mjexp/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/mjexp/sys/dev/aac/aac_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/mjexp/sys/dev/advansys/adv_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/advansys/adv_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/advansys/advansys.c#4 integrate .. //depot/projects/mjexp/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/advansys/adwcam.c#4 integrate .. //depot/projects/mjexp/sys/dev/aha/aha.c#4 integrate .. //depot/projects/mjexp/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/mjexp/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/mjexp/sys/dev/amd/amd.c#4 integrate .. //depot/projects/mjexp/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/mjexp/sys/dev/arl/if_arl.c#3 integrate .. //depot/projects/mjexp/sys/dev/asr/asr.c#4 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/sample/sample.c#2 integrate .. //depot/projects/mjexp/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athrate.h#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/mjexp/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/mjexp/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/mjexp/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt_mca.c#2 integrate .. //depot/projects/mjexp/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/mjexp/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/mjexp/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/mjexp/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/mjexp/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/mjexp/sys/dev/en/midway.c#2 integrate .. //depot/projects/mjexp/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/mjexp/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/mjexp/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/mjexp/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/mjexp/sys/dev/md/md.c#3 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/mjexp/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mii/miidevs#3 integrate .. //depot/projects/mjexp/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/mjexp/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/mjexp/sys/dev/mly/mly.c#4 integrate .. //depot/projects/mjexp/sys/dev/msk/if_msk.c#1 branch .. //depot/projects/mjexp/sys/dev/msk/if_mskreg.h#1 branch .. //depot/projects/mjexp/sys/dev/my/if_my.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#6 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/mjexp/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/mjexp/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/mjexp/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/mjexp/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/mjexp/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2661.c#3 integrate .. //depot/projects/mjexp/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#3 integrate .. //depot/projects/mjexp/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/mjexp/sys/dev/sk/if_skreg.h#3 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/mjexp/sys/dev/trm/trm.c#4 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/if_auereg.h#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_ethersubr.h#2 integrate .. //depot/projects/mjexp/sys/dev/watchdog/watchdog.c#2 integrate .. //depot/projects/mjexp/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/mjexp/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/mjexp/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/mjexp/sys/fs/msdosfs/bpb.h#2 integrate .. //depot/projects/mjexp/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/mjexp/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/mjexp/sys/i386/i386/apic_vector.s#2 integrate .. //depot/projects/mjexp/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/exception.s#2 integrate .. //depot/projects/mjexp/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/mjexp/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/mjexp/sys/i386/i386/trap.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/mjexp/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/mjexp/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/mjexp/sys/i386/include/atomic.h#2 integrate .. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/mjexp/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/mjexp/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/mjexp/sys/i386/isa/icu.h#2 integrate .. //depot/projects/mjexp/sys/i386/linux/linux.h#4 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_proto.h#5 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/mjexp/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/mjexp/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/mjexp/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/mjexp/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_clock.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_kse.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_ktrace.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_mac.c#3 delete .. //depot/projects/mjexp/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/mjexp/sys/kern/kern_sig.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_thread.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#5 integrate .. //depot/projects/mjexp/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/mjexp/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/mjexp/sys/kern/sysv_ipc.c#3 integrate .. //depot/projects/mjexp/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/mjexp/sys/kern/tty.c#5 integrate .. //depot/projects/mjexp/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_export.c#3 integrate .. //depot/projects/mjexp/sys/kern/vfs_extattr.c#1 branch .. //depot/projects/mjexp/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/mjexp/sys/modules/Makefile#4 integrate .. //depot/projects/mjexp/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/mjexp/sys/modules/acpi/acpi/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/isp/Makefile#3 integrate .. //depot/projects/mjexp/sys/modules/msk/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/netgraph/deflate/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/netgraph/pred1/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/ufs/Makefile#3 integrate .. //depot/projects/mjexp/sys/net/bridgestp.c#4 integrate .. //depot/projects/mjexp/sys/net/bridgestp.h#4 integrate .. //depot/projects/mjexp/sys/net/if_bridge.c#5 integrate .. //depot/projects/mjexp/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/mjexp/sys/net/if_enc.c#2 integrate .. //depot/projects/mjexp/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/mjexp/sys/net/if_media.h#2 integrate .. //depot/projects/mjexp/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/mjexp/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/mjexp/sys/netgraph/ng_deflate.c#1 branch .. //depot/projects/mjexp/sys/netgraph/ng_deflate.h#1 branch .. //depot/projects/mjexp/sys/netgraph/ng_nat.c#4 integrate .. //depot/projects/mjexp/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_ppp.h#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_pred1.c#1 branch .. //depot/projects/mjexp/sys/netgraph/ng_pred1.h#1 branch .. //depot/projects/mjexp/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/mjexp/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/mjexp/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/mjexp/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/mjexp/sys/netinet/ip_output.c#4 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias.c#3 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_db.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_local.h#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_mod.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/mjexp/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/mjexp/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.h#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/frag6.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/in6.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/mjexp/sys/netinet6/mld6.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/nd6.c#5 integrate .. //depot/projects/mjexp/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/scope6.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/mjexp/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/mjexp/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/mjexp/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/mjexp/sys/pci/if_rl.c#3 integrate .. //depot/projects/mjexp/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit.c#4 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#3 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_klib.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/mjexp/sys/security/audit/audit_trigger.c#2 integrate .. //depot/projects/mjexp/sys/security/audit/audit_worker.c#2 integrate .. //depot/projects/mjexp/sys/security/mac/mac_framework.c#1 branch .. //depot/projects/mjexp/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_label.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_policy.h#1 branch .. //depot/projects/mjexp/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_priv.c#2 integrate .. //depot/projects/mjexp/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_syscalls.c#1 branch .. //depot/projects/mjexp/sys/security/mac/mac_system.c#4 integrate .. //depot/projects/mjexp/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/mjexp/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/mjexp/sys/security/mac_lomac/mac_lomac.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/mjexp/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_portacl/mac_portacl.c#4 integrate .. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/mjexp/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/mjexp/sys/sparc64/include/param.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/include/cddl/mdesc.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/pcpu.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/smp.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/trap.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_init.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/mdesc/mdesc_vdevfindnode.c#1 branch .. //depot/projects/mjexp/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/interrupt.S#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tick.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/vm_machdep.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/mjexp/sys/sys/interrupt.h#2 integrate .. //depot/projects/mjexp/sys/sys/lock_profile.h#2 integrate .. //depot/projects/mjexp/sys/sys/mac_policy.h#5 delete .. //depot/projects/mjexp/sys/sys/mount.h#4 integrate .. //depot/projects/mjexp/sys/sys/mouse.h#2 integrate .. //depot/projects/mjexp/sys/sys/mutex.h#3 integrate .. //depot/projects/mjexp/sys/sys/param.h#6 integrate .. //depot/projects/mjexp/sys/sys/pcpu.h#4 integrate .. //depot/projects/mjexp/sys/sys/proc.h#6 integrate .. //depot/projects/mjexp/sys/sys/sleepqueue.h#3 integrate .. //depot/projects/mjexp/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/mjexp/sys/sys/sysent.h#2 integrate .. //depot/projects/mjexp/sys/sys/systm.h#4 integrate .. //depot/projects/mjexp/sys/sys/umtx.h#5 integrate .. //depot/projects/mjexp/sys/sys/vnode.h#3 integrate .. //depot/projects/mjexp/sys/sys/watchdog.h#2 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#3 integrate .. //depot/projects/mjexp/tools/regression/sockets/pr_atomic/Makefile#1 branch .. //depot/projects/mjexp/tools/regression/sockets/pr_atomic/pr_atomic.c#1 branch .. //depot/projects/mjexp/usr.bin/apply/apply.1#2 integrate .. //depot/projects/mjexp/usr.bin/biff/biff.1#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.birthday#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.christian#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.holiday#3 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.music#2 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk#2 integrate .. //depot/projects/mjexp/usr.bin/cmp/cmp.1#2 integrate .. //depot/projects/mjexp/usr.bin/column/column.c#2 integrate .. //depot/projects/mjexp/usr.bin/enigma/enigma.1#2 integrate .. //depot/projects/mjexp/usr.bin/find/find.1#3 integrate .. //depot/projects/mjexp/usr.bin/fold/fold.1#2 integrate .. //depot/projects/mjexp/usr.bin/from/from.1#2 integrate .. //depot/projects/mjexp/usr.bin/hexdump/od.1#2 integrate .. //depot/projects/mjexp/usr.bin/id/groups.1#2 integrate .. //depot/projects/mjexp/usr.bin/join/join.1#2 integrate .. //depot/projects/mjexp/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/mjexp/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/mjexp/usr.bin/login/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/login/login.c#2 integrate .. //depot/projects/mjexp/usr.bin/login/login.h#2 integrate .. //depot/projects/mjexp/usr.bin/logname/logname.1#2 integrate .. //depot/projects/mjexp/usr.bin/mkfifo/mkfifo.1#2 integrate .. //depot/projects/mjexp/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/mjexp/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/mjexp/usr.bin/nl/nl.c#2 integrate .. //depot/projects/mjexp/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/mjexp/usr.bin/pkill/pkill.1#3 integrate .. //depot/projects/mjexp/usr.bin/printenv/printenv.1#2 integrate .. //depot/projects/mjexp/usr.bin/systat/swap.c#3 integrate .. //depot/projects/mjexp/usr.bin/tail/tail.1#2 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/mjexp/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/mjexp/usr.bin/tcopy/tcopy.1#2 integrate .. //depot/projects/mjexp/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/mjexp/usr.bin/truss/truss.1#2 integrate .. //depot/projects/mjexp/usr.bin/tsort/tsort.1#2 integrate .. //depot/projects/mjexp/usr.bin/tty/tty.1#2 integrate .. //depot/projects/mjexp/usr.bin/vis/vis.1#2 integrate .. //depot/projects/mjexp/usr.bin/w/w.1#2 integrate .. //depot/projects/mjexp/usr.bin/wc/wc.1#2 integrate .. //depot/projects/mjexp/usr.bin/what/what.1#2 integrate .. //depot/projects/mjexp/usr.bin/which/which.1#2 integrate .. //depot/projects/mjexp/usr.bin/ypwhich/ypwhich.1#2 integrate .. //depot/projects/mjexp/usr.sbin/asf/asf.8#3 integrate .. //depot/projects/mjexp/usr.sbin/asf/asf.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#3 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#3 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#2 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#3 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#3 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#3 integrate .. //depot/projects/mjexp/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#3 integrate .. //depot/projects/mjexp/usr.sbin/ckdist/ckdist.1#2 integrate .. //depot/projects/mjexp/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/mjexp/usr.sbin/kbdmap/kbdmap.1#2 integrate .. //depot/projects/mjexp/usr.sbin/ntp/doc/ntp.conf.5#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/devices.c#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/menus.c#3 integrate .. //depot/projects/mjexp/usr.sbin/vidcontrol/vidcontrol.1#2 integrate .. //depot/projects/mjexp/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/mjexp/UPDATING#4 (text+ko) ==== @@ -21,6 +21,27 @@ developers choose to disable these features on build machines to maximize performance. +20061221: + Support for PCI Message Signalled Interrupts has been + re-enabled in the bge driver, only for those chips which are + believed to support it properly. If there are any problems, + MSI can be disabled completely by setting the + 'hw.pci.enable_msi' and 'hw.pci.enable_msix' tunables to 0 + in the loader. + +20061214: + Support for PCI Message Signalled Interrupts has been + disabled again in the bge driver. Many revisions of the + hardware fail to support it properly. Support can be + re-enabled by removing the #define of BGE_DISABLE_MSI in + "src/sys/dev/bge/if_bge.c". + +20061214: + Support for PCI Message Signalled Interrupts has been added + to the bge driver. If there are any problems, MSI can be + disabled completely by setting the 'hw.pci.enable_msi' and + 'hw.pci.enable_msix' tunables to 0 in the loader. + 20061205: The removal of several facets of the experimental Threading system from the kernel means that the proc and thread structures @@ -682,4 +703,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.467 2006/12/06 06:39:47 julian Exp $ +$FreeBSD: src/UPDATING,v 1.470 2006/12/22 03:03:31 jdp Exp $ ==== //depot/projects/mjexp/bin/cat/cat.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cat.1 8.3 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/cat/cat.1,v 1.25 2005/01/16 16:41:55 ru Exp $ +.\" $FreeBSD: src/bin/cat/cat.1,v 1.27 2006/12/23 09:25:23 ru Exp $ .\" .Dd March 21, 2004 .Dt CAT 1 @@ -52,7 +52,7 @@ If .Ar file is a single dash -.Pq Sq \&- +.Pq Sq Fl or absent, .Nm reads from the standard input. @@ -111,7 +111,7 @@ .Dl "cat file1" .Pp will print the contents of -.Ar file1 +.Pa file1 to the standard output. .Pp The command: @@ -119,13 +119,13 @@ .Dl "cat file1 file2 > file3" .Pp will sequentially print the contents of -.Ar file1 +.Pa file1 and -.Ar file2 +.Pa file2 to the file -.Ar file3 , +.Pa file3 , >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 29 21:41: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 623A716A415; Fri, 29 Dec 2006 21:41:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F040E16A40F for ; Fri, 29 Dec 2006 21:41:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C938C13C441 for ; Fri, 29 Dec 2006 21:41:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBTLf0mn043990 for ; Fri, 29 Dec 2006 21:41:00 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBTLf0Gb043987 for perforce@freebsd.org; Fri, 29 Dec 2006 21:41:00 GMT (envelope-from piso@freebsd.org) Date: Fri, 29 Dec 2006 21:41:00 GMT Message-Id: <200612292141.kBTLf0Gb043987@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 112301 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, 29 Dec 2006 21:41:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=112301 Change 112301 by piso@piso_newluxor on 2006/12/29 21:40:15 Add a comment about net.inet.ip.fw.one_pass. Affected files ... .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#11 edit Differences ... ==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw.8#11 (text+ko) ==== @@ -2072,6 +2072,9 @@ Obey transparent proxy rules only, packet aliasing is not performed. .El .Pp +To let the packet continue after being (de)aliased, set the sysctl variable +.Em net.inet.ip.fw.one_pass +to 0. For more information about aliasing modes, refer to .Xr libalias 3 . From owner-p4-projects@FreeBSD.ORG Sat Dec 30 13:22: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 1233D16A412; Sat, 30 Dec 2006 13:22:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE8FA16A407 for ; Sat, 30 Dec 2006 13:21:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CFB0213C44C for ; Sat, 30 Dec 2006 13:21:59 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBUDLxC4048579 for ; Sat, 30 Dec 2006 13:21:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBUDLxJS048576 for perforce@freebsd.org; Sat, 30 Dec 2006 13:21:59 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 30 Dec 2006 13:21:59 GMT Message-Id: <200612301321.kBUDLxJS048576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112318 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, 30 Dec 2006 13:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=112318 Change 112318 by hselasky@hselasky_mini_itx on 2006/12/30 13:21:15 Add more debugging printouts. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#20 (text+ko) ==== @@ -1116,6 +1116,13 @@ u_int32_t level = 0; usbd_status err; + PRINTFN(4,("udev=%p bmRequestType=0x%02x bRequest=0x%02x " + "wValue=0x%02x%02x wIndex=0x%02x%02x wLength=0x%02x%02x\n", + udev, req->bmRequestType, req->bRequest, + req->wValue[1], req->wValue[0], + req->wIndex[1], req->wIndex[0], + req->wLength[1], req->wLength[0])); + usbd_config[0].type = UE_CONTROL; usbd_config[0].endpoint = 0; /* control pipe */ usbd_config[0].direction = -1; From owner-p4-projects@FreeBSD.ORG Sat Dec 30 18:29: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 0A4C916A415; Sat, 30 Dec 2006 18:29:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B79DA16A407 for ; Sat, 30 Dec 2006 18:29:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A8ABD13C455 for ; Sat, 30 Dec 2006 18:29:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBUITf24011793 for ; Sat, 30 Dec 2006 18:29:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBUITfhx011790 for perforce@freebsd.org; Sat, 30 Dec 2006 18:29:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 30 Dec 2006 18:29:41 GMT Message-Id: <200612301829.kBUITfhx011790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 112324 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, 30 Dec 2006 18:29:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=112324 Change 112324 by hselasky@hselasky_mini_itx on 2006/12/30 18:29:23 Patch to get slow devices working in USB 2.0 mode. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#8 (text+ko) ==== @@ -1263,6 +1263,12 @@ sc->cam_scsi_sense.opcode = REQUEST_SENSE; sc->cam_scsi_test_unit_ready.opcode = TEST_UNIT_READY; + /* some devices need a delay after that the + * configuration value is set to + * function properly: + */ + usbd_delay_ms(uaa->device, 1000); + /* register the SIM */ err = umass_cam_attach_sim(sc); if (err) {