From owner-p4-projects@FreeBSD.ORG Sun Mar 6 04:10:45 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9906416A4D1; Sun, 6 Mar 2005 04:10:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E1BF616A4CF for ; Sun, 6 Mar 2005 04:10:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB4C243D3F for ; Sun, 6 Mar 2005 04:10:42 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j264AgD6032616 for ; Sun, 6 Mar 2005 04:10:42 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j264AgrT032613 for perforce@freebsd.org; Sun, 6 Mar 2005 04:10:42 GMT (envelope-from jmg@freebsd.org) Date: Sun, 6 Mar 2005 04:10:42 GMT Message-Id: <200503060410.j264AgrT032613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 72548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2005 04:10:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=72548 Change 72548 by jmg@jmg_carbon on 2005/03/06 04:10:09 pull in latest changes in hopes that my latest hangs are due to a fixed bug in -current.. Affected files ... .. //depot/projects/arm/src/sys/Makefile#2 integrate .. //depot/projects/arm/src/sys/alpha/alpha/machdep.c#2 integrate .. //depot/projects/arm/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/bus_amd64.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/profile.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/arm/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/arm/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/arm/src/sys/boot/ofw/libofw/ofw_net.c#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#3 integrate .. //depot/projects/arm/src/sys/conf/files.i386#3 integrate .. //depot/projects/arm/src/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#3 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/arm/src/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/arm/src/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpiio.h#3 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/arm/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/arm/src/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/arm/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/arm/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/arm/src/sys/dev/cx/machdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/cy/cy_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/ed/if_ed_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#2 integrate .. //depot/projects/arm/src/sys/dev/en/if_en_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/esp/esp_sbus.c#2 integrate .. //depot/projects/arm/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/arm/src/sys/dev/fatm/if_fatm.c#2 integrate .. //depot/projects/arm/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/arm/src/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/arm/src/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/arm/src/sys/dev/hme/if_hme_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/entry.c#3 integrate .. //depot/projects/arm/src/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/arm/src/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/arm/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/arm/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/idt/idt_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/iir/iir.h#2 integrate .. //depot/projects/arm/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/arm/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/arm/src/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/mcd/mcdreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/arm/src/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/arm/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/arm/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/arm/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/arm/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/arm/src/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/arm/src/sys/dev/puc/puc.c#3 integrate .. //depot/projects/arm/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/arm/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/arm/src/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_init.c#2 integrate .. //depot/projects/arm/src/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/arm/src/sys/i386/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/bus_at386.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/ieeefp.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/ioctl_meteor.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/profile.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/i386/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/arm/src/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/arm/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/arm/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/cpufunc.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/kern/kern_environment.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_thread.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/arm/src/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/bpf.c#3 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/arm/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/arm/src/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/in_cksum.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/central/central.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc_central.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhc_nexus.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/fhc/fhcvar.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/critical.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/endian.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/stdarg.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/include/varargs.h#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/arm/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/arm/src/sys/sys/dir.h#2 integrate .. //depot/projects/arm/src/sys/sys/ioctl.h#2 integrate .. //depot/projects/arm/src/sys/sys/ktr.h#2 integrate .. //depot/projects/arm/src/sys/sys/linker_set.h#2 integrate .. //depot/projects/arm/src/sys/sys/proc.h#2 integrate .. //depot/projects/arm/src/sys/sys/queue.h#2 integrate .. //depot/projects/arm/src/sys/sys/syslimits.h#2 integrate .. //depot/projects/arm/src/sys/sys/umtx.h#2 integrate Differences ... ==== //depot/projects/arm/src/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $ +# $FreeBSD: src/sys/Makefile,v 1.32 2005/03/05 00:56:15 grog Exp $ # The boot loader .if !defined(NO_BOOT) @@ -7,11 +7,30 @@ .endif .endif +# Directories to include in cscope name file and TAGS. +CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ + isofs kern libkern modules net netatalk netatm netgraph \ + netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ + pccard pci posix4 sys ufs vm ${ARCHDIR} + +ARCHDIR ?= i386 + # Loadable kernel modules + .if defined(MODULES_WITH_WORLD) SUBDIR+=modules .endif HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` +cscope: ${.CURDIR}/cscopenamefile + cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile + +${.CURDIR}/cscopenamefile: + cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} + +TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile + rm -f ${.CURDIR}/TAGS + cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile + .include ==== //depot/projects/arm/src/sys/alpha/alpha/machdep.c#2 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.233 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -194,6 +194,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; long totalphysmem; /* total amount of physical memory in system */ long resvmem; /* amount of memory reserved for PROM */ @@ -250,6 +251,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); + realmem = alpha_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/arm/src/sys/alpha/include/_types.h#2 (text+ko) ==== @@ -33,12 +33,16 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -97,7 +101,7 @@ /* * Unusual type definitions. */ -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifdef __GNUCLIKE_BUILTIN_VAALIST typedef __builtin_va_list __va_list; /* internally known to gcc */ #else typedef struct { @@ -105,8 +109,9 @@ int __offset; int __pad; } __va_list; -#endif /* post GCC 2.95 */ -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#endif /* __GNUCLIKE_BUILTIN_VAALIST */ +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/arm/src/sys/alpha/include/atomic.h#2 (text+ko) ==== @@ -23,12 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.19 2004/09/10 05:00:27 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.20 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include /* @@ -50,7 +54,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %2\n\t" /* load old value */ "bis %0, %3, %0\n\t" /* calculate new value */ @@ -66,7 +70,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -82,7 +86,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ @@ -98,7 +102,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ @@ -114,7 +118,7 @@ { u_int32_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ @@ -133,7 +137,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ @@ -149,7 +153,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -165,7 +169,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "addq %0, %2, %0\n\t" /* calculate new value */ @@ -181,7 +185,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "subq %0, %2, %0\n\t" /* calculate new value */ @@ -197,7 +201,7 @@ { u_int64_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldq_l %0,%2\n\t" /* load current value, asserting lock */ @@ -336,7 +340,7 @@ { u_int32_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ @@ -363,7 +367,7 @@ { u_int64_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ ==== //depot/projects/arm/src/sys/alpha/include/cpufunc.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/alpha/include/cpufunc.h,v 1.15 2002/04/01 23:51:22 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -35,9 +35,13 @@ #include #include +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + struct thread; -#ifdef __GNUC__ +#if defined(__GNUCLIKE_ASM) static __inline void breakpoint(void) ==== //depot/projects/arm/src/sys/alpha/include/critical.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE /* * cpu_critical_enter: @@ -75,12 +75,12 @@ intr_restore(td->td_md.md_savecrit); } -#else /* !__GNUC__ */ +#else /* !__CC_SUPPORTS___INLINE */ void cpu_critical_enter(struct thread *td); void cpu_critical_exit(struct thread *td); -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE */ __END_DECLS ==== //depot/projects/arm/src/sys/alpha/include/endian.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.15 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -64,7 +64,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#ifdef __GNUC__ +#if defined(__CC_SUPPORTS___INLINE) && defined(__GNUCLIKE_ASM) static __inline __uint64_t __bswap64(__uint64_t _x) @@ -113,7 +113,7 @@ #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) -#else /* !__GNUC__ */ +#else /* !(__CC_SUPPORTS___INLINE && __GNUCLIKE_ASM) */ /* * No optimizations are available for this compiler. Fall back to @@ -122,6 +122,6 @@ */ #define _BYTEORDER_FUNC_DEFINED -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE && __GNUCLIKE_ASM */ #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/arm/src/sys/alpha/include/in_cksum.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.6 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ @@ -45,7 +45,7 @@ * in the normal case (where there are no options and the header length is * therefore always exactly five 32-bit words. */ -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE static __inline void in_cksum_update(struct ip *ip) ==== //depot/projects/arm/src/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.4 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IOCTL_BT848_H_ #define _MACHINE_IOCTL_BT848_H_ -#ifdef __GNUC__ +#include + +#ifdef __CC_SUPPORTS_WARNING #warning Include dev/bktr/ioctl_bt848.h instead of this header. #endif ==== //depot/projects/arm/src/sys/alpha/include/ioctl_meteor.h#2 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.4 2003/12/08 07:22:41 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_meteor.h,v 1.5 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IOCTL_METEOR_H_ #define _MACHINE_IOCTL_METEOR_H_ -#ifdef __GNUC__ +#include + +#ifdef __CC_SUPPORTS_WARNING #warning Include dev/bktr/ioctl_meteor.h instead of this header. #endif ==== //depot/projects/arm/src/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -28,13 +28,15 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.14 2005/01/05 20:05:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.15 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ -#if __GNUC__ +#include + +#ifdef __CC_SUPPORTS_WARNING #warning "machine/limits.h is deprecated. Include sys/limits.h instead." #endif ==== //depot/projects/arm/src/sys/alpha/include/stdarg.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 * $NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.6 2002/10/06 22:01:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_STDARG_H_ @@ -47,7 +47,7 @@ typedef __va_list va_list; #endif -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifdef __GNUCLIKE_BUILTIN_STDARG #define va_start(ap, last) \ __builtin_stdarg_start((ap), (last)) @@ -63,7 +63,7 @@ #define va_end(ap) \ __builtin_va_end(ap) -#else /* ! __GNUC__ post GCC 2.95 */ +#else /* !__GNUCLIKE_BUILTIN_STDARG */ #ifdef __lint__ #define __builtin_saveregs() (0) @@ -87,6 +87,6 @@ #define va_end(ap) ((void)0) -#endif /* __GNUC__ post GCC 2.95 */ +#endif /* __GNUCLIKE_BUILTIN_STDARG */ #endif /* !_MACHINE_STDARG_H_ */ ==== //depot/projects/arm/src/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -38,13 +38,17 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.6 2003/09/01 03:01:45 kan Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_VARARGS_H_ #define _MACHINE_VARARGS_H_ -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + +#if defined(__GNUCLIKE_BUILTIN_VARARGS) #include @@ -61,23 +65,21 @@ #define va_arg(ap, type) __builtin_va_arg((ap), type) #define va_end(ap) __builtin_va_end(ap) -#else /* ! __GNUC__ post GCC 2.95 */ +#else /* ! __GNUCLIKE_BUILTIN_VARARGS */ #include -#if __GNUC__ == 1 -#define __va_ellipsis -#else #define __va_ellipsis ... -#endif +#ifdef __GNUCLIKE_BUILTIN_VAALIST #define va_alist __builtin_va_alist #define va_dcl long __builtin_va_alist; __va_ellipsis +#endif #undef va_start #define va_start(ap) \ ((ap) = *(va_list *)__builtin_saveregs(), (ap).__pad = 0) -#endif /* __GNUC__ post GCC 2.95 */ +#endif /* __GNUCLIKE_BUILTIN_VARARGS */ #endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/arm/src/sys/amd64/amd64/fpu.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.155 2004/11/27 06:51:32 das Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.156 2005/03/02 21:33:21 joerg Exp $"); #include #include @@ -63,7 +63,7 @@ * Floating point support. */ -#if defined(__GNUC__) && !defined(lint) +#if defined(__GNUCLIKE_ASM) && !defined(lint) #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) #define fnclex() __asm("fnclex") @@ -77,7 +77,7 @@ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* not __GNUC__ */ +#else /* !__GNUCLIKE_ASM */ void fldcw(caddr_t addr); void fnclex(void); @@ -89,7 +89,7 @@ void start_emulating(void); void stop_emulating(void); -#endif /* __GNUC__ */ +#endif /* __GNUCLIKE_ASM */ #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) ==== //depot/projects/arm/src/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.630 2005/03/01 04:18:32 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.632 2005/03/05 18:57:30 des Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -866,8 +866,8 @@ { int i, physmap_idx, pa_indx; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; + u_long physmem_tunable; pt_entry_t *pte; - char *cp; struct bios_smap *smapbase, *smap, *smapend; u_int32_t smapsize; quad_t dcons_addr, dcons_size; @@ -907,13 +907,12 @@ if (boothowto & RB_VERBOSE) printf( "Overlapping or non-montonic memory region, ignoring second region\n"); - goto next_run; + continue; } } if (smap->base == physmap[physmap_idx + 1]) { physmap[physmap_idx + 1] += smap->length; -next_run: continue; } @@ -957,40 +956,8 @@ Maxmem = MAXMEM / 4; #endif - /* - * hw.physmem is a size in bytes; we also allow k, m, and g suffixes - * for the appropriate modifiers. This overrides MAXMEM. - */ - cp = getenv("hw.physmem"); - if (cp != NULL) { - u_int64_t AllowMem, sanity; - char *ep; - - sanity = AllowMem = strtouq(cp, &ep, 0); - if ((ep != cp) && (*ep != 0)) { - switch(*ep) { - case 'g': - case 'G': - AllowMem <<= 10; - case 'm': - case 'M': - AllowMem <<= 10; - case 'k': - case 'K': - AllowMem <<= 10; - break; - default: - AllowMem = sanity = 0; - } - if (AllowMem < sanity) - AllowMem = 0; - } - if (AllowMem == 0) - printf("Ignoring invalid memory size of '%s'\n", cp); - else - Maxmem = atop(AllowMem); - freeenv(cp); - } + if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) + Maxmem = atop(physmem_tunable); if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) ==== //depot/projects/arm/src/sys/amd64/amd64/prof_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.22 2005/01/11 03:44:17 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.23 2005/03/02 21:33:21 joerg Exp $"); #ifdef GUPROF #if 0 @@ -69,7 +69,7 @@ #endif #endif /* GUPROF */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ GM_STATE = 0 \n\ GMON_PROF_OFF = 3 \n\ @@ -140,9 +140,9 @@ .mcount_exit: \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ #ifdef GUPROF /* @@ -151,7 +151,7 @@ * dependent file together with cputime(), __mcount and [.]mcount. cputime() * can't just be put in machdep.c because it has to be compiled without -pg. */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ .text \n\ # \n\ @@ -194,9 +194,9 @@ .mexitcount_exit: \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ /* * Return the time elapsed since the last call. The units are machine- @@ -379,7 +379,7 @@ } #else /* !GUPROF */ -#if defined(__GNUC__) || defined(__INTEL_COMPILER) +#ifdef __GNUCLIKE_ASM __asm(" \n\ .text \n\ .p2align 4,0x90 \n\ @@ -387,7 +387,7 @@ " __XSTRING(HIDENAME(mexitcount)) ": \n\ ret \n\ "); -#else /* !(__GNUC__ || __INTEL_COMPILER) */ -#error -#endif /* __GNUC__ || __INTEL_COMPILER */ +#else /* !__GNUCLIKE_ASM */ +#error this file needs to be ported to your compiler +#endif /* __GNUCLIKE_ASM */ #endif /* GUPROF */ ==== //depot/projects/arm/src/sys/amd64/include/_types.h#2 (text+ko) ==== @@ -33,12 +33,16 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.6 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.7 2005/03/02 21:33:21 joerg Exp $ */ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -97,12 +101,13 @@ /* * Unusual type definitions. */ -#if defined(__GNUC__) +#ifdef __GNUCLIKE_BUILTIN_VARARGS typedef __builtin_va_list __va_list; /* internally known to gcc */ #elif defined(lint) typedef char * __va_list; /* pretend */ #endif -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/arm/src/sys/amd64/include/atomic.h#2 (text+ko) ==== @@ -23,11 +23,15 @@ * 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.32 2003/11/21 03:02:00 peter Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.33 2005/03/02 21:33:21 joerg Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Various simple arithmetic on memory which is atomic in the presence >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 6 21:06:31 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8AC716A4D0; Sun, 6 Mar 2005 21:06:30 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6FA7216A4CF for ; Sun, 6 Mar 2005 21:06:30 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 137E943D55 for ; Sun, 6 Mar 2005 21:06:29 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j26L6SnT018677 for ; Sun, 6 Mar 2005 21:06:28 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j26L6Pgp018674 for perforce@freebsd.org; Sun, 6 Mar 2005 21:06:25 GMT (envelope-from sam@freebsd.org) Date: Sun, 6 Mar 2005 21:06:25 GMT Message-Id: <200503062106.j26L6Pgp018674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2005 21:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=72596 Change 72596 by sam@sam_ebb on 2005/03/06 21:05:04 IFC @ 72595 Affected files ... .. //depot/projects/wifi/Makefile#7 integrate .. //depot/projects/wifi/Makefile.inc1#13 integrate .. //depot/projects/wifi/UPDATING#13 integrate .. //depot/projects/wifi/bin/Makefile#2 integrate .. //depot/projects/wifi/bin/chflags/chflags.1#4 integrate .. //depot/projects/wifi/bin/cp/cp.1#4 integrate .. //depot/projects/wifi/bin/csh/config.h#3 integrate .. //depot/projects/wifi/bin/sh/parser.c#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#5 integrate .. //depot/projects/wifi/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/wifi/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/wifi/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/wifi/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/oid-list#1 branch .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/wifi/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate .. //depot/projects/wifi/contrib/telnet/telnet/commands.c#3 integrate .. //depot/projects/wifi/contrib/telnet/telnet/telnet.1#3 integrate .. //depot/projects/wifi/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/crypto/heimdal/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/NEWS#2 integrate .. //depot/projects/wifi/crypto/heimdal/aclocal.m4#2 integrate .. //depot/projects/wifi/crypto/heimdal/admin/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/admin/get.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/afsutil/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/common/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftp/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftp/ftp.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftpd/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftpd/ftpd.8#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftpd/ftpd.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/kf/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/login/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/login/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/login/login.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/push/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/push/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/push/push.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/rcp/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/rsh/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/su/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/telnet/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/telnetd/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/test/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/compile#2 integrate .. //depot/projects/wifi/crypto/heimdal/config.guess#2 integrate .. //depot/projects/wifi/crypto/heimdal/config.sub#2 integrate .. //depot/projects/wifi/crypto/heimdal/configure#2 integrate .. //depot/projects/wifi/crypto/heimdal/configure.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/doc/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/include/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/include/kadm5/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/install-sh#2 integrate .. //depot/projects/wifi/crypto/heimdal/kadmin/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/kadmin/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/kadmin/kadmind.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/kdc/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/kdc/connect.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/kdc/kerberos5.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/kpasswd/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/kuser/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/kuser/kinit.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/45/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/asn1/Makefile.am#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/asn1/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/auth/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/auth/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/auth/afskauthlib/verify.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/auth/pam/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/auth/sia/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/com_err/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/gssapi/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/hdb/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/kadm5/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/kafs/ChangeLog#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/kafs/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/kafs/afssys.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/Makefile.am#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/changepw.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/context.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/init_creds_pw.c#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/krb5-protos.h#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/krb5.h#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/wifi/crypto/heimdal/lib/roken/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/sl/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/lib/vers/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/heimdal/missing#2 integrate .. //depot/projects/wifi/crypto/heimdal/mkinstalldirs#2 integrate .. //depot/projects/wifi/crypto/heimdal/tools/Makefile.in#2 integrate .. //depot/projects/wifi/crypto/openssl/CHANGES#2 integrate .. //depot/projects/wifi/crypto/openssl/Configure#2 integrate .. //depot/projects/wifi/crypto/openssl/FAQ#2 integrate .. //depot/projects/wifi/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/wifi/crypto/openssl/INSTALL#2 integrate .. //depot/projects/wifi/crypto/openssl/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/wifi/crypto/openssl/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/NEWS#2 integrate .. //depot/projects/wifi/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/wifi/crypto/openssl/README#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/apps/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/pkcs8.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/wifi/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/wifi/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/wifi/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/wifi/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/wifi/crypto/openssl/comm.txt#1 branch .. //depot/projects/wifi/crypto/openssl/comms.txt#1 branch .. //depot/projects/wifi/crypto/openssl/config#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/aes/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/aes/aes_ctr.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/asn1/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/bf/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/bio/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/bn/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/bn/asm/ia64.S#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/buffer/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/cast/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/comp/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/conf/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/des/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/des.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/dh/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/dsa/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/dso/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/ec/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/engine/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/engine/hw_cryptodev.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/err/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/evp/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_locl.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/hmac/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/idea/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/krb5/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/lhash/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/md2/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/md4/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/md5/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/mdc2/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/o_time.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/objects/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/ocsp/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/pem/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/pkcs12/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/rand/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/rc2/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/rc4/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/rc5/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/ripemd/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/rsa/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/sha/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/stack/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/txt_db/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/ui/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/x509/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/wifi/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/wifi/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/wifi/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/crypto/pem.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/wifi/crypto/openssl/e_os.h#2 integrate .. //depot/projects/wifi/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/wifi/crypto/openssl/openssl.spec#2 integrate .. //depot/projects/wifi/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/wifi/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/ssl/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/ssl/s23_clnt.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s2_clnt.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s2_srvr.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_clnt.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_pkt.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/s3_srvr.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl.h#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_cert.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_ciph.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_lib.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/wifi/crypto/openssl/ssl/t1_enc.c#2 integrate .. //depot/projects/wifi/crypto/openssl/test/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/test/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/test/bctest#2 integrate .. //depot/projects/wifi/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/wifi/crypto/openssl/test/testenc#2 integrate .. //depot/projects/wifi/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/wifi/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/wifi/crypto/openssl/tools/Makefile.ssl#2 delete .. //depot/projects/wifi/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/wifi/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/wifi/crypto/openssl/util/domd#2 integrate .. //depot/projects/wifi/crypto/openssl/util/extract-names.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/wifi/crypto/openssl/util/libeay.num#2 integrate .. //depot/projects/wifi/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/mkdef.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/mkerr.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/mkfiles.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/mkstack.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/BC-16.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/BC-32.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/Mingw32.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/OS2-EMX.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/VC-16.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/VC-32.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/wifi/crypto/openssl/util/pod2mantest#2 integrate .. //depot/projects/wifi/crypto/openssl/util/selftest.pl#2 integrate .. //depot/projects/wifi/etc/Makefile#3 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#10 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#6 integrate .. //depot/projects/wifi/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/wifi/etc/newsyslog.conf#2 integrate .. //depot/projects/wifi/etc/rc.d/Makefile#5 integrate .. //depot/projects/wifi/etc/rc.d/initrandom#2 integrate .. //depot/projects/wifi/etc/rc.d/lpd#2 integrate .. //depot/projects/wifi/etc/rc.d/newsyslog#2 integrate .. //depot/projects/wifi/etc/rc.d/power_profile#3 integrate .. //depot/projects/wifi/etc/rc.d/powerd#1 branch .. //depot/projects/wifi/etc/rc.d/resolv#2 integrate .. //depot/projects/wifi/etc/rc.d/var#3 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#8 integrate .. //depot/projects/wifi/games/fortune/datfiles/freebsd-tips#4 integrate .. //depot/projects/wifi/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/wifi/games/fortune/unstr/Makefile#5 integrate .. //depot/projects/wifi/games/fortune/unstr/unstr.c#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/kgdb.1#4 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/main.c#4 integrate .. //depot/projects/wifi/include/Makefile#7 integrate .. //depot/projects/wifi/include/nl_types.h#2 integrate .. //depot/projects/wifi/include/runefile.h#1 branch .. //depot/projects/wifi/kerberos5/include/config.h#2 integrate .. //depot/projects/wifi/kerberos5/include/version.h#2 integrate .. //depot/projects/wifi/kerberos5/lib/libasn1/Makefile#2 integrate .. //depot/projects/wifi/kerberos5/usr.bin/krb5-config/Makefile#2 integrate .. //depot/projects/wifi/lib/libalias/alias_skinny.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/tls.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/big5.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/collate.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/collate.h#2 integrate .. //depot/projects/wifi/lib/libc/locale/collcmp.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/euc.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/gb2312.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/wifi/lib/libc/locale/mskanji.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/none.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/rune.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/table.c#2 integrate .. //depot/projects/wifi/lib/libc/locale/utf8.c#3 integrate .. //depot/projects/wifi/lib/libc/nls/C.msg#1 branch .. //depot/projects/wifi/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/nls/catclose.3#2 integrate .. //depot/projects/wifi/lib/libc/nls/catgets.3#2 integrate .. //depot/projects/wifi/lib/libc/nls/catopen.3#2 integrate .. //depot/projects/wifi/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/wifi/lib/libc/nls/msgcat.h#3 delete .. //depot/projects/wifi/lib/libc/nls/pl_PL.ISO8859-2.msg#1 branch .. //depot/projects/wifi/lib/libc/nls/ru_RU.KOI8-R.msg#1 branch .. //depot/projects/wifi/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/wifi/lib/libc/string/strerror.c#2 integrate .. //depot/projects/wifi/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/wifi/lib/libc/sys/extattr_get_file.2#3 integrate .. //depot/projects/wifi/lib/libc/sys/mount.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#4 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_init.c#4 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_stack.c#3 integrate .. //depot/projects/wifi/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/wifi/lib/libfetch/http.c#3 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/arm/context.S#3 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/arm/pthread_md.c#3 integrate .. //depot/projects/wifi/lib/libpthread/arch/arm/include/pthread_md.h#3 integrate .. //depot/projects/wifi/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_stack.c#3 integrate .. //depot/projects/wifi/lib/libutil/login.conf.5#2 integrate .. //depot/projects/wifi/lib/msun/Makefile#7 integrate .. //depot/projects/wifi/lib/msun/ia64/fenv.h#3 integrate .. //depot/projects/wifi/lib/msun/man/exp.3#4 integrate .. //depot/projects/wifi/lib/msun/man/ieee.3#4 integrate .. //depot/projects/wifi/lib/msun/src/e_expf.c#3 integrate .. //depot/projects/wifi/libexec/Makefile#5 integrate .. //depot/projects/wifi/libexec/rexecd/rexecd.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/arm/rtld_machdep.h#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/wifi/release/Makefile#5 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#2 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#9 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#10 integrate .. //depot/projects/wifi/sbin/devfs/devfs.8#3 integrate .. //depot/projects/wifi/sbin/devfs/rule.c#3 integrate .. //depot/projects/wifi/sbin/dump/tape.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/concat/geom_concat.c#3 integrate .. //depot/projects/wifi/sbin/geom/class/label/geom_label.c#3 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/geom_mirror.c#4 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/gmirror.8#5 integrate .. //depot/projects/wifi/sbin/geom/class/raid3/geom_raid3.c#4 integrate .. //depot/projects/wifi/sbin/geom/class/shsec/geom_shsec.c#4 integrate .. //depot/projects/wifi/sbin/geom/class/shsec/gshsec.8#5 integrate .. //depot/projects/wifi/sbin/geom/class/stripe/geom_stripe.c#3 integrate .. //depot/projects/wifi/sbin/geom/core/geom.8#5 integrate .. //depot/projects/wifi/sbin/geom/core/geom.c#3 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#8 integrate .. //depot/projects/wifi/sbin/savecore/savecore.8#3 integrate .. //depot/projects/wifi/sbin/savecore/savecore.c#4 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile#5 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.asm#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.man#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_OBJECT_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_STRING_length.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_STRING_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_swap.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/CONF_modules_free.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/CONF_modules_load_file.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_BytesToKey.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_PKEY_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OBJ_nid2obj.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_config.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS12_create.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS12_parse.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_decrypt.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_encrypt.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_sign.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/PKCS7_verify.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/SMIME_read_PKCS7.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/SMIME_write_PKCS7.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_NAME_print_ex.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/X509_new.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_DSAPublicKey.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_ALGOR.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_CRL.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_NAME.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_REQ.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/d2i_X509_SIG.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/engine.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/pem.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ui.3#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/man/ui_compat.3#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/Makefile#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/Makefile.man#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/CA.pl.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/asn1parse.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/ca.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/ciphers.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/crl.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/crl2pkcs7.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/dgst.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/dhparam.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/dsa.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/dsaparam.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/enc.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/gendsa.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/genrsa.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/nseq.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/ocsp.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/openssl.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/passwd.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/pkcs12.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/pkcs7.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/pkcs8.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/rand.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/req.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/rsa.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/rsautl.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/s_client.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/s_server.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/s_time.1#1 branch .. //depot/projects/wifi/secure/usr.bin/openssl/man/sess_id.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/smime.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/speed.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/spkac.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/verify.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/version.1#2 integrate .. //depot/projects/wifi/secure/usr.bin/openssl/man/x509.1#2 integrate .. //depot/projects/wifi/share/colldef/Makefile#2 integrate .. //depot/projects/wifi/share/colldef/uk_UA.CP1251.src#1 branch .. //depot/projects/wifi/share/examples/etc/make.conf#11 integrate .. //depot/projects/wifi/share/man/man1/builtin.1#3 integrate .. //depot/projects/wifi/share/man/man4/Makefile#15 integrate .. //depot/projects/wifi/share/man/man4/amr.4#6 integrate .. //depot/projects/wifi/share/man/man4/carp.4#2 integrate .. //depot/projects/wifi/share/man/man4/cpufreq.4#3 integrate .. //depot/projects/wifi/share/man/man4/ed.4#5 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#4 integrate .. //depot/projects/wifi/share/man/man4/snd_ad1816.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_als4000.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_cmi.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_ds1.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_emu10k1.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_es137x.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_ess.4#2 integrate .. //depot/projects/wifi/share/man/man4/snd_fm801.4#1 branch .. //depot/projects/wifi/share/man/man4/snd_ich.4#4 integrate .. //depot/projects/wifi/share/man/man4/snd_neomagic.4#1 branch .. //depot/projects/wifi/share/man/man4/snd_sbc.4#3 integrate .. //depot/projects/wifi/share/man/man4/snd_solo.4#2 integrate .. //depot/projects/wifi/share/man/man4/twa.4#2 integrate .. //depot/projects/wifi/share/man/man4/twe.4#3 integrate .. //depot/projects/wifi/share/man/man4/umct.4#2 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#9 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/wifi/share/man/man5/style.Makefile.5#3 integrate .. //depot/projects/wifi/share/man/man7/build.7#2 integrate .. //depot/projects/wifi/share/man/man7/clocks.7#2 integrate .. //depot/projects/wifi/share/man/man9/bpf.9#5 integrate .. //depot/projects/wifi/share/man/man9/ifnet.9#4 integrate .. //depot/projects/wifi/share/man/man9/namei.9#2 integrate .. //depot/projects/wifi/share/mk/bsd.compat.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/wifi/share/mk/bsd.info.mk#4 integrate .. //depot/projects/wifi/share/mk/bsd.nls.mk#2 integrate .. //depot/projects/wifi/share/mklocale/Makefile#2 integrate .. //depot/projects/wifi/share/monetdef/Makefile#2 integrate .. //depot/projects/wifi/share/monetdef/uk_UA.CP1251.src#1 branch .. //depot/projects/wifi/share/msgdef/Makefile#2 integrate .. //depot/projects/wifi/share/msgdef/uk_UA.CP1251.src#1 branch .. //depot/projects/wifi/share/numericdef/Makefile#2 integrate .. //depot/projects/wifi/share/timedef/Makefile#2 integrate .. //depot/projects/wifi/share/timedef/uk_UA.CP1251.src#1 branch .. //depot/projects/wifi/sys/Makefile#2 integrate .. //depot/projects/wifi/sys/alpha/alpha/machdep.c#8 integrate .. //depot/projects/wifi/sys/alpha/include/_types.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/critical.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/endian.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/limits.h#3 integrate .. //depot/projects/wifi/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/wifi/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#8 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/wifi/sys/amd64/include/_types.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/bus_amd64.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/cpufunc.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/critical.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/endian.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/in_cksum.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/limits.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/profile.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/smp.h#4 integrate .. //depot/projects/wifi/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/wifi/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/wifi/sys/arm/arm/cpufunc_asm.S#5 integrate .. //depot/projects/wifi/sys/arm/arm/fusu.S#4 integrate .. //depot/projects/wifi/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/wifi/sys/arm/arm/support.S#3 integrate .. //depot/projects/wifi/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/wifi/sys/arm/arm/sys_machdep.c#2 integrate .. //depot/projects/wifi/sys/arm/include/_types.h#2 integrate .. //depot/projects/wifi/sys/arm/include/limits.h#3 integrate .. //depot/projects/wifi/sys/arm/include/machdep.h#2 integrate .. //depot/projects/wifi/sys/arm/include/pmap.h#5 integrate .. //depot/projects/wifi/sys/arm/include/proc.h#3 integrate .. //depot/projects/wifi/sys/arm/include/stdarg.h#3 integrate .. //depot/projects/wifi/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/std.i80321#3 integrate .. //depot/projects/wifi/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/wifi/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/wifi/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/wifi/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/wifi/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/wifi/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#7 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/wifi/sys/compat/ndis/ndis_var.h#7 integrate .. //depot/projects/wifi/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ndis.c#8 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_ntoskrnl.c#8 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/wifi/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/wifi/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/wifi/sys/compat/svr4/svr4_signal.c#4 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_signal.h#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/wifi/sys/conf/NOTES#14 integrate .. //depot/projects/wifi/sys/conf/files#18 integrate .. //depot/projects/wifi/sys/conf/files.amd64#6 integrate .. //depot/projects/wifi/sys/conf/files.i386#11 integrate .. //depot/projects/wifi/sys/conf/kern.post.mk#4 integrate .. //depot/projects/wifi/sys/conf/majors#3 integrate .. //depot/projects/wifi/sys/conf/options#11 integrate .. //depot/projects/wifi/sys/conf/options.arm#3 integrate .. //depot/projects/wifi/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/ioctl.c#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/wifi/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/wifi/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#8 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_throttle.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/wifi/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/wifi/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/amd/amd.c#3 integrate .. //depot/projects/wifi/sys/dev/amr/amr.c#6 integrate .. //depot/projects/wifi/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/asr/asr.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/wifi/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/wifi/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/wifi/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/wifi/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/wifi/sys/dev/cpufreq/ichss.c#3 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/wifi/sys/dev/cx/machdep.h#3 integrate .. //depot/projects/wifi/sys/dev/cy/cy_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/digi/digi.c#2 integrate .. //depot/projects/wifi/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_eisa.c#2 integrate .. //depot/projects/wifi/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#8 integrate .. //depot/projects/wifi/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/wifi/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/wifi/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/wifi/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/wifi/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/wifi/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/hptmv/access601.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/array.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/atapi.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/command.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/wifi/sys/dev/hptmv/global.h#3 integrate .. //depot/projects/wifi/sys/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/wifi/sys/dev/hptmv/hptproc.c#1 branch .. //depot/projects/wifi/sys/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/wifi/sys/dev/hptmv/ioctl.c#1 branch .. //depot/projects/wifi/sys/dev/hptmv/mvSata.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/raid5n.h#1 branch .. //depot/projects/wifi/sys/dev/hptmv/readme.txt#1 branch .. //depot/projects/wifi/sys/dev/hptmv/vdevice.h#1 branch .. //depot/projects/wifi/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/wifi/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/idt/idt_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/wifi/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndis_usb.c#1 branch .. //depot/projects/wifi/sys/dev/iir/iir.h#4 integrate .. //depot/projects/wifi/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/wifi/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/wifi/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/mcd/mcdreg.h#3 integrate .. //depot/projects/wifi/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/mly/mly.c#2 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_type.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/wifi/sys/dev/my/if_my.c#2 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/wifi/sys/dev/null/null.c#2 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#10 integrate .. //depot/projects/wifi/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/wifi/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/wifi/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/wifi/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/wifi/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/wifi/sys/dev/puc/puc.c#3 integrate .. //depot/projects/wifi/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/puc/puc_sbus.c#5 integrate .. //depot/projects/wifi/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#4 integrate .. //depot/projects/wifi/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/safe/safe.c#2 integrate .. //depot/projects/wifi/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/wifi/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/wifi/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/isa/ad1816.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/via8233.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 7 18:42:54 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92F5216A4D0; Mon, 7 Mar 2005 18:42:54 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 508E316A4CE for ; Mon, 7 Mar 2005 18:42:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35A4943D46 for ; Mon, 7 Mar 2005 18:42:54 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27Igs47010246 for ; Mon, 7 Mar 2005 18:42:54 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27IgrFm010243 for perforce@freebsd.org; Mon, 7 Mar 2005 18:42:53 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Mar 2005 18:42:53 GMT Message-Id: <200503071842.j27IgrFm010243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 18:42:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=72646 Change 72646 by sam@sam_ebb on 2005/03/07 18:42:34 josh bicket's samplerate algorithm Affected files ... .. //depot/projects/wifi/sys/conf/files#19 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#1 add .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.h#1 add Differences ... ==== //depot/projects/wifi/sys/conf/files#19 (text+ko) ==== @@ -402,6 +402,7 @@ dev/ata/atapi-tape.c optional atapist dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe +dev/ath/ath_rate/sample/sample.c optional ath_rate_sample dev/ath/ath_rate/atheros/bsd.c optional ath_rate_atheros dev/ath/ath_rate/atheros/ratectrl.c optional ath_rate_atheros dev/ath/ath_rate/atheros/ar5212Phy.c optional ath_rate_atheros From owner-p4-projects@FreeBSD.ORG Mon Mar 7 19:39:02 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EE5A16A4D0; Mon, 7 Mar 2005 19:39:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D9E116A4CE for ; Mon, 7 Mar 2005 19:39:02 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E10843D55 for ; Mon, 7 Mar 2005 19:39:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27Jd1tr012924 for ; Mon, 7 Mar 2005 19:39:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27Jd1sN012921 for perforce@freebsd.org; Mon, 7 Mar 2005 19:39:01 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 19:39:01 GMT Message-Id: <200503071939.j27Jd1sN012921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 19:39:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=72647 Change 72647 by jhb@jhb_slimer on 2005/03/07 19:38:05 - List memory addresses as both an input and an output rather than using the + modifier with memory operands. - Use alpha_wmb() rather than alpha_mb() for rel variants. - Don't clobbery memory in each atomic op but only do it for acq variants. - Move the membar for acq variants before the operation. (This probably has no affect, but I think this is more correct.) Affected files ... .. //depot/projects/smpng/sys/alpha/include/atomic.h#10 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/atomic.h#10 (text+ko) ==== @@ -53,12 +53,11 @@ #ifdef __GNUC__ __asm __volatile ( "1:\tldl_l %0, %2\n\t" /* load old value */ - "bis %0, %3, %0\n\t" /* calculate new value */ + "bis %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "=m" (*p) - : "m" (*p), "r" (v) - : "memory"); + : "r" (v), "m" (*p)); #endif } @@ -72,9 +71,8 @@ "bic %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -88,9 +86,8 @@ "addl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -104,9 +101,8 @@ "subl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -121,9 +117,8 @@ "ldiq %1,0\n\t" /* value to store */ "stl_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ - : "=&r"(result), "=&r"(temp), "+m" (*addr) - : - : "memory"); + : "=&r"(result), "=&r"(temp), "=m" (*addr) + : "m" (*addr)); #endif return result; @@ -139,9 +134,8 @@ "bis %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -155,9 +149,8 @@ "bic %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -171,9 +164,8 @@ "addq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -187,9 +179,8 @@ "subq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) - : "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p)); #endif } @@ -205,8 +196,7 @@ "stq_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ : "=&r"(result), "=&r"(temp), "+m" (*addr) - : - : "memory"); + : "m" (*addr)); #endif return result; @@ -238,28 +228,30 @@ static __inline void \ atomic_##NAME##_acq_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ + alpha_mb(); \ + __asm __volatile("" ::: "memory"); \ atomic_##NAME##_##WIDTH(p, v); \ - alpha_mb(); \ } \ \ static __inline void \ atomic_##NAME##_rel_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ - alpha_mb(); \ + alpha_wmb(); \ atomic_##NAME##_##WIDTH(p, v); \ } \ \ static __inline void \ atomic_##NAME##_acq_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ + alpha_mb(); \ + __asm __volatile("" ::: "memory"); \ atomic_##NAME##_##WIDTH(p, v); \ - alpha_mb(); \ } \ \ static __inline void \ atomic_##NAME##_rel_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ - alpha_mb(); \ + alpha_wmb(); \ atomic_##NAME##_##WIDTH(p, v); \ } @@ -291,31 +283,34 @@ { \ u_##TYPE v; \ \ + alpha_mb(); \ + __asm __volatile("" ::: "memory"); \ v = *p; \ - alpha_mb(); \ return (v); \ } \ \ static __inline void \ atomic_store_rel_##WIDTH(volatile u_##TYPE *p, u_##TYPE v)\ { \ - alpha_mb(); \ + alpha_wmb(); \ *p = v; \ } \ + \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ u_##TYPE v; \ \ + alpha_mb(); \ + __asm __volatile("" ::: "memory"); \ v = *p; \ - alpha_mb(); \ return (v); \ } \ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - alpha_mb(); \ + alpha_wmb(); \ *p = v; \ } @@ -345,9 +340,8 @@ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n\t" /* if it failed, spin */ "2:\n" - : "=&r" (ret), "+m" (*p) - : "r" ((long)(int)cmpval), "r" (newval) - : "memory"); + : "=&r" (ret), "=m" (*p) + : "r" ((long)(int)cmpval), "r" (newval), "m" (*p)); #endif return ret; @@ -372,9 +366,8 @@ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n\t" /* if it failed, spin */ "2:\n" - : "=&r" (ret), "+m" (*p) - : "r" (cmpval), "r" (newval) - : "memory"); + : "=&r" (ret), "=m" (*p) + : "r" (cmpval), "r" (newval), "m" (*p)); #endif return ret; @@ -396,15 +389,16 @@ { int retval; + alpha_mb(); + __asm __volatile("" ::: "memory"); retval = atomic_cmpset_32(p, cmpval, newval); - alpha_mb(); return (retval); } static __inline u_int32_t atomic_cmpset_rel_32(volatile u_int32_t *p, u_int32_t cmpval, u_int32_t newval) { - alpha_mb(); + alpha_wmb(); return (atomic_cmpset_32(p, cmpval, newval)); } @@ -413,15 +407,16 @@ { int retval; + alpha_mb(); + __asm __volatile("" ::: "memory"); retval = atomic_cmpset_64(p, cmpval, newval); - alpha_mb(); return (retval); } static __inline u_int64_t atomic_cmpset_rel_64(volatile u_int64_t *p, u_int64_t cmpval, u_int64_t newval) { - alpha_mb(); + alpha_wmb(); return (atomic_cmpset_64(p, cmpval, newval)); } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 19:43:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1196716A4D0; Mon, 7 Mar 2005 19:43:08 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB13716A4CE for ; Mon, 7 Mar 2005 19:43:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CD7943D2D for ; Mon, 7 Mar 2005 19:43:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27Jh7KZ013101 for ; Mon, 7 Mar 2005 19:43:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27Jh7nr013098 for perforce@freebsd.org; Mon, 7 Mar 2005 19:43:07 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 19:43:07 GMT Message-Id: <200503071943.j27Jh7nr013098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 19:43:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=72648 Change 72648 by jhb@jhb_slimer on 2005/03/07 19:42:43 - Make MPLOCKED a string and stop using __XSTRING(). - Add MP[LS]FENCE macros that use fence instructions on SMP and are empty on UP ala MPLOCKED for use in membars. - Add real acq and rel variants of atomic ops that use MP[LS]FENCE. The acq variants also clobber "memory". - Add *dst as an input to atomic_cmpset() (before it was only an input). - Now that the fence stuff is abstracted via macros a bit, collapse the mostly similar UP and SMP load/store primitives. - Add the addr memory operand as an input to atomic_readandclear(). Affected files ... .. //depot/projects/smpng/sys/amd64/include/atomic.h#7 edit Differences ... ==== //depot/projects/smpng/sys/amd64/include/atomic.h#7 (text+ko) ==== @@ -64,8 +64,10 @@ * This allows kernel modules to be portable between UP and SMP systems. */ #if defined(KLD_MODULE) -#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ -void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) +#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ +void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) \ +void atomic_##NAME##_##TYPE_acq(volatile u_##TYPE *p, u_##TYPE v) \ +void atomic_##NAME##_##TYPE_rel(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); @@ -83,9 +85,13 @@ * the binaries will run on both types of systems. */ #if defined(SMP) || !defined(_KERNEL) -#define MPLOCKED lock ; +#define MPLOCKED "lock ; " +#define MPLFENCE "lfence ; " +#define MPSFENCE "sfence ; " #else -#define MPLOCKED +#define MPLOCKED "" +#define MPLFENCE "" +#define MPSFENCE "" #endif /* @@ -96,9 +102,26 @@ static __inline void \ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(__XSTRING(MPLOCKED) OP \ - : "+m" (*p) \ - : CONS (V)); \ + __asm __volatile(MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ +} \ + \ +static __inline void \ +atomic_##NAME##_##TYPE##_acq(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + __asm __volatile(MPLFENCE MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p) \ + : "memory"); \ +} \ + \ +static __inline void \ +atomic_##NAME##_##TYPE##_rel(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + __asm __volatile(MPSFENCE MPLOCKED OP \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ } \ struct __hack @@ -125,16 +148,16 @@ int res = exp; __asm __volatile ( - " " __XSTRING(MPLOCKED) " " - " cmpxchgl %1,%2 ; " + " " MPLOCKED " " + " cmpxchgl %2,%1 ; " " setz %%al ; " " movzbl %%al,%0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); + : "+a" (res), /* 0 (result) */ + "=m" (*dst) /* 1 */ + : "r" (src), /* 2 */ + "m" (*dst)); /* 3 */ return (res); } @@ -145,44 +168,36 @@ long res = exp; __asm __volatile ( - " " __XSTRING(MPLOCKED) " " - " cmpxchgq %1,%2 ; " + " " MPLOCKED " " + " cmpxchgq %2,%1 ; " " setz %%al ; " " movzbq %%al,%0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); + : "+a" (res), /* 0 (result) */ + "=m" (*dst) /* 1 */ + : "r" (src), /* 2 */ + "m" (*dst)); /* 3 */ return (res); } -#endif /* defined(__GNUC__) */ -#if defined(__GNUC__) - -#if defined(_KERNEL) && !defined(SMP) - -#define ATOMIC_STORE_LOAD(TYPE) \ -static __inline u_##TYPE \ -atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ +#define ATOMIC_CMPSET(TYPE) \ +static __inline int \ +atomic_cmpset_acq_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ { \ - u_##TYPE v; \ - \ - v = *p; \ - return (v); \ + __asm __volatile(MPLFENCE ::: "memory"); \ + return (atomic_cmpset_##TYPE(dst, exp, src); \ } \ \ -static __inline void \ -atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ +static __inline int \ +atomic_cmpset_rel_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ { \ - *p = v; \ + __asm __volatile(MPSFENCE); \ + return (atomic_cmpset_##TYPE(dst, exp, src); \ } \ struct __hack -#else /* defined(SMP) */ - #define ATOMIC_STORE_LOAD(TYPE) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ @@ -190,25 +205,29 @@ u_##TYPE v; \ \ v = *p; \ - __asm __volatile("lfence" ::: "memory"); \ + __asm __volatile(MPLFENCE ::: "memory"); \ return (v); \ } \ \ static __inline void \ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile("sfence" ::: "memory"); \ + __asm __volatile(MPSFENCE); \ *p = v; \ } \ struct __hack -#endif /* !define(SMP) */ - #else /* !defined(__GNUC__) */ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); extern int atomic_cmpset_long(volatile u_long *, u_long, u_long); +#define ATOMIC_CMPSET(TYPE) \ +extern int atomic_cmpset_acq_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp,\ + u_##TYPE src); \ +extern int atomic_cmpset_rel_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp,\ + u_##TYPE src) + #define ATOMIC_STORE_LOAD(TYPE) \ extern u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \ extern void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v) @@ -237,6 +256,9 @@ ATOMIC_ASM(add, long, "addq %1,%0", "ir", v); ATOMIC_ASM(subtract, long, "subq %1,%0", "ir", v); +ATOMIC_CMPSET(int); +ATOMIC_CMPSET(long); + ATOMIC_STORE_LOAD(char); ATOMIC_STORE_LOAD(short); ATOMIC_STORE_LOAD(int); @@ -245,47 +267,6 @@ #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD -#define atomic_set_acq_char atomic_set_char -#define atomic_set_rel_char atomic_set_char -#define atomic_clear_acq_char atomic_clear_char -#define atomic_clear_rel_char atomic_clear_char -#define atomic_add_acq_char atomic_add_char -#define atomic_add_rel_char atomic_add_char -#define atomic_subtract_acq_char atomic_subtract_char -#define atomic_subtract_rel_char atomic_subtract_char - -#define atomic_set_acq_short atomic_set_short -#define atomic_set_rel_short atomic_set_short -#define atomic_clear_acq_short atomic_clear_short -#define atomic_clear_rel_short atomic_clear_short -#define atomic_add_acq_short atomic_add_short -#define atomic_add_rel_short atomic_add_short -#define atomic_subtract_acq_short atomic_subtract_short -#define atomic_subtract_rel_short atomic_subtract_short - -#define atomic_set_acq_int atomic_set_int -#define atomic_set_rel_int atomic_set_int -#define atomic_clear_acq_int atomic_clear_int -#define atomic_clear_rel_int atomic_clear_int -#define atomic_add_acq_int atomic_add_int -#define atomic_add_rel_int atomic_add_int -#define atomic_subtract_acq_int atomic_subtract_int -#define atomic_subtract_rel_int atomic_subtract_int -#define atomic_cmpset_acq_int atomic_cmpset_int -#define atomic_cmpset_rel_int atomic_cmpset_int - -#define atomic_set_acq_long atomic_set_long -#define atomic_set_rel_long atomic_set_long -#define atomic_clear_acq_long atomic_clear_long -#define atomic_clear_rel_long atomic_clear_long -#define atomic_add_acq_long atomic_add_long -#define atomic_add_rel_long atomic_add_long -#define atomic_subtract_acq_long atomic_subtract_long -#define atomic_subtract_rel_long atomic_subtract_long - -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr - #define atomic_set_8 atomic_set_char #define atomic_set_acq_8 atomic_set_acq_char #define atomic_set_rel_8 atomic_set_rel_char @@ -344,6 +325,22 @@ (u_long)exp, (u_long)src)); } +static __inline int +atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_acq_long((volatile u_long *)dst, + (u_long)exp, (u_long)src)); +} + +static __inline int +atomic_cmpset_rel_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_rel_long((volatile u_long *)dst, + (u_long)exp, (u_long)src)); +} + static __inline void * atomic_load_acq_ptr(volatile void *p) { @@ -397,8 +394,9 @@ " xorl %0,%0 ; " " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result) /* 0 (result) */ - : "m" (*addr)); /* 1 (addr) */ + : "=&r" (result), /* 0 (result) */ + "=m" (*addr) /* 1 (addr) */ + : "m" (*addr)); /* 2 (addr) */ return (result); } @@ -412,8 +410,9 @@ " xorq %0,%0 ; " " xchgq %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result) /* 0 (result) */ - : "m" (*addr)); /* 1 (addr) */ + : "=&r" (result), /* 0 (result) */ + "=m" (*addr) /* 1 (addr) */ + : "m" (*addr)); /* 2 (addr) */ return (result); } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 20:12:39 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2C9216A4D0; Mon, 7 Mar 2005 20:12:38 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8677016A4CE for ; Mon, 7 Mar 2005 20:12:38 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BB6343D46 for ; Mon, 7 Mar 2005 20:12:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27KCcnd014284 for ; Mon, 7 Mar 2005 20:12:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27KCcmM014281 for perforce@freebsd.org; Mon, 7 Mar 2005 20:12:38 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 20:12:38 GMT Message-Id: <200503072012.j27KCcmM014281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72652 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 20:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=72652 Change 72652 by jhb@jhb_slimer on 2005/03/07 20:11:53 - Use + constraints for registers where possible. - sfence doesn't need to clobber memory. Affected files ... .. //depot/projects/smpng/sys/amd64/include/bus_amd64.h#6 edit Differences ... ==== //depot/projects/smpng/sys/amd64/include/bus_amd64.h#6 (text+ko) ==== @@ -290,8 +290,8 @@ 1: movb (%2),%%al \n\ stosb \n\ loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+D" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory"); #endif } @@ -319,8 +319,8 @@ 1: movw (%2),%%ax \n\ stosw \n\ loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+D" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory"); #endif } @@ -348,8 +348,8 @@ 1: movl (%2),%%eax \n\ stosl \n\ loop 1b" : - "=D" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+D" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory"); #endif } @@ -398,8 +398,7 @@ stosb \n\ incl %2 \n\ loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : + "+D" (addr), "+c" (count), "+d" (_port_) :: "%eax", "memory", "cc"); #endif } @@ -415,8 +414,7 @@ cld \n\ repne \n\ movsb" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : + "+D" (addr), "+c" (count), "+S" (_port_) :: "memory", "cc"); #endif } @@ -440,8 +438,7 @@ stosw \n\ addl $2,%2 \n\ loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : + "+D" (addr), "+c" (count), "+d" (_port_) :: "%eax", "memory", "cc"); #endif } @@ -457,8 +454,7 @@ cld \n\ repne \n\ movsw" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : + "+D" (addr), "+c" (count), "+S" (_port_) :: "memory", "cc"); #endif } @@ -482,8 +478,7 @@ stosl \n\ addl $4,%2 \n\ loop 1b" : - "=D" (addr), "=c" (count), "=d" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : + "+D" (addr), "+c" (count), "+d" (_port_) :: "%eax", "memory", "cc"); #endif } @@ -499,8 +494,7 @@ cld \n\ repne \n\ movsl" : - "=D" (addr), "=c" (count), "=S" (_port_) : - "0" (addr), "1" (count), "2" (_port_) : + "+D" (addr), "+c" (count), "+S" (_port_) :: "memory", "cc"); #endif } @@ -629,8 +623,8 @@ 1: lodsb \n\ movb %%al,(%2) \n\ loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+S" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory", "cc"); #endif } @@ -658,8 +652,8 @@ 1: lodsw \n\ movw %%ax,(%2) \n\ loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+S" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory", "cc"); #endif } @@ -687,8 +681,8 @@ 1: lodsl \n\ movl %%eax,(%2) \n\ loop 1b" : - "=S" (addr), "=c" (count) : - "r" (bsh + offset), "0" (addr), "1" (count) : + "+S" (addr), "+c" (count) : + "r" (bsh + offset) : "%eax", "memory", "cc"); #endif } @@ -738,8 +732,7 @@ outb %%al,%w0 \n\ incl %0 \n\ loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : + "+d" (_port_), "+S" (addr), "+c" (count) :: "%eax", "memory", "cc"); #endif } @@ -755,8 +748,7 @@ cld \n\ repne \n\ movsb" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : + "+D" (_port_), "+S" (addr), "+c" (count) :: "memory", "cc"); #endif } @@ -780,8 +772,7 @@ outw %%ax,%w0 \n\ addl $2,%0 \n\ loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : + "+d" (_port_), "+S" (addr), "+c" (count) :: "%eax", "memory", "cc"); #endif } @@ -797,8 +788,7 @@ cld \n\ repne \n\ movsw" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : + "+D" (_port_), "+S" (addr), "+c" (count) :: "memory", "cc"); #endif } @@ -822,8 +812,7 @@ outl %%eax,%w0 \n\ addl $4,%0 \n\ loop 1b" : - "=d" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : + "+d" (_port_), "+S" (addr), "+c" (count) :: "%eax", "memory", "cc"); #endif } @@ -839,8 +828,7 @@ cld \n\ repne \n\ movsl" : - "=D" (_port_), "=S" (addr), "=c" (count) : - "0" (_port_), "1" (addr), "2" (count) : + "+D" (_port_), "+S" (addr), "+c" (count) :: "memory", "cc"); #endif } @@ -1217,7 +1205,7 @@ if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lfence" : : : "memory"); else - __asm __volatile("sfence" : : : "memory"); + __asm __volatile("sfence"); #endif } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 20:15:43 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7D216A4D0; Mon, 7 Mar 2005 20:15:42 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B92716A4CE for ; Mon, 7 Mar 2005 20:15:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7880F43D4C for ; Mon, 7 Mar 2005 20:15:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27KFgT0014658 for ; Mon, 7 Mar 2005 20:15:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27KFgic014655 for perforce@freebsd.org; Mon, 7 Mar 2005 20:15:42 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 20:15:42 GMT Message-Id: <200503072015.j27KFgic014655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72653 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 20:15:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=72653 Change 72653 by jhb@jhb_slimer on 2005/03/07 20:15:04 fldcw() and ldmxcsr() use the memory operand as input, not output. Affected files ... .. //depot/projects/smpng/sys/amd64/include/ieeefp.h#5 edit Differences ... ==== //depot/projects/smpng/sys/amd64/include/ieeefp.h#5 (text+ko) ==== @@ -121,10 +121,10 @@ #define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr))) #define __fnstenv(addr) __asm __volatile("fnstenv %0" : "=m" (*(addr))) -#define __fldcw(addr) __asm __volatile("fldcw %0" : "=m" (*(addr))) +#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr))) #define __fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define __fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) -#define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : "=m" (*(addr))) +#define __ldmxcsr(addr) __asm __volatile("ldmxcsr %0" : : "m" (*(addr))) #define __stmxcsr(addr) __asm __volatile("stmxcsr %0" : "=m" (*(addr))) /* From owner-p4-projects@FreeBSD.ORG Mon Mar 7 20:23:53 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D90416A4D0; Mon, 7 Mar 2005 20:23:53 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD66016A4CE for ; Mon, 7 Mar 2005 20:23:52 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2DBD43D46 for ; Mon, 7 Mar 2005 20:23:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27KNqD8014942 for ; Mon, 7 Mar 2005 20:23:52 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27KNq1S014939 for perforce@freebsd.org; Mon, 7 Mar 2005 20:23:52 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 20:23:52 GMT Message-Id: <200503072023.j27KNq1S014939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 20:23:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=72654 Change 72654 by jhb@jhb_slimer on 2005/03/07 20:23:28 Clobber just the memory being modified, not all memory. Affected files ... .. //depot/projects/smpng/sys/arm/include/atomic.h#6 edit Differences ... ==== //depot/projects/smpng/sys/arm/include/atomic.h#6 (text+ko) ==== @@ -74,8 +74,8 @@ static __inline uint32_t __swp(uint32_t val, volatile uint32_t *ptr) { - __asm __volatile("swp %0, %1, [%2]" - : "=&r" (val) : "r" (val) , "r" (ptr) : "memory"); + __asm __volatile("swp %0, %2, [%3]" + : "=&r" (val), "=m" (*ptr) : "r" (val) , "r" (ptr), "m" (*ptr)); return (val); } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 20:25:56 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F30B716A4D0; Mon, 7 Mar 2005 20:25:55 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFF4816A4CE for ; Mon, 7 Mar 2005 20:25:55 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8F2A43D49 for ; Mon, 7 Mar 2005 20:25:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27KPtNj015060 for ; Mon, 7 Mar 2005 20:25:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27KPtKW015057 for perforce@freebsd.org; Mon, 7 Mar 2005 20:25:55 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 20:25:55 GMT Message-Id: <200503072025.j27KPtKW015057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 20:25:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=72655 Change 72655 by jhb@jhb_slimer on 2005/03/07 20:24:57 Use + constraint. Affected files ... .. //depot/projects/smpng/sys/arm/include/endian.h#9 edit Differences ... ==== //depot/projects/smpng/sys/arm/include/endian.h#9 (text+ko) ==== @@ -99,11 +99,10 @@ __bswap16_var(__uint32_t v) { __asm __volatile( - "mov %0, %1, ror #8\n" + "mov %0, %0, ror #8\n" "orr %0, %0, %0, lsr #16\n" "bic %0, %0, %0, lsl #16" - : "=r" (v) - : "0" (v)); + : "+r" (v)); return (v); } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 20:48:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1901316A4D0; Mon, 7 Mar 2005 20:48:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CF5A516A4CE for ; Mon, 7 Mar 2005 20:48:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 979F943D3F for ; Mon, 7 Mar 2005 20:48:23 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27KmN30023129 for ; Mon, 7 Mar 2005 20:48:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27KmNlE023126 for perforce@freebsd.org; Mon, 7 Mar 2005 20:48:23 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 20:48:23 GMT Message-Id: <200503072048.j27KmNlE023126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72657 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 20:48:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=72657 Change 72657 by jhb@jhb_slimer on 2005/03/07 20:47:43 Only clobber memory for acq variants. Note that variants with no membar at all map to acq on ia64, so only explicit rel variants lose the clobber with this change. Affected files ... .. //depot/projects/smpng/sys/ia64/include/atomic.h#4 edit Differences ... ==== //depot/projects/smpng/sys/ia64/include/atomic.h#4 (text+ko) ==== @@ -37,13 +37,13 @@ /* * Everything is built out of cmpxchg. */ -#define IA64_CMPXCHG(sz, sem, p, cmpval, newval, ret) \ +#define IA64_CMPXCHG(sz, sem, p, cmpval, newval, ret, clobber) \ __asm __volatile ( \ "mov ar.ccv=%2;;\n\t" \ "cmpxchg" #sz "." #sem " %0=%4,%3,ar.ccv\n\t" \ : "=r" (ret), "=m" (*p) \ : "r" (cmpval), "r" (newval), "m" (*p) \ - : "memory") + : clobber) /* * Some common forms of cmpxch. @@ -52,7 +52,7 @@ ia64_cmpxchg_acq_32(volatile uint32_t* p, uint32_t cmpval, uint32_t newval) { uint32_t ret; - IA64_CMPXCHG(4, acq, p, cmpval, newval, ret); + IA64_CMPXCHG(4, acq, p, cmpval, newval, ret, "memory"); return (ret); } @@ -60,7 +60,7 @@ ia64_cmpxchg_rel_32(volatile uint32_t* p, uint32_t cmpval, uint32_t newval) { uint32_t ret; - IA64_CMPXCHG(4, rel, p, cmpval, newval, ret); + IA64_CMPXCHG(4, rel, p, cmpval, newval, ret, ""); return (ret); } @@ -68,7 +68,7 @@ ia64_cmpxchg_acq_64(volatile uint64_t* p, uint64_t cmpval, uint64_t newval) { uint64_t ret; - IA64_CMPXCHG(8, acq, p, cmpval, newval, ret); + IA64_CMPXCHG(8, acq, p, cmpval, newval, ret, "memory"); return (ret); } @@ -76,7 +76,7 @@ ia64_cmpxchg_rel_64(volatile uint64_t* p, uint64_t cmpval, uint64_t newval) { uint64_t ret; - IA64_CMPXCHG(8, rel, p, cmpval, newval, ret); + IA64_CMPXCHG(8, rel, p, cmpval, newval, ret, ""); return (ret); } @@ -112,7 +112,7 @@ ia64_st_rel_##width(volatile uint##width##_t* p, uint##width##_t v) \ { \ __asm __volatile ("st" size ".rel %0=%1" : "=m" (*p) \ - : "r" (v) : "memory"); \ + : "r" (v)); \ } \ \ static __inline void \ @@ -120,7 +120,7 @@ uint##width##_t v) \ { \ __asm __volatile ("st" size ".rel %0=%1" : "=m" (*p) \ - : "r" (v) : "memory"); \ + : "r" (v)); \ } \ \ static __inline void \ @@ -128,7 +128,7 @@ uint##width##_t v) \ { \ __asm __volatile ("st" size ".rel %0=%1" : "=m" (*p) \ - : "r" (v) : "memory"); \ + : "r" (v)); \ } ATOMIC_STORE_LOAD(char, 8, "1") @@ -145,7 +145,7 @@ type old, ret; \ do { \ old = *p; \ - IA64_CMPXCHG(sz, acq, p, old, old op v, ret); \ + IA64_CMPXCHG(sz, acq, p, old, old op v, ret, "memory");\ } while (ret != old); \ return (old); \ } \ @@ -156,7 +156,7 @@ type old, ret; \ do { \ old = *p; \ - IA64_CMPXCHG(sz, rel, p, old, old op v, ret); \ + IA64_CMPXCHG(sz, rel, p, old, old op v, ret, "");\ } while (ret != old); \ return (old); \ } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 21:46:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F17D16A4D2; Mon, 7 Mar 2005 21:46:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1AA616A4CE for ; Mon, 7 Mar 2005 21:46:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2786943D31 for ; Mon, 7 Mar 2005 21:46:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27LkZin025446 for ; Mon, 7 Mar 2005 21:46:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27LkZ46025443 for perforce@freebsd.org; Mon, 7 Mar 2005 21:46:35 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 21:46:35 GMT Message-Id: <200503072146.j27LkZ46025443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 21:46:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=72662 Change 72662 by jhb@jhb_slimer on 2005/03/07 21:46:07 Move acq barriers back to being after the operation (alc@), and reduce duplication in amd64 versions by moving the membars out of the atomic op __asm(). Affected files ... .. //depot/projects/smpng/sys/alpha/include/atomic.h#11 edit .. //depot/projects/smpng/sys/amd64/include/atomic.h#8 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/atomic.h#11 (text+ko) ==== @@ -228,9 +228,9 @@ static __inline void \ atomic_##NAME##_acq_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ + atomic_##NAME##_##WIDTH(p, v); \ alpha_mb(); \ __asm __volatile("" ::: "memory"); \ - atomic_##NAME##_##WIDTH(p, v); \ } \ \ static __inline void \ @@ -243,9 +243,9 @@ static __inline void \ atomic_##NAME##_acq_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\ { \ + atomic_##NAME##_##WIDTH(p, v); \ alpha_mb(); \ __asm __volatile("" ::: "memory"); \ - atomic_##NAME##_##WIDTH(p, v); \ } \ \ static __inline void \ @@ -283,9 +283,9 @@ { \ u_##TYPE v; \ \ + v = *p; \ alpha_mb(); \ __asm __volatile("" ::: "memory"); \ - v = *p; \ return (v); \ } \ \ @@ -301,9 +301,9 @@ { \ u_##TYPE v; \ \ + v = *p; \ alpha_mb(); \ __asm __volatile("" ::: "memory"); \ - v = *p; \ return (v); \ } \ \ @@ -389,9 +389,9 @@ { int retval; + retval = atomic_cmpset_32(p, cmpval, newval); alpha_mb(); __asm __volatile("" ::: "memory"); - retval = atomic_cmpset_32(p, cmpval, newval); return (retval); } @@ -407,9 +407,9 @@ { int retval; + retval = atomic_cmpset_64(p, cmpval, newval); alpha_mb(); __asm __volatile("" ::: "memory"); - retval = atomic_cmpset_64(p, cmpval, newval); return (retval); } ==== //depot/projects/smpng/sys/amd64/include/atomic.h#8 (text+ko) ==== @@ -110,18 +110,15 @@ static __inline void \ atomic_##NAME##_##TYPE##_acq(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(MPLFENCE MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p) \ - : "memory"); \ + atomic_##NAME_##TYPE(p, v); \ + __asm __volatile(MPLFENCE ::: "memory"); \ } \ \ static __inline void \ atomic_##NAME##_##TYPE##_rel(volatile u_##TYPE *p, u_##TYPE v)\ { \ - __asm __volatile(MPSFENCE MPLOCKED OP \ - : "=m" (*p) \ - : CONS (V), "m" (*p)); \ + __asm __volatile(MPSFENCE); \ + atomic_##NAME_##TYPE(p, v); \ } \ struct __hack @@ -186,8 +183,11 @@ static __inline int \ atomic_cmpset_acq_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\ { \ + int retval; \ + \ + retval = atomic_cmpset_##TYPE(dst, exp, src); \ __asm __volatile(MPLFENCE ::: "memory"); \ - return (atomic_cmpset_##TYPE(dst, exp, src); \ + return (retval); \ } \ \ static __inline int \ From owner-p4-projects@FreeBSD.ORG Mon Mar 7 21:51:43 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28CC016A4D0; Mon, 7 Mar 2005 21:51:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E07C316A4CE for ; Mon, 7 Mar 2005 21:51:42 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7B2143D3F for ; Mon, 7 Mar 2005 21:51:42 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27LpgZ8025634 for ; Mon, 7 Mar 2005 21:51:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27LpgtK025631 for perforce@freebsd.org; Mon, 7 Mar 2005 21:51:42 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 21:51:42 GMT Message-Id: <200503072151.j27LpgtK025631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 21:51:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=72663 Change 72663 by jhb@jhb_slimer on 2005/03/07 21:51:28 Write barriers don't need a gcc barrier. Affected files ... .. //depot/projects/smpng/sys/i386/include/bus_at386.h#12 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/bus_at386.h#12 (text+ko) ==== @@ -1285,7 +1285,7 @@ if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%esp)" : : : "memory"); else - __asm __volatile("" : : : "memory"); + /* nothing */; #else # ifndef lint # error "no assembler code for your compiler" From owner-p4-projects@FreeBSD.ORG Mon Mar 7 22:09:04 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73EDE16A4D0; Mon, 7 Mar 2005 22:09:04 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4732216A4CE for ; Mon, 7 Mar 2005 22:09:04 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2080143D2F for ; Mon, 7 Mar 2005 22:09:04 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27M94ui026260 for ; Mon, 7 Mar 2005 22:09:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27M93kD026257 for perforce@freebsd.org; Mon, 7 Mar 2005 22:09:03 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 22:09:03 GMT Message-Id: <200503072209.j27M93kD026257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 22:09:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=72664 Change 72664 by jhb@jhb_slimer on 2005/03/07 22:08:18 - Stop using +m constraint. - Remove "memory" clobber from atomic_cmpset() and instead add the clobber to all of the various acq variants. Affected files ... .. //depot/projects/smpng/sys/i386/include/atomic.h#22 edit Differences ... ==== //depot/projects/smpng/sys/i386/include/atomic.h#22 (text+ko) ==== @@ -96,15 +96,17 @@ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(__XSTRING(MPLOCKED) OP \ - : "+m" (*p) \ - : CONS (V)); \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ } \ +ATOMIC_ACQ(NAME, TYPE); \ struct __hack #else /* !(__GNUC__ || __INTEL_COMPILER) */ #define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \ -extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v) +extern void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \ +ATOMIC_ACQ(NAME, TYPE) #endif /* __GNUC__ || __INTEL_COMPILER */ @@ -130,16 +132,16 @@ " cli ; " " cmpl %0,%2 ; " " jne 1f ; " - " movl %1,%2 ; " + " movl %2,%1 ; " "1: " " sete %%al; " " movzbl %%al,%0 ; " " popfl ; " "# atomic_cmpset_int" : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); + "=m" (*dst) /* 1 */ + : "r" (src), /* 2 */ + "m" (*dst)); /* 3 */ return (res); } @@ -153,25 +155,21 @@ __asm __volatile ( " " __XSTRING(MPLOCKED) " " - " cmpxchgl %1,%2 ; " + " cmpxchgl %2,%1 ; " " setz %%al ; " " movzbl %%al,%0 ; " "1: " "# atomic_cmpset_int" : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); + "=m" (*dst) /* 1 */ + : "r" (src), /* 2 */ + "m" (*dst)); /* 3 */ return (res); } #endif /* defined(CPU_DISABLE_CMPXCHG) */ -#endif /* defined(__GNUC__) || defined(__INTEL_COMPILER) */ - -#if defined(__GNUC__) || defined(__INTEL_COMPILER) - #if defined(_KERNEL) && !defined(SMP) /* @@ -205,8 +203,9 @@ \ __asm __volatile(__XSTRING(MPLOCKED) LOP \ : "=a" (res), /* 0 (result) */\ - "+m" (*p) /* 1 */ \ - : : "memory"); \ + "=m" (*p) /* 1 */ \ + : "m" (*p) /* 2 */ \ + : "memory"); \ \ return (res); \ } \ @@ -218,9 +217,9 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(SOP \ - : "+m" (*p), /* 0 */ \ + : "=m" (*p), /* 0 */ \ "+r" (v) /* 1 */ \ - : : "memory"); \ + : "m" (*p)); /* 2 */ \ } \ struct __hack @@ -238,6 +237,15 @@ #endif /* KLD_MODULE */ +#define ATOMIC_ACQ(NAME, TYPE) \ +static __inline void \ +atomic_##NAME##_##TYPE##_acq(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + atomic_##NAME##_##TYPE(p, v); \ + __asm __volatile("" ::: "memory"); \ +} \ +struct __hack + ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ATOMIC_ASM(clear, char, "andb %b1,%0", "iq", ~v); ATOMIC_ASM(add, char, "addb %b1,%0", "iq", v); @@ -266,48 +274,30 @@ #undef ATOMIC_ASM #undef ATOMIC_STORE_LOAD -#define atomic_set_acq_char atomic_set_char #define atomic_set_rel_char atomic_set_char -#define atomic_clear_acq_char atomic_clear_char #define atomic_clear_rel_char atomic_clear_char -#define atomic_add_acq_char atomic_add_char #define atomic_add_rel_char atomic_add_char -#define atomic_subtract_acq_char atomic_subtract_char #define atomic_subtract_rel_char atomic_subtract_char -#define atomic_set_acq_short atomic_set_short #define atomic_set_rel_short atomic_set_short -#define atomic_clear_acq_short atomic_clear_short #define atomic_clear_rel_short atomic_clear_short -#define atomic_add_acq_short atomic_add_short #define atomic_add_rel_short atomic_add_short -#define atomic_subtract_acq_short atomic_subtract_short #define atomic_subtract_rel_short atomic_subtract_short -#define atomic_set_acq_int atomic_set_int #define atomic_set_rel_int atomic_set_int -#define atomic_clear_acq_int atomic_clear_int #define atomic_clear_rel_int atomic_clear_int -#define atomic_add_acq_int atomic_add_int #define atomic_add_rel_int atomic_add_int -#define atomic_subtract_acq_int atomic_subtract_int #define atomic_subtract_rel_int atomic_subtract_int -#define atomic_cmpset_acq_int atomic_cmpset_int #define atomic_cmpset_rel_int atomic_cmpset_int -#define atomic_set_acq_long atomic_set_long #define atomic_set_rel_long atomic_set_long -#define atomic_clear_acq_long atomic_clear_long #define atomic_clear_rel_long atomic_clear_long -#define atomic_add_acq_long atomic_add_long #define atomic_add_rel_long atomic_add_long -#define atomic_subtract_acq_long atomic_subtract_long #define atomic_subtract_rel_long atomic_subtract_long #define atomic_cmpset_long atomic_cmpset_int #define atomic_cmpset_acq_long atomic_cmpset_acq_int #define atomic_cmpset_rel_long atomic_cmpset_rel_int -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr #define atomic_cmpset_rel_ptr atomic_cmpset_ptr #define atomic_set_8 atomic_set_char @@ -361,6 +351,16 @@ #if !defined(WANT_FUNCTIONS) static __inline int +atomic_cmpset_acq_int(volatile u_int *dst, u_int exp, u_int src) +{ + int retval; + + retval = atomic_cmpset_int(dst, exp, src); + __asm __volatile("" ::: "memory"); + return (retval); +} + +static __inline int atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) { @@ -368,6 +368,14 @@ (u_int)src)); } +static __inline int +atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src) +{ + + return (atomic_cmpset_acq_int((volatile u_int *)dst, (u_int)exp, + (u_int)src)); +} + static __inline void * atomic_load_acq_ptr(volatile void *p) { @@ -421,8 +429,9 @@ " xorl %0,%0 ; " " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result) /* 0 (result) */ - : "m" (*addr)); /* 1 (addr) */ + : "=&r" (result), /* 0 (result) */ + "=m" (*addr) /* 1 (addr) */ + : "m" (*addr)); /* 2 (addr) */ return (result); } @@ -436,8 +445,9 @@ " xorl %0,%0 ; " " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result) /* 0 (result) */ - : "m" (*addr)); /* 1 (addr) */ + : "=&r" (result), /* 0 (result) */ + "=m" (*addr) /* 1 (addr) */ + : "m" (*addr)); /* 2 (addr) */ return (result); } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 22:20:19 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41B3D16A4D0; Mon, 7 Mar 2005 22:20:19 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0535416A4CE for ; Mon, 7 Mar 2005 22:20:19 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC2D443D1D for ; Mon, 7 Mar 2005 22:20:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27MKItH026793 for ; Mon, 7 Mar 2005 22:20:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27MKI9E026790 for perforce@freebsd.org; Mon, 7 Mar 2005 22:20:18 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 22:20:18 GMT Message-Id: <200503072220.j27MKI9E026790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 22:20:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=72666 Change 72666 by jhb@jhb_slimer on 2005/03/07 22:19:49 - Don't use +m. - Lose unneeded "memory" clobbers. - Add explicit "memory" clobbers to acq variants. (XXX: this won't take affect until the clobber is removed from powerpc_mb()). Affected files ... .. //depot/projects/smpng/sys/powerpc/include/atomic.h#6 edit Differences ... ==== //depot/projects/smpng/sys/powerpc/include/atomic.h#6 (text+ko) ==== @@ -59,9 +59,9 @@ "or %0, %3, %0\n\t" /* calculate new value */ "stwcx. %0, 0, %2\n\t" /* attempt to store */ "bne- 1b\n\t" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (p), "r" (v) - : "cc", "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (p), "r" (v), "m" (*p) + : "cc"); #endif } @@ -76,9 +76,9 @@ "andc %0, %0, %3\n\t" /* calculate new value */ "stwcx. %0, 0, %2\n\t" /* attempt to store */ "bne- 1b\n\t" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (p), "r" (v) - : "cc", "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (p), "r" (v), "m" (*p) + : "cc"); #endif } @@ -93,9 +93,9 @@ "add %0, %3, %0\n\t" /* calculate new value */ "stwcx. %0, 0, %2\n\t" /* attempt to store */ "bne- 1b\n\t" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (p), "r" (v) - : "cc", "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (p), "r" (v), "m" (*p) + : "cc"); #endif } @@ -110,9 +110,9 @@ "subf %0, %3, %0\n\t" /* calculate new value */ "stwcx. %0, 0, %2\n\t" /* attempt to store */ "bne- 1b\n\t" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (p), "r" (v) - : "cc", "memory"); + : "=&r" (temp), "=m" (*p) + : "r" (p), "r" (v), "m" (*p) + : "cc"); #endif } @@ -128,9 +128,9 @@ "li %1, 0\n\t" /* load new value */ "stwcx. %1, 0, %3\n\t" /* attempt to store */ "bne- 1b\n\t" /* spin if failed */ - : "=&r"(result), "=&r"(temp), "+m" (*addr) - : "r" (addr) - : "cc", "memory"); + : "=&r"(result), "=&r"(temp), "=m" (*addr) + : "r" (addr), "m" (*p) + : "cc"); #endif return (result); @@ -244,6 +244,7 @@ { \ atomic_##NAME##_##WIDTH(p, v); \ powerpc_mb(); \ + __asm __volatile("" ::: "memory"); \ } \ \ static __inline void \ @@ -258,6 +259,7 @@ { \ atomic_##NAME##_##WIDTH(p, v); \ powerpc_mb(); \ + __asm __volatile("" ::: "memory"); \ } \ \ static __inline void \ @@ -302,6 +304,7 @@ \ v = *p; \ powerpc_mb(); \ + __asm __volatile("" ::: "memory"); \ return (v); \ } \ \ @@ -361,9 +364,9 @@ "stwcx. %0, 0, %2\n\t" /* clear reservation (74xx) */ "li %0, 0\n\t" /* failure - retval = 0 */ "3:\n\t" - : "=&r" (ret), "+m" (*p) - : "r" (p), "r" (cmpval), "r" (newval) - : "cc", "memory"); + : "=&r" (ret), "=m" (*p) + : "r" (p), "r" (cmpval), "r" (newval), "m" (*p) + : "cc"); #endif return (ret); @@ -413,6 +416,7 @@ retval = atomic_cmpset_32(p, cmpval, newval); powerpc_mb(); + __asm __volatile("" ::: "memory"); return (retval); } From owner-p4-projects@FreeBSD.ORG Mon Mar 7 22:21:21 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01FA616A4D6; Mon, 7 Mar 2005 22:21:21 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7DE116A4D0 for ; Mon, 7 Mar 2005 22:21:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F56443D67 for ; Mon, 7 Mar 2005 22:21:20 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27MLK3r026886 for ; Mon, 7 Mar 2005 22:21:20 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27MLKWu026883 for perforce@freebsd.org; Mon, 7 Mar 2005 22:21:20 GMT (envelope-from jhb@freebsd.org) Date: Mon, 7 Mar 2005 22:21:20 GMT Message-Id: <200503072221.j27MLKWu026883@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 72667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Mar 2005 22:21:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=72667 Change 72667 by jhb@jhb_slimer on 2005/03/07 22:21:08 Update. Affected files ... .. //depot/projects/smpng/sys/notes#30 edit Differences ... ==== //depot/projects/smpng/sys/notes#30 (text+ko) ==== @@ -19,6 +19,33 @@ more realistic since they call functions. However, these clobber updates need to be verified against the actual pc98 code. - Untested + - Oops, '+' is invalid for memory operands it turns out, so revisit the + whole tree to really fix this. Also, fixup atomic ops so that they + treat the memory pointed to as an output and don't all clobber "memory", + instead, just acquire variants clobber "memory". + + alpha + + amd64 + - why clobber memory in disable_intr()? + - eventually we should not clobber all memory for bus_space, but just + the memory we actually touch + + arm + - needs real acq variants to get "memory" clobber + + boot + + contrib + + dev + - drm clobbers memory for write barriers + - drm and sym should use bus_space for barriers + - gnu + - contrib code + + ia64 + + i386 + - why clobber memory in disable_intr()? + + pc98 + + pci + + powerpc + - not sure powerpc_mb() should clobber memory + + sparc64 + - sys - Fixup td_ucred of thread doing execve() to re-sync with process ucred after single threading during an exec. - Untested From owner-p4-projects@FreeBSD.ORG Tue Mar 8 06:16:00 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 803A016A4D0; Tue, 8 Mar 2005 06:16:00 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5820416A4CE for ; Tue, 8 Mar 2005 06:16:00 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8273043D58 for ; Tue, 8 Mar 2005 06:15:59 +0000 (GMT) (envelope-from jmg@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j286FxRt058903 for ; Tue, 8 Mar 2005 06:15:59 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j286FxfL058900 for perforce@freebsd.org; Tue, 8 Mar 2005 06:15:59 GMT (envelope-from jmg@freebsd.org) Date: Tue, 8 Mar 2005 06:15:59 GMT Message-Id: <200503080615.j286FxfL058900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney To: Perforce Change Reviews Subject: PERFORCE change 72684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2005 06:16:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=72684 Change 72684 by jmg@jmg_carbon on 2005/03/08 06:14:57 pull in the latest changes, and pull in config since I need to fix the fact that we can only have one hint file... Affected files ... .. //depot/projects/arm/src/sys/Makefile#3 integrate .. //depot/projects/arm/src/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#2 integrate .. //depot/projects/arm/src/sys/alpha/linux/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/arm/src/sys/arm/arm/support.S#2 integrate .. //depot/projects/arm/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/arm/src/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/arm/src/sys/boot/efi/include/ia64/efibind.h#3 integrate .. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/arm/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/arm/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/arm/src/sys/conf/NOTES#4 integrate .. //depot/projects/arm/src/sys/conf/options#3 integrate .. //depot/projects/arm/src/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/arm/src/sys/dev/amd/amd.c#2 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/arm/src/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/arm/src/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/arm/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/led/led.c#2 integrate .. //depot/projects/arm/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/arm/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/arm/src/sys/dev/twa/twa_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/arm/src/sys/geom/geom_dev.c#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/busdma_machdep.c#2 integrate .. //depot/projects/arm/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_unit.c#2 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/arm/src/sys/kern/tty.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/arm/src/sys/net/if_ef.c#2 integrate .. //depot/projects/arm/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/arm/src/sys/pc98/i386/machdep.c#4 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/arm/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/arm/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/arm/src/sys/sys/systm.h#3 integrate .. //depot/projects/arm/src/usr.sbin/config/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/0.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/1.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/2.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/3.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/4.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/5.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/6.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/a.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/b.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/c.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/d.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/e.t#1 branch .. //depot/projects/arm/src/usr.sbin/config/SMM.doc/spell.ok#1 branch .. //depot/projects/arm/src/usr.sbin/config/config.8#1 branch .. //depot/projects/arm/src/usr.sbin/config/config.h#1 branch .. //depot/projects/arm/src/usr.sbin/config/config.y#1 branch .. //depot/projects/arm/src/usr.sbin/config/configvers.h#1 branch .. //depot/projects/arm/src/usr.sbin/config/lang.l#1 branch .. //depot/projects/arm/src/usr.sbin/config/main.c#1 branch .. //depot/projects/arm/src/usr.sbin/config/mkheaders.c#1 branch .. //depot/projects/arm/src/usr.sbin/config/mkmakefile.c#1 branch .. //depot/projects/arm/src/usr.sbin/config/mkoptions.c#1 branch Differences ... ==== //depot/projects/arm/src/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.32 2005/03/05 00:56:15 grog Exp $ +# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $ # The boot loader .if !defined(NO_BOOT) @@ -13,7 +13,7 @@ netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ pccard pci posix4 sys ufs vm ${ARCHDIR} -ARCHDIR ?= i386 +ARCHDIR ?= ${MACHINE} # Loadable kernel modules ==== //depot/projects/arm/src/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.48 2005/01/15 20:11:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.49 2005/03/07 02:18:08 scottl Exp $"); #include #include @@ -85,7 +85,6 @@ static int reserved_bpages; static int active_bpages; static int total_bpages; -static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR; struct bus_dmamap { struct bp_list bpages; @@ -250,14 +249,6 @@ if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) { /* Must bounce */ - if (lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dma_tag_create: page reallocation " - "not implemented"); - } if (ptoa(total_bpages) < maxsize) { int pages; @@ -367,14 +358,6 @@ && total_bpages < maxpages)) { int pages; - if (dmat->lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dmamap_create: page reallocation " - "not implemented"); - } pages = atop(dmat->maxsize) + 1; pages = MIN(maxpages - total_bpages, pages); ==== //depot/projects/arm/src/sys/alpha/linux/linux_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.19 2004/08/24 20:24:33 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.20 2005/03/07 00:23:58 sobomax Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -32,6 +32,7 @@ #define PADR_(t) 0 #endif +#define nosys linux_nosys struct linux_fork_args { register_t dummy; }; @@ -581,6 +582,7 @@ char dirent_l_[PADL_(void *)]; void * dirent; char dirent_r_[PADR_(void *)]; char count_l_[PADL_(l_uint)]; l_uint count; char count_r_[PADR_(l_uint)]; }; +#define nosys linux_nosys int linux_fork(struct thread *, struct linux_fork_args *); int osf1_wait4(struct thread *, struct osf1_wait4_args *); int linux_link(struct thread *, struct linux_link_args *); @@ -716,12 +718,14 @@ #ifdef COMPAT_43 +#define nosys linux_nosys #endif /* COMPAT_43 */ #ifdef COMPAT_FREEBSD4 +#define nosys linux_nosys #endif /* COMPAT_FREEBSD4 */ ==== //depot/projects/arm/src/sys/alpha/linux/linux_syscall.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.17 2004/08/24 20:24:33 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.18 2005/03/07 00:23:58 sobomax Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/arm/src/sys/alpha/linux/linux_sysent.c#2 (text+ko) ==== @@ -2,14 +2,15 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.17 2004/08/24 20:24:33 jhb Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.18 2005/03/07 00:23:58 sobomax Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp */ #include "opt_compat.h" #include #include #include +#include #include #include @@ -17,6 +18,7 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { +#define nosys linux_nosys { 0, (sy_call_t *)nosys }, /* 0 = */ { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit }, /* 1 = exit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fork }, /* 2 = linux_fork */ ==== //depot/projects/arm/src/sys/alpha/linux/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.60 2005/03/07 00:18:06 sobomax Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -31,9 +31,13 @@ #include #include #include +#include #include #include +; Isn't pretty, but there seems to be no other way to trap nosys +#define nosys linux_nosys + ; #ifdef's, etc. may be included, and are copied to the output files. 0 UNIMPL ==== //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.66 2005/01/07 07:57:18 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.67 2005/03/07 02:16:03 scottl Exp $"); #include #include @@ -105,7 +105,6 @@ static int total_bpages; static int busdma_zonecount; static STAILQ_HEAD(, bounce_zone) bounce_zone_list; -static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR; SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters"); SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0, @@ -290,14 +289,6 @@ return (error); bz = newtag->bounce_zone; - if (lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dma_tag_create: page reallocation " - "not implemented"); - } if (ptoa(bz->total_bpages) < maxsize) { int pages; @@ -419,14 +410,6 @@ || (dmat->map_count > 0 && total_bpages < maxpages)) { int pages; - if (dmat->lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dmamap_create: page reallocation " - "not implemented"); - } pages = MAX(atop(dmat->maxsize), 1); pages = MIN(maxpages - total_bpages, pages); if (alloc_bounce_pages(dmat, pages) < pages) ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#2 (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.2 2004/08/16 08:07:06 tjr Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.3 2005/03/07 00:23:58 sobomax Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.2 2005/03/07 00:18:06 sobomax Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -32,6 +32,7 @@ #define PADR_(t) 0 #endif +#define nosys linux_nosys struct linux_fork_args { register_t dummy; }; @@ -685,6 +686,7 @@ struct linux_fadvise64_args { register_t dummy; }; +#define nosys linux_nosys int linux_fork(struct thread *, struct linux_fork_args *); int linux_open(struct thread *, struct linux_open_args *); int linux_waitpid(struct thread *, struct linux_waitpid_args *); @@ -853,12 +855,14 @@ #ifdef COMPAT_43 +#define nosys linux_nosys #endif /* COMPAT_43 */ #ifdef COMPAT_FREEBSD4 +#define nosys linux_nosys #endif /* COMPAT_FREEBSD4 */ ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#2 (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.2 2004/08/16 08:07:06 tjr Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.3 2005/03/07 00:23:58 sobomax Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.2 2005/03/07 00:18:06 sobomax Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,14 +2,15 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.2 2004/08/16 08:07:06 tjr Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.3 2005/03/07 00:23:58 sobomax Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.2 2005/03/07 00:18:06 sobomax Exp */ #include "opt_compat.h" #include #include #include +#include #include #include @@ -17,6 +18,7 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { +#define nosys linux_nosys { 0, (sy_call_t *)nosys }, /* 0 = setup */ { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit }, /* 1 = exit */ { SYF_MPSAFE | 0, (sy_call_t *)linux_fork }, /* 2 = linux_fork */ ==== //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#2 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.1 2004/08/16 07:55:06 tjr Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.2 2005/03/07 00:18:06 sobomax Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -25,9 +25,13 @@ #include #include #include +#include #include #include +; Isn't pretty, but there seems to be no other way to trap nosys +#define nosys linux_nosys + ; #ifdef's, etc. may be included, and are copied to the output files. 0 UNIMPL setup ==== //depot/projects/arm/src/sys/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.15 2005/03/02 21:33:22 joerg Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.16 2005/03/07 00:24:52 mux Exp $"); /* * MacPPC bus dma support routines @@ -337,7 +337,7 @@ newmap = malloc(sizeof(*newmap), M_DEVBUF, M_NOWAIT | M_ZERO); if (newmap == NULL) { CTR3(KTR_BUSDMA, "bus_dmamem_alloc: tag %p tag " - "flags %0x%x error Md", dmat, dmat->flags, ENOMEM); + "flags 0x%x error %d", dmat, dmat->flags, ENOMEM); return (ENOMEM); } dmat->map_count++; ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#5 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.24 2005/02/26 18:59:01 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.25 2005/03/06 21:10:31 cognet Exp $"); #include #include #include @@ -2392,6 +2392,7 @@ virtual_avail = firstaddr; kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_l1 = l1; + /* * Scan the L1 translation table created by initarm() and create * the required metadata for all valid mappings found in it. @@ -2806,9 +2807,7 @@ PDEBUG(1, printf("pmap_kenter: pte = %08x, opte = %08x, npte = %08x\n", (uint32_t) pte, opte, *pte)); if (l2pte_valid(opte)) { -#if 0 cpu_dcache_wbinv_range(va, PAGE_SIZE); -#endif cpu_tlb_flushD_SE(va); cpu_cpwait(); } else { @@ -2833,7 +2832,14 @@ void pmap_kenter_user(vm_offset_t va, vm_paddr_t pa) { + pmap_kenter_internal(va, pa, KENTER_CACHE|KENTER_USER); + /* + * Call pmap_fault_fixup now, to make sure we'll have no exception + * at the first use of the new address, or bad things will happen, + * as we use one of these addresses in the exception handlers. + */ + pmap_fault_fixup(pmap_kernel(), va, VM_PROT_READ|VM_PROT_WRITE, 1); } /* ==== //depot/projects/arm/src/sys/arm/arm/support.S#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.7 2004/11/09 16:47:47 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/support.S,v 1.8 2005/03/06 13:11:32 cognet Exp $"); #include "assym.s" @@ -302,9 +302,548 @@ RET ENTRY(bcopy) - mov r3, r0 - mov r0, r1 - mov r1, r3 + /* switch the source and destination registers */ + eor r0, r1, r0 + eor r1, r0, r1 + eor r0, r1, r0 +ENTRY(memmove) + /* Do the buffers overlap? */ + cmp r0, r1 + RETeq /* Bail now if src/dst are the same */ + subcc r3, r0, r1 /* if (dst > src) r3 = dst - src */ + subcs r3, r1, r0 /* if (src > dsr) r3 = src - dst */ + cmp r3, r2 /* if (r3 < len) we have an overlap */ + bcc PIC_SYM(_C_LABEL(memcpy), PLT) + + /* Determine copy direction */ + cmp r1, r0 + bcc .Lmemmove_backwards + + moveq r0, #0 /* Quick abort for len=0 */ + RETeq + + stmdb sp!, {r0, lr} /* memmove() returns dest addr */ + subs r2, r2, #4 + blt .Lmemmove_fl4 /* less than 4 bytes */ + ands r12, r0, #3 + bne .Lmemmove_fdestul /* oh unaligned destination addr */ + ands r12, r1, #3 + bne .Lmemmove_fsrcul /* oh unaligned source addr */ + +.Lmemmove_ft8: + /* We have aligned source and destination */ + subs r2, r2, #8 + blt .Lmemmove_fl12 /* less than 12 bytes (4 from above) */ + subs r2, r2, #0x14 + blt .Lmemmove_fl32 /* less than 32 bytes (12 from above) */ + stmdb sp!, {r4} /* borrow r4 */ + + /* blat 32 bytes at a time */ + /* XXX for really big copies perhaps we should use more registers */ +.Lmemmove_floop32: + ldmia r1!, {r3, r4, r12, lr} + stmia r0!, {r3, r4, r12, lr} + ldmia r1!, {r3, r4, r12, lr} + stmia r0!, {r3, r4, r12, lr} + subs r2, r2, #0x20 + bge .Lmemmove_floop32 + + cmn r2, #0x10 + ldmgeia r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ + stmgeia r0!, {r3, r4, r12, lr} + subge r2, r2, #0x10 + ldmia sp!, {r4} /* return r4 */ + +.Lmemmove_fl32: + adds r2, r2, #0x14 + + /* blat 12 bytes at a time */ +.Lmemmove_floop12: + ldmgeia r1!, {r3, r12, lr} + stmgeia r0!, {r3, r12, lr} + subges r2, r2, #0x0c + bge .Lmemmove_floop12 + +.Lmemmove_fl12: + adds r2, r2, #8 + blt .Lmemmove_fl4 + + subs r2, r2, #4 + ldrlt r3, [r1], #4 + strlt r3, [r0], #4 + ldmgeia r1!, {r3, r12} + stmgeia r0!, {r3, r12} + subge r2, r2, #4 + +.Lmemmove_fl4: + /* less than 4 bytes to go */ + adds r2, r2, #4 + ldmeqia sp!, {r0, pc} /* done */ + + /* copy the crud byte at a time */ + cmp r2, #2 + ldrb r3, [r1], #1 + strb r3, [r0], #1 + ldrgeb r3, [r1], #1 + strgeb r3, [r0], #1 + ldrgtb r3, [r1], #1 + strgtb r3, [r0], #1 + ldmia sp!, {r0, pc} + + /* erg - unaligned destination */ +.Lmemmove_fdestul: + rsb r12, r12, #4 + cmp r12, #2 + + /* align destination with byte copies */ + ldrb r3, [r1], #1 + strb r3, [r0], #1 + ldrgeb r3, [r1], #1 + strgeb r3, [r0], #1 + ldrgtb r3, [r1], #1 + strgtb r3, [r0], #1 + subs r2, r2, r12 + blt .Lmemmove_fl4 /* less the 4 bytes */ + + ands r12, r1, #3 + beq .Lmemmove_ft8 /* we have an aligned source */ + + /* erg - unaligned source */ + /* This is where it gets nasty ... */ +.Lmemmove_fsrcul: + bic r1, r1, #3 + ldr lr, [r1], #4 + cmp r12, #2 + bgt .Lmemmove_fsrcul3 + beq .Lmemmove_fsrcul2 + cmp r2, #0x0c + blt .Lmemmove_fsrcul1loop4 + sub r2, r2, #0x0c + stmdb sp!, {r4, r5} + +.Lmemmove_fsrcul1loop16: +#ifdef __ARMEB__ + mov r3, lr, lsl #8 +#else + mov r3, lr, lsr #8 +#endif + ldmia r1!, {r4, r5, r12, lr} +#ifdef __ARMEB__ + orr r3, r3, r4, lsr #24 + mov r4, r4, lsl #8 + orr r4, r4, r5, lsr #24 + mov r5, r5, lsl #8 + orr r5, r5, r12, lsr #24 + mov r12, r12, lsl #8 + orr r12, r12, lr, lsr #24 +#else + orr r3, r3, r4, lsl #24 + mov r4, r4, lsr #8 + orr r4, r4, r5, lsl #24 + mov r5, r5, lsr #8 + orr r5, r5, r12, lsl #24 + mov r12, r12, lsr #8 + orr r12, r12, lr, lsl #24 +#endif + stmia r0!, {r3-r5, r12} + subs r2, r2, #0x10 + bge .Lmemmove_fsrcul1loop16 + ldmia sp!, {r4, r5} + adds r2, r2, #0x0c + blt .Lmemmove_fsrcul1l4 + +.Lmemmove_fsrcul1loop4: +#ifdef __ARMEB__ + mov r12, lr, lsl #8 +#else + mov r12, lr, lsr #8 +#endif + ldr lr, [r1], #4 +#ifdef __ARMEB__ + orr r12, r12, lr, lsr #24 +#else + orr r12, r12, lr, lsl #24 +#endif + str r12, [r0], #4 + subs r2, r2, #4 + bge .Lmemmove_fsrcul1loop4 + +.Lmemmove_fsrcul1l4: + sub r1, r1, #3 + b .Lmemmove_fl4 + +.Lmemmove_fsrcul2: + cmp r2, #0x0c + blt .Lmemmove_fsrcul2loop4 + sub r2, r2, #0x0c + stmdb sp!, {r4, r5} + +.Lmemmove_fsrcul2loop16: +#ifdef __ARMEB__ + mov r3, lr, lsl #16 +#else + mov r3, lr, lsr #16 +#endif + ldmia r1!, {r4, r5, r12, lr} +#ifdef __ARMEB__ + orr r3, r3, r4, lsr #16 + mov r4, r4, lsl #16 + orr r4, r4, r5, lsr #16 + mov r5, r5, lsl #16 + orr r5, r5, r12, lsr #16 + mov r12, r12, lsl #16 + orr r12, r12, lr, lsr #16 +#else + orr r3, r3, r4, lsl #16 + mov r4, r4, lsr #16 + orr r4, r4, r5, lsl #16 + mov r5, r5, lsr #16 + orr r5, r5, r12, lsl #16 + mov r12, r12, lsr #16 + orr r12, r12, lr, lsl #16 +#endif + stmia r0!, {r3-r5, r12} + subs r2, r2, #0x10 + bge .Lmemmove_fsrcul2loop16 + ldmia sp!, {r4, r5} + adds r2, r2, #0x0c + blt .Lmemmove_fsrcul2l4 + +.Lmemmove_fsrcul2loop4: +#ifdef __ARMEB__ + mov r12, lr, lsl #16 +#else + mov r12, lr, lsr #16 +#endif + ldr lr, [r1], #4 +#ifdef __ARMEB__ + orr r12, r12, lr, lsr #16 +#else + orr r12, r12, lr, lsl #16 +#endif + str r12, [r0], #4 + subs r2, r2, #4 + bge .Lmemmove_fsrcul2loop4 + +.Lmemmove_fsrcul2l4: + sub r1, r1, #2 + b .Lmemmove_fl4 + +.Lmemmove_fsrcul3: + cmp r2, #0x0c + blt .Lmemmove_fsrcul3loop4 + sub r2, r2, #0x0c + stmdb sp!, {r4, r5} + +.Lmemmove_fsrcul3loop16: +#ifdef __ARMEB__ + mov r3, lr, lsl #24 +#else + mov r3, lr, lsr #24 +#endif + ldmia r1!, {r4, r5, r12, lr} +#ifdef __ARMEB__ + orr r3, r3, r4, lsr #8 + mov r4, r4, lsl #24 + orr r4, r4, r5, lsr #8 + mov r5, r5, lsl #24 + orr r5, r5, r12, lsr #8 + mov r12, r12, lsl #24 + orr r12, r12, lr, lsr #8 +#else + orr r3, r3, r4, lsl #8 + mov r4, r4, lsr #24 + orr r4, r4, r5, lsl #8 + mov r5, r5, lsr #24 + orr r5, r5, r12, lsl #8 + mov r12, r12, lsr #24 + orr r12, r12, lr, lsl #8 +#endif + stmia r0!, {r3-r5, r12} + subs r2, r2, #0x10 + bge .Lmemmove_fsrcul3loop16 + ldmia sp!, {r4, r5} + adds r2, r2, #0x0c + blt .Lmemmove_fsrcul3l4 + +.Lmemmove_fsrcul3loop4: +#ifdef __ARMEB__ + mov r12, lr, lsl #24 +#else + mov r12, lr, lsr #24 +#endif + ldr lr, [r1], #4 +#ifdef __ARMEB__ + orr r12, r12, lr, lsr #8 +#else + orr r12, r12, lr, lsl #8 +#endif + str r12, [r0], #4 + subs r2, r2, #4 + bge .Lmemmove_fsrcul3loop4 + +.Lmemmove_fsrcul3l4: + sub r1, r1, #1 + b .Lmemmove_fl4 + +.Lmemmove_backwards: + add r1, r1, r2 + add r0, r0, r2 + subs r2, r2, #4 + blt .Lmemmove_bl4 /* less than 4 bytes */ + ands r12, r0, #3 + bne .Lmemmove_bdestul /* oh unaligned destination addr */ + ands r12, r1, #3 + bne .Lmemmove_bsrcul /* oh unaligned source addr */ + +.Lmemmove_bt8: + /* We have aligned source and destination */ + subs r2, r2, #8 + blt .Lmemmove_bl12 /* less than 12 bytes (4 from above) */ + stmdb sp!, {r4, lr} + subs r2, r2, #0x14 /* less than 32 bytes (12 from above) */ + blt .Lmemmove_bl32 + + /* blat 32 bytes at a time */ + /* XXX for really big copies perhaps we should use more registers */ +.Lmemmove_bloop32: + ldmdb r1!, {r3, r4, r12, lr} + stmdb r0!, {r3, r4, r12, lr} + ldmdb r1!, {r3, r4, r12, lr} + stmdb r0!, {r3, r4, r12, lr} + subs r2, r2, #0x20 + bge .Lmemmove_bloop32 + +.Lmemmove_bl32: + cmn r2, #0x10 + ldmgedb r1!, {r3, r4, r12, lr} /* blat a remaining 16 bytes */ + stmgedb r0!, {r3, r4, r12, lr} + subge r2, r2, #0x10 + adds r2, r2, #0x14 + ldmgedb r1!, {r3, r12, lr} /* blat a remaining 12 bytes */ + stmgedb r0!, {r3, r12, lr} + subge r2, r2, #0x0c + ldmia sp!, {r4, lr} + +.Lmemmove_bl12: + adds r2, r2, #8 + blt .Lmemmove_bl4 + subs r2, r2, #4 + ldrlt r3, [r1, #-4]! + strlt r3, [r0, #-4]! + ldmgedb r1!, {r3, r12} + stmgedb r0!, {r3, r12} + subge r2, r2, #4 + +.Lmemmove_bl4: + /* less than 4 bytes to go */ + adds r2, r2, #4 + RETeq /* done */ + + /* copy the crud byte at a time */ + cmp r2, #2 + ldrb r3, [r1, #-1]! + strb r3, [r0, #-1]! + ldrgeb r3, [r1, #-1]! + strgeb r3, [r0, #-1]! + ldrgtb r3, [r1, #-1]! + strgtb r3, [r0, #-1]! + RET + + /* erg - unaligned destination */ +.Lmemmove_bdestul: + cmp r12, #2 + + /* align destination with byte copies */ + ldrb r3, [r1, #-1]! + strb r3, [r0, #-1]! + ldrgeb r3, [r1, #-1]! + strgeb r3, [r0, #-1]! + ldrgtb r3, [r1, #-1]! + strgtb r3, [r0, #-1]! + subs r2, r2, r12 + blt .Lmemmove_bl4 /* less than 4 bytes to go */ + ands r12, r1, #3 + beq .Lmemmove_bt8 /* we have an aligned source */ + + /* erg - unaligned source */ + /* This is where it gets nasty ... */ +.Lmemmove_bsrcul: + bic r1, r1, #3 + ldr r3, [r1, #0] + cmp r12, #2 + blt .Lmemmove_bsrcul1 + beq .Lmemmove_bsrcul2 + cmp r2, #0x0c + blt .Lmemmove_bsrcul3loop4 + sub r2, r2, #0x0c + stmdb sp!, {r4, r5, lr} + +.Lmemmove_bsrcul3loop16: +#ifdef __ARMEB__ + mov lr, r3, lsr #8 +#else + mov lr, r3, lsl #8 +#endif + ldmdb r1!, {r3-r5, r12} +#ifdef __ARMEB__ + orr lr, lr, r12, lsl #24 + mov r12, r12, lsr #8 + orr r12, r12, r5, lsl #24 + mov r5, r5, lsr #8 + orr r5, r5, r4, lsl #24 + mov r4, r4, lsr #8 + orr r4, r4, r3, lsl #24 +#else + orr lr, lr, r12, lsr #24 + mov r12, r12, lsl #8 + orr r12, r12, r5, lsr #24 + mov r5, r5, lsl #8 + orr r5, r5, r4, lsr #24 + mov r4, r4, lsl #8 + orr r4, r4, r3, lsr #24 +#endif + stmdb r0!, {r4, r5, r12, lr} + subs r2, r2, #0x10 + bge .Lmemmove_bsrcul3loop16 + ldmia sp!, {r4, r5, lr} + adds r2, r2, #0x0c + blt .Lmemmove_bsrcul3l4 + +.Lmemmove_bsrcul3loop4: +#ifdef __ARMEB__ + mov r12, r3, lsr #8 +#else + mov r12, r3, lsl #8 +#endif + ldr r3, [r1, #-4]! +#ifdef __ARMEB__ + orr r12, r12, r3, lsl #24 +#else + orr r12, r12, r3, lsr #24 +#endif + str r12, [r0, #-4]! + subs r2, r2, #4 + bge .Lmemmove_bsrcul3loop4 + +.Lmemmove_bsrcul3l4: + add r1, r1, #3 + b .Lmemmove_bl4 + +.Lmemmove_bsrcul2: + cmp r2, #0x0c + blt .Lmemmove_bsrcul2loop4 + sub r2, r2, #0x0c + stmdb sp!, {r4, r5, lr} + +.Lmemmove_bsrcul2loop16: +#ifdef __ARMEB__ + mov lr, r3, lsr #16 +#else + mov lr, r3, lsl #16 +#endif + ldmdb r1!, {r3-r5, r12} +#ifdef __ARMEB__ + orr lr, lr, r12, lsl #16 + mov r12, r12, lsr #16 + orr r12, r12, r5, lsl #16 + mov r5, r5, lsr #16 + orr r5, r5, r4, lsl #16 + mov r4, r4, lsr #16 + orr r4, r4, r3, lsl #16 +#else + orr lr, lr, r12, lsr #16 + mov r12, r12, lsl #16 + orr r12, r12, r5, lsr #16 + mov r5, r5, lsl #16 + orr r5, r5, r4, lsr #16 + mov r4, r4, lsl #16 + orr r4, r4, r3, lsr #16 +#endif + stmdb r0!, {r4, r5, r12, lr} + subs r2, r2, #0x10 + bge .Lmemmove_bsrcul2loop16 + ldmia sp!, {r4, r5, lr} + adds r2, r2, #0x0c + blt .Lmemmove_bsrcul2l4 + +.Lmemmove_bsrcul2loop4: +#ifdef __ARMEB__ + mov r12, r3, lsr #16 +#else + mov r12, r3, lsl #16 +#endif + ldr r3, [r1, #-4]! +#ifdef __ARMEB__ + orr r12, r12, r3, lsl #16 +#else + orr r12, r12, r3, lsr #16 +#endif + str r12, [r0, #-4]! >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 8 13:42:01 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E1EA16A4D0; Tue, 8 Mar 2005 13:42:01 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41B2D16A4CE for ; Tue, 8 Mar 2005 13:42:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14B4743D3F for ; Tue, 8 Mar 2005 13:42:01 +0000 (GMT) (envelope-from kelly@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j28Dg0SQ092181 for ; Tue, 8 Mar 2005 13:42:00 GMT (envelope-from kelly@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j28Dg008092178 for perforce@freebsd.org; Tue, 8 Mar 2005 13:42:00 GMT (envelope-from kelly@FreeBSD.org) Date: Tue, 8 Mar 2005 13:42:00 GMT Message-Id: <200503081342.j28Dg008092178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kelly@FreeBSD.org using -f From: Kelly Djahandari To: Perforce Change Reviews Subject: PERFORCE change 72706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2005 13:42:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=72706 Change 72706 by kelly@kelly_riveroaks2.earthlink.net on 2005/03/08 13:41:21 Removed fowner capability per discussion with Andrew. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apache.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apache.te#5 (symlink) ==== From owner-p4-projects@FreeBSD.ORG Tue Mar 8 16:02:13 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33C4316A530; Tue, 8 Mar 2005 16:02:13 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E3EAB16A529 for ; Tue, 8 Mar 2005 16:02:12 +0000 (GMT) Received: from mail27.sea5.speakeasy.net (mail27.sea5.speakeasy.net [69.17.117.29]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E04D43D4C for ; Tue, 8 Mar 2005 16:02:12 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 23012 invoked from network); 8 Mar 2005 16:02:12 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 8 Mar 2005 16:02:11 -0000 Received: from [10.50.40.202] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j28G1mLH030122; Tue, 8 Mar 2005 11:02:06 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: John-Mark Gurney Date: Tue, 8 Mar 2005 10:41:08 -0500 User-Agent: KMail/1.6.2 References: <200503080615.j286FxfL058900@repoman.freebsd.org> In-Reply-To: <200503080615.j286FxfL058900@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200503081041.08769.jhb@FreeBSD.org> X-Spam-Status: No, score=-102.8 required=4.2 tests=ALL_TRUSTED, USER_IN_WHITELIST autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 72684 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2005 16:02:14 -0000 On Tuesday 08 March 2005 01:15 am, John-Mark Gurney wrote: > http://perforce.freebsd.org/chv.cgi?CH=72684 > > Change 72684 by jmg@jmg_carbon on 2005/03/08 06:14:57 > > pull in the latest changes, and pull in config since I need to fix > the fact that we can only have one hint file... That's not a bug. Hints are the wrong tool for what you are doing. You should be using identify methods to enumerate builtin hardware instead. Hints should only be used for removable hardware on busses that don't support enumeration (such as ISA expansion cards). -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Wed Mar 9 15:32:50 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 659BE16A4D0; Wed, 9 Mar 2005 15:32:50 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BB4616A4CE for ; Wed, 9 Mar 2005 15:32:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 278CA43D41 for ; Wed, 9 Mar 2005 15:32:49 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j29FWnom001050 for ; Wed, 9 Mar 2005 15:32:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j29FWFwU000617 for perforce@freebsd.org; Wed, 9 Mar 2005 15:32:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 9 Mar 2005 15:32:15 GMT Message-Id: <200503091532.j29FWFwU000617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 72780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2005 15:32:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=72780 Change 72780 by rwatson@rwatson_tislabs on 2005/03/09 15:30:28 Integrate trustedbsd_base from FreeBSD CVS HEAD. Affected files ... .. //depot/projects/trustedbsd/base/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/base/MAINTAINERS#27 integrate .. //depot/projects/trustedbsd/base/Makefile#38 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#58 integrate .. //depot/projects/trustedbsd/base/UPDATING#52 integrate .. //depot/projects/trustedbsd/base/UPDATING.64BTT#2 delete .. //depot/projects/trustedbsd/base/bin/Makefile#8 integrate .. //depot/projects/trustedbsd/base/bin/Makefile.inc#12 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.1#5 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.c#13 integrate .. //depot/projects/trustedbsd/base/bin/chflags/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#7 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#7 integrate .. //depot/projects/trustedbsd/base/bin/chio/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/chio/chio.1#5 integrate .. //depot/projects/trustedbsd/base/bin/chio/chio.c#8 integrate .. //depot/projects/trustedbsd/base/bin/chio/defs.h#3 integrate .. //depot/projects/trustedbsd/base/bin/chio/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#12 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#12 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#10 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#15 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#14 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.1#5 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.2#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.3#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.4#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.a#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.g#6 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/tabs#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/config.h#3 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#12 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#11 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#10 integrate .. //depot/projects/trustedbsd/base/bin/dd/gen.c#2 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#9 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#22 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.1#6 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.c#8 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.1#7 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ed/Makefile#10 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.1#7 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.h#6 integrate .. //depot/projects/trustedbsd/base/bin/ed/main.c#7 integrate .. //depot/projects/trustedbsd/base/bin/expr/expr.1#8 integrate .. //depot/projects/trustedbsd/base/bin/expr/expr.y#7 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#7 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#7 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.1#6 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.c#8 integrate .. //depot/projects/trustedbsd/base/bin/kenv/kenv.1#3 integrate .. //depot/projects/trustedbsd/base/bin/kenv/kenv.c#5 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.1#6 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#9 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#11 integrate .. //depot/projects/trustedbsd/base/bin/ln/symlink.7#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#26 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#24 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.h#10 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#23 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#13 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#7 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#9 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#9 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#13 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#9 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.1#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/extern.h#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/ftree.c#9 integrate .. //depot/projects/trustedbsd/base/bin/pax/getoldopt.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#10 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.1#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#12 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#20 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#21 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#21 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.1#11 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.c#11 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.1#7 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#13 integrate .. //depot/projects/trustedbsd/base/bin/realpath/realpath.1#5 integrate .. //depot/projects/trustedbsd/base/bin/rm/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#11 integrate .. //depot/projects/trustedbsd/base/bin/rmail/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#9 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/file.c#4 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/mask.c#6 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/merge.c#5 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/remove.c#4 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#6 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#7 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.h#4 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/util.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.1#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/cmv#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/dirs#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/kill#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/login#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/newgrp#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/popd#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/pushd#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/suspend#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#17 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/mktokens#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/nodetypes#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#18 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.1#5 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#9 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.1#6 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.8#6 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.c#7 integrate .. //depot/projects/trustedbsd/base/bin/test/TEST.sh#2 integrate .. //depot/projects/trustedbsd/base/bin/test/test.1#6 integrate .. //depot/projects/trustedbsd/base/bin/test/test.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpagent.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpclient.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmplib.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/oid-list#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_lsock.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/LEGAL.NOTICE#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/console#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/esri#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/msdos#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/os9#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/plan9#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sinclair#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sniffer#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/tex#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/virtutech#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/xo65#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/PORTING#1 branch .. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/compress.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/funcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/is_tar.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/names.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/file/tar.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/file/test.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#16 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-ditroff#6 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#9 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc.tmac#9 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#13 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/cmds.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/cmdtab.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/extern.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#9 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp_var.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/main.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/util.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/version.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/atomicio.c#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/netcat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/netcat/socks.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/ntpdate/ntpdate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/configure.ac#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/depcomp#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.man#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_envlist.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_readline.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#19 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.man#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#17 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_envlist.c#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/missing#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.4#6 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.conf.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#17 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/KNOWNBUGS#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/local.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/dragonfly.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/editmap/editmap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/clock.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/config.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_dragonfly.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/sm_gethost.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/smfi.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/b-strcmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/debug.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fclose.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fopen.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fpos.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fseek.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/heap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/rpool.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/smstdio.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strio.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-event.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-shm.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ungetc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfprintf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfscanf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vsscanf.c#5 delete .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb1.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/safefile.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/makemap/makemap.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.8#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/control.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/recipient.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sasl.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sm_resolve.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ppp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/commands.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/NEWS#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/aclocal.m4#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/get.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/common/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/extern.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.8#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/login.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/push.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rcp/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/ChangeLog#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/test/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/compile#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/config.guess#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/config.sub#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure.in#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/kadm5/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/install-sh#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmind.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/version4.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/connect.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos5.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/45/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/k5.asn1#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/afskauthlib/verify.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/pam/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/sia/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/afssys.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.am#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/changepw.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/context.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/init_creds_pw.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-protos.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/sl/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/vers/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/missing#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/mkinstalldirs#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#9 delete .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.ssl#7 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/asn1pars.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.cnf#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs8.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/req.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/comm.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/comms.txt#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/config#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_ctr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_int.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_strex.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_file.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/asm/ia64.S#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bntest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/crypto.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/destest.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_gen.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_key.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_sign.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_vrf.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ec/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/engine/hw_cryptodev.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_allc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/krb5/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md32_common.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/o_time.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.num#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.txt#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ocsp/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_attr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/md_rand.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_egd.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_win.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/randfile.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ui/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/x509_vfy.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/pem.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os2.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s23_clnt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_srvr.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_pkt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_cert.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_locl.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssltest.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_enc.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile.ssl#7 delete .. //depot/projects/trustedbsd/base/crypto/openssl/test/bctest#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/testenc#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/tools/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/domd#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/extract-names.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/libeay.num#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mk1mf.pl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkdef.pl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkerr.pl#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkstack.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/BC-16.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/BC-32.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/Mingw32.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/OS2-EMX.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/VC-16.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/VC-32.pl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pod2mantest#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/selftest.pl#4 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#40 integrate .. //depot/projects/trustedbsd/base/etc/defaults/Makefile#4 integrate .. //depot/projects/trustedbsd/base/etc/defaults/pccard.conf#25 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#15 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#43 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#14 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#8 integrate .. //depot/projects/trustedbsd/base/etc/isdn/Makefile#7 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#28 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#27 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#39 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/trustedbsd/base/etc/mtree/Makefile#4 integrate .. //depot/projects/trustedbsd/base/etc/namedb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/namedb/named.conf#9 integrate .. //depot/projects/trustedbsd/base/etc/network.subr#8 integrate .. //depot/projects/trustedbsd/base/etc/newsyslog.conf#13 integrate .. //depot/projects/trustedbsd/base/etc/pam.d/Makefile#10 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#11 integrate .. //depot/projects/trustedbsd/base/etc/periodic/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/460.status-mail-rejects#5 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#7 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/500.ipfwdenied#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/security/550.ipfwlimit#7 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/Makefile#4 integrate .. //depot/projects/trustedbsd/base/etc/ppp/ppp.conf#2 integrate .. //depot/projects/trustedbsd/base/etc/protocols#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#25 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#10 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cleartmp#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cron#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dhclient#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/dmesg#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/gbde#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/inetd#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#18 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initrandom#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/isdnd#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/lpd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountcritremote#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/moused#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mrouted#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/named#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/newsyslog#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpd#8 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpdate#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/pflog#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/power_profile#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/powerd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/ppp-user#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/rarpd#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/resolv#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sendmail#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sshd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/var#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/watchdogd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.shutdown#11 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#19 integrate .. //depot/projects/trustedbsd/base/etc/syslog.conf#7 integrate .. //depot/projects/trustedbsd/base/etc/usbd.conf#7 integrate .. //depot/projects/trustedbsd/base/games/factor/Makefile#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#38 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#26 delete .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#12 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#17 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/murphy#6 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/zippy#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/fortune/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.6#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.c#7 integrate .. //depot/projects/trustedbsd/base/games/fortune/strfile/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.8#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#8 integrate .. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.h#2 integrate .. //depot/projects/trustedbsd/base/games/fortune/tools/do_sort#2 integrate .. //depot/projects/trustedbsd/base/games/fortune/tools/do_uniq.py#1 branch .. //depot/projects/trustedbsd/base/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/unstr/unstr.c#5 integrate .. //depot/projects/trustedbsd/base/games/morse/morse.6#5 integrate .. //depot/projects/trustedbsd/base/games/number/number.6#2 integrate .. //depot/projects/trustedbsd/base/games/number/number.c#4 integrate .. //depot/projects/trustedbsd/base/games/ppt/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/primes/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/random/random.6#4 integrate .. //depot/projects/trustedbsd/base/games/random/random.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/checklist.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/dialog.3#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libg2c/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#12 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libobjc/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#19 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/config.h#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ar/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gasp/gasp.1#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile#13 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbreplay/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/Makefile#10 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ranlib/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++filt/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1/Makefile#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1obj/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1plus/Makefile#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/collect2/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/f771/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/include/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/protoize/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvsbug/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/dialog/TESTS/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/amd64/init.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/i386/init.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.1#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/main.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grohtml/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/html/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#23 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.man#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.man#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/categories#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/tar.1#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#42 integrate .. //depot/projects/trustedbsd/base/include/arpa/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/fts.h#5 integrate .. //depot/projects/trustedbsd/base/include/netdb.h#7 integrate .. //depot/projects/trustedbsd/base/include/nl_types.h#5 integrate .. //depot/projects/trustedbsd/base/include/protocols/Makefile#3 integrate .. //depot/projects/trustedbsd/base/include/pthread.h#7 integrate .. //depot/projects/trustedbsd/base/include/pwd.h#7 integrate .. //depot/projects/trustedbsd/base/include/runefile.h#1 branch .. //depot/projects/trustedbsd/base/include/stdbool.h#4 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#21 integrate .. //depot/projects/trustedbsd/base/include/string.h#11 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#21 integrate .. //depot/projects/trustedbsd/base/include/uuid.h#2 integrate .. //depot/projects/trustedbsd/base/installworld_newk#2 delete .. //depot/projects/trustedbsd/base/installworld_oldk#2 delete .. //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/config.h#11 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/version.h#11 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#10 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#10 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#10 integrate .. //depot/projects/trustedbsd/base/kerberos5/tools/asn1_compile/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/tools/make-print-version/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/tools/make-roken/Makefile#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/krb5-config/Makefile#12 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/ksu/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#34 integrate .. //depot/projects/trustedbsd/base/lib/bind/config.mk#3 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386/Makefile#4 delete .. //depot/projects/trustedbsd/base/lib/csu/i386/c++rt0.c#2 delete .. //depot/projects/trustedbsd/base/lib/csu/i386/crt0.c#3 delete .. //depot/projects/trustedbsd/base/lib/libalias/alias_old.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libalias/alias_skinny.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libalias/libalias.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/README#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_entry.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_platform.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_open_file.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_all.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_tar.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_read_support_format_zip.c#1 branch .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_string_sprintf.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.3#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_open_file.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/configure.ac.in#2 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive-formats.5#4 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libarchive/tar.5#4 integrate .. //depot/projects/trustedbsd/base/lib/libautofs/libautofs.3#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 10 02:45:35 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E02316A4D0; Thu, 10 Mar 2005 02:45:35 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31BFA16A4CE for ; Thu, 10 Mar 2005 02:45:35 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 023A043D31 for ; Thu, 10 Mar 2005 02:45:35 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2A2jYXe094600 for ; Thu, 10 Mar 2005 02:45:34 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2A2jYgS094597 for perforce@freebsd.org; Thu, 10 Mar 2005 02:45:34 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 10 Mar 2005 02:45:34 GMT Message-Id: <200503100245.j2A2jYgS094597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2005 02:45:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=72814 Change 72814 by davidxu@davidxu_celeron on 2005/03/10 02:45:07 Implement system and process scope concept for pthread. Not tested! Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#8 edit .. //depot/projects/davidxu_thread/src/sys/kern/kern_thread.c#5 edit .. //depot/projects/davidxu_thread/src/sys/sys/proc.h#7 edit .. //depot/projects/davidxu_thread/src/sys/sys/thr.h#3 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#8 (text+ko) ==== @@ -83,37 +83,23 @@ return (EPROCLIM); } - scope_sys = thr_scope_sys; + scope_sys = (uap->flags & THR_SYSTEM_SCOPE) != 0; /* Initialize our td and new ksegrp.. */ newtd = thread_alloc(); - if (scope_sys) - newkg = ksegrp_alloc(); - else - newkg = kg; + /* * Try the copyout as soon as we allocate the td so we don't have to * tear things down in a failure case below. */ id = newtd->td_tid; if ((error = copyout(&id, uap->id, sizeof(long)))) { - if (scope_sys) - ksegrp_free(newkg); thread_free(newtd); return (error); } - bzero(&newtd->td_startzero, __rangeof(struct thread, td_startzero, td_endzero)); bcopy(&td->td_startcopy, &newtd->td_startcopy, __rangeof(struct thread, td_startcopy, td_endcopy)); - - if (scope_sys) { - bzero(&newkg->kg_startzero, - __rangeof(struct ksegrp, kg_startzero, kg_endzero)); - bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, - __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); - } - newtd->td_proc = td->td_proc; newtd->td_ucred = crhold(td->td_ucred); @@ -121,25 +107,53 @@ cpu_set_upcall(newtd, td); error = set_mcontext(newtd, &ctx.uc_mcontext); if (error != 0) { - if (scope_sys) - ksegrp_free(newkg); thread_free(newtd); crfree(td->td_ucred); goto out; } + if ((td->td_proc->p_flag & P_HADTHREADS) == 0) + p->p_procscopegrp = kg; + + if (scope_sys) { + newkg = ksegrp_alloc(); + bzero(&newkg->kg_startzero, + __rangeof(struct ksegrp, kg_startzero, kg_endzero)); + bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, + __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); + PROC_LOCK(td->td_proc); + } else { +retry: + PROC_LOCK(td->td_proc); + if ((newkg = p->p_procscopegrp) == NULL) { + PROC_UNLOCK(p); + newkg = ksegrp_alloc(); + bzero(&newkg->kg_startzero, + __rangeof(struct ksegrp, kg_startzero, kg_endzero)); + bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, + __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); + PROC_LOCK(p); + if (p->p_procscopegrp == NULL) + p->p_procscopegrp = newkg; + else { + PROC_UNLOCK(p); + ksegrp_free(newkg); + goto retry; + } + } + } + /* Link the thread and kse into the ksegrp and make it runnable. */ - PROC_LOCK(td->td_proc); if (scope_sys) { - sched_init_concurrency(newkg); + sched_init_concurrency(newkg); } else { if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { - sched_set_concurrency(kg, + sched_set_concurrency(newkg, thr_concurrency ? thr_concurrency : (2*mp_ncpus)); } } - td->td_proc->p_flag |= P_HADTHREADS; + td->td_proc->p_flag |= P_HADTHREADS; newtd->td_sigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); if (scope_sys) ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thread.c#5 (text+ko) ==== @@ -610,6 +610,8 @@ * This is probably not fair so think of * a better answer. */ + if (kg == p->p_procscopegrp) + p->p_procscopegrp = NULL; sched_exit_ksegrp(FIRST_KSEGRP_IN_PROC(p), td); sched_set_concurrency(kg, 0); /* XXX TEMP */ ksegrp_unlink(kg); ==== //depot/projects/davidxu_thread/src/sys/sys/proc.h#7 (text+ko) ==== @@ -572,6 +572,7 @@ int p_suspcount; /* (c) Num threads in suspended mode. */ struct thread *p_xthread; /* (c) Trap thread */ int p_boundary_count;/* (c) Num threads at user boundary */ + struct ksegrp *p_procscopegrp; /* End area that is zeroed on creation. */ #define p_endzero p_magic ==== //depot/projects/davidxu_thread/src/sys/sys/thr.h#3 (text+ko) ==== @@ -30,7 +30,10 @@ #ifndef _SYS_THR_H_ #define _SYS_THR_H_ -#define THR_SUSPENDED 0x0001 /* Create the thread in the suspended state. */ +/* Create the thread in the suspended state. */ +#define THR_SUSPENDED 0x0001 +/* Create the system scope thread. */ +#define THR_SYSTEM_SCOPE 0x0002 /* * See pthread_* From owner-p4-projects@FreeBSD.ORG Thu Mar 10 07:28:18 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70EFA16A4D0; Thu, 10 Mar 2005 07:28:18 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E2F416A4CE for ; Thu, 10 Mar 2005 07:28:18 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0432743D55 for ; Thu, 10 Mar 2005 07:28:18 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2A7SHCn013301 for ; Thu, 10 Mar 2005 07:28:17 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2A7SHD9013297 for perforce@freebsd.org; Thu, 10 Mar 2005 07:28:17 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 10 Mar 2005 07:28:17 GMT Message-Id: <200503100728.j2A7SHD9013297@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2005 07:28:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=72822 Change 72822 by davidxu@davidxu_celeron on 2005/03/10 07:27:44 * Rename thr_scope_sys to thr_scope, values: 0: respect user request. 1: force to create process scope thread. 2: force to create system scope thread. * Carefully initialize new ksegrp's concurrent level and link it into process Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#9 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#9 (text+ko) ==== @@ -49,9 +49,9 @@ extern int max_groups_per_proc; SYSCTL_DECL(_kern_threads); -static int thr_scope_sys = 0; -SYSCTL_INT(_kern_threads, OID_AUTO, thr_scope_sys, CTLFLAG_RW, - &thr_scope_sys, 0, "sys or proc scope scheduling"); +static int thr_scope = 0; +SYSCTL_INT(_kern_threads, OID_AUTO, thr_scope, CTLFLAG_RW, + &thr_scope, 0, "sys or proc scope scheduling"); static int thr_concurrency = 0; SYSCTL_INT(_kern_threads, OID_AUTO, thr_concurrency, CTLFLAG_RW, @@ -70,20 +70,25 @@ int error; struct ksegrp *kg, *newkg; struct proc *p; - int scope_sys; + int scope_sys, linkkg; p = td->td_proc; kg = td->td_ksegrp; if ((error = copyin(uap->ctx, &ctx, sizeof(ctx)))) return (error); - /* Have race condition but it is cheap */ + /* Have race condition but it is cheap. */ if ((p->p_numksegrps >= max_groups_per_proc) || (p->p_numthreads >= max_threads_per_proc)) { return (EPROCLIM); } scope_sys = (uap->flags & THR_SYSTEM_SCOPE) != 0; + if (thr_scope == 1) + scope_sys = 0; + else if (thr_scope == 2) + scope_sys = 1; + /* Initialize our td and new ksegrp.. */ newtd = thread_alloc(); @@ -112,15 +117,23 @@ goto out; } - if ((td->td_proc->p_flag & P_HADTHREADS) == 0) + if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { p->p_procscopegrp = kg; - + mtx_lock_spin(&sched_lock); + sched_set_concurrency(kg, + thr_concurrency ? thr_concurrency : (2*mp_ncpus)); + mtx_unlock_spin(&sched_lock); + } + + linkkg = 0; if (scope_sys) { + linkkg = 1; newkg = ksegrp_alloc(); bzero(&newkg->kg_startzero, __rangeof(struct ksegrp, kg_startzero, kg_endzero)); bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); + sched_init_concurrency(newkg); PROC_LOCK(td->td_proc); } else { retry: @@ -133,9 +146,13 @@ bcopy(&kg->kg_startcopy, &newkg->kg_startcopy, __rangeof(struct ksegrp, kg_startcopy, kg_endcopy)); PROC_LOCK(p); - if (p->p_procscopegrp == NULL) + if (p->p_procscopegrp == NULL) { p->p_procscopegrp = newkg; - else { + sched_init_concurrency(newkg); + sched_set_concurrency(kg, + thr_concurrency ? thr_concurrency : (2*mp_ncpus)); + linkkg = 1; + } else { PROC_UNLOCK(p); ksegrp_free(newkg); goto retry; @@ -143,35 +160,21 @@ } } - /* Link the thread and kse into the ksegrp and make it runnable. */ - if (scope_sys) { - sched_init_concurrency(newkg); - } else { - if ((td->td_proc->p_flag & P_HADTHREADS) == 0) { - sched_set_concurrency(newkg, - thr_concurrency ? thr_concurrency : (2*mp_ncpus)); - } - } - td->td_proc->p_flag |= P_HADTHREADS; newtd->td_sigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); - if (scope_sys) + if (linkkg) { ksegrp_link(newkg, p); + sched_fork_ksegrp(td, newkg); + } thread_link(newtd, newkg); - mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); /* let the scheduler know about these things. */ - mtx_lock_spin(&sched_lock); - if (scope_sys) - sched_fork_ksegrp(td, newkg); sched_fork_thread(td, newtd); - TD_SET_CAN_RUN(newtd); if ((uap->flags & THR_SUSPENDED) == 0) setrunqueue(newtd, SRQ_BORING); - mtx_unlock_spin(&sched_lock); out: @@ -208,7 +211,6 @@ SIGFILLSET(td->td_siglist); sigrepost(td); mtx_lock_spin(&sched_lock); - /* * Shutting down last thread in the proc. This will actually * call exit() in the trampoline when it returns. From owner-p4-projects@FreeBSD.ORG Thu Mar 10 07:48:44 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7FEA16A4D0; Thu, 10 Mar 2005 07:48:43 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DD7C16A4CE for ; Thu, 10 Mar 2005 07:48:43 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 514B043D5D for ; Thu, 10 Mar 2005 07:48:43 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2A7mhEt014018 for ; Thu, 10 Mar 2005 07:48:43 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2A7mhFN014015 for perforce@freebsd.org; Thu, 10 Mar 2005 07:48:43 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 10 Mar 2005 07:48:43 GMT Message-Id: <200503100748.j2A7mhFN014015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2005 07:48:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=72823 Change 72823 by davidxu@davidxu_celeron on 2005/03/10 07:48:06 Fix copy-past bug. Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#10 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#10 (text+ko) ==== @@ -149,7 +149,7 @@ if (p->p_procscopegrp == NULL) { p->p_procscopegrp = newkg; sched_init_concurrency(newkg); - sched_set_concurrency(kg, + sched_set_concurrency(newkg, thr_concurrency ? thr_concurrency : (2*mp_ncpus)); linkkg = 1; } else { From owner-p4-projects@FreeBSD.ORG Thu Mar 10 11:14:58 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E574C16A4D0; Thu, 10 Mar 2005 11:14:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A21F416A4CE for ; Thu, 10 Mar 2005 11:14:57 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A88F43D41 for ; Thu, 10 Mar 2005 11:14:57 +0000 (GMT) (envelope-from davidxu@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2ABEvWF031147 for ; Thu, 10 Mar 2005 11:14:57 GMT (envelope-from davidxu@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2ABEv6V031144 for perforce@freebsd.org; Thu, 10 Mar 2005 11:14:57 GMT (envelope-from davidxu@freebsd.org) Date: Thu, 10 Mar 2005 11:14:57 GMT Message-Id: <200503101114.j2ABEv6V031144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to davidxu@freebsd.org using -f From: David Xu To: Perforce Change Reviews Subject: PERFORCE change 72829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2005 11:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=72829 Change 72829 by davidxu@davidxu_alona on 2005/03/10 11:14:32 only call sched_fork_ksegrp with sched_lock held. Affected files ... .. //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#11 edit Differences ... ==== //depot/projects/davidxu_thread/src/sys/kern/kern_thr.c#11 (text+ko) ==== @@ -163,14 +163,14 @@ td->td_proc->p_flag |= P_HADTHREADS; newtd->td_sigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); - if (linkkg) { + if (linkkg) ksegrp_link(newkg, p); - sched_fork_ksegrp(td, newkg); - } thread_link(newtd, newkg); PROC_UNLOCK(p); /* let the scheduler know about these things. */ + if (linkkg) + sched_fork_ksegrp(td, newkg); sched_fork_thread(td, newtd); TD_SET_CAN_RUN(newtd); if ((uap->flags & THR_SUSPENDED) == 0) From owner-p4-projects@FreeBSD.ORG Thu Mar 10 16:49:42 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F43D16A4D0; Thu, 10 Mar 2005 16:49:41 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 34F5916A4CE for ; Thu, 10 Mar 2005 16:49:41 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41B2943D5C for ; Thu, 10 Mar 2005 16:49:40 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2AGnefQ061744 for ; Thu, 10 Mar 2005 16:49:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2AGmf5L061052 for perforce@freebsd.org; Thu, 10 Mar 2005 16:48:41 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 Mar 2005 16:48:41 GMT Message-Id: <200503101648.j2AGmf5L061052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 72844 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2005 16:49:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=72844 Change 72844 by rwatson@rwatson_tislabs on 2005/03/10 16:47:42 Integrate trustedbsd_mac from trustedbsd_base. Among other things, loop back the merge of System V IPC MAC support via CVS. Affected files ... .. //depot/projects/trustedbsd/mac/COPYRIGHT#4 integrate .. //depot/projects/trustedbsd/mac/MAINTAINERS#24 integrate .. //depot/projects/trustedbsd/mac/Makefile#33 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#53 integrate .. //depot/projects/trustedbsd/mac/UPDATING#44 integrate .. //depot/projects/trustedbsd/mac/UPDATING.64BTT#2 delete .. //depot/projects/trustedbsd/mac/bin/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/chio/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/chio/chio.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/chio/chio.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/chio/defs.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/chio/pathnames.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.2#4 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.3#4 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.4#4 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.a#4 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.g#6 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/tabs#4 integrate .. //depot/projects/trustedbsd/mac/bin/csh/config.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/dd/gen.c#2 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#21 integrate .. //depot/projects/trustedbsd/mac/bin/domainname/domainname.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/domainname/domainname.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ed/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/ed/main.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.y#8 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/ln/symlink.7#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#26 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#31 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#11 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#25 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_subs.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cpio.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/extern.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ftree.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/getoldopt.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#22 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#22 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#23 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/realpath/realpath.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/rm/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/rmail/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/file.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/mask.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/merge.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/remove.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/util.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/bltin/echo.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/builtins.def#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/cmv#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/dirs#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/kill#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/login#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/newgrp#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/popd#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/pushd#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/funcs/suspend#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mkbuiltins#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mktokens#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/nodetypes#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#18 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/stty/stty.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/stty/stty.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sync/sync.8#6 integrate .. //depot/projects/trustedbsd/mac/bin/sync/sync.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/test/TEST.sh#3 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/VERSION#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmpdef/gensnmpdef.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/gensnmptree/gensnmptree.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/asn1.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpagent.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmpclient.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/bsnmplib.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/lib/snmpagent.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/oid-list#1 branch .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmp_mibII/snmp_mibII.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/bsnmpd.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/main.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpd.config#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/snmpmod.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bsnmp/snmpd/trans_lsock.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/LEGAL.NOTICE#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/animation#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/archive#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/audio#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/console#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/elf#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/esri#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/filesystems#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/linux#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/msdos#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/os9#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/perl#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/plan9#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sinclair#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/sniffer#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/tex#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/virtutech#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Magdir/xo65#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.am#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/PORTING#1 branch .. //depot/projects/trustedbsd/mac/contrib/file/aclocal.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/apprentice.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/ascmagic.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/compress.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/config.h.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/configure.in#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/file.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/fsmagic.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/funcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/install-sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/is_tar.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/file/magic.mime#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/mac/contrib/file/names.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/patchlevel.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/print.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/readelf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/file/softmagic.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/file/tar.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/file/test.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#14 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-ditroff#6 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-syms#9 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc.tmac#10 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#13 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/cmds.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/cmdtab.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/extern.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/fetch.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.1#9 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp_var.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/main.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/progressbar.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/util.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftp/src/version.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/netcat/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/netcat/atomicio.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/netcat/nc.1#1 branch .. //depot/projects/trustedbsd/mac/contrib/netcat/netcat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/netcat/socks.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/ntp/ntpdate/ntpdate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/config.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/configure#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/configure.ac#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/depcomp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_envlist.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_readline.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.man#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#17 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/install-sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_envlist.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#19 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#14 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/missing#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pf.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/contrib/pf/man/pfsync.4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/KNOWNBUGS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/local.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/dragonfly.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/editmap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/clock.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/config.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_dragonfly.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/sm_gethost.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/smfi.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/Makefile.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/b-strcmp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/debug.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fclose.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fopen.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fpos.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fseek.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/heap.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/rpool.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/smstdio.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strio.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-event.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-shm.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ungetc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfscanf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vsscanf.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb1.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/safefile.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/Makefile.m4#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/makemap.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.8#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#18 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/helpfile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sasl.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sm_resolve.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-ppp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnet/commands.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnet/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnet/telnet.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnet/telnet.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/NEWS#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/aclocal.m4#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/get.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/common/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/ftp.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/extern.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpcmd.y#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.8#6 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/login.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/push.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rcp/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/ChangeLog#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/network.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/state.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/test/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/compile#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/config.guess#6 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/config.sub#6 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/configure#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/configure.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/doc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/kadm5/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/install-sh#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmind.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/version4.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/connect.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kerberos5.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kinit.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/45/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/Makefile.am#6 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/k5.asn1#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/afskauthlib/verify.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/pam/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/sia/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/afssys.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/Makefile.am#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/changepw.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/context.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/init_creds_pw.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5-protos.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_set_password.3#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/sl/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/vers/Makefile.in#7 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/missing#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/mkinstalldirs#5 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/tools/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/INSTALL#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#9 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#7 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/asn1pars.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dgst.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/enc.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.cnf#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs8.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/prime.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/progs.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/req.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/speed.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/eng1.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/eng2.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/eng3.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/eng4.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/eng5.pem#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/comm.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/comms.txt#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/config#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_ctr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_int.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_strex.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/f.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/p5_pbev2.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_cinf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_crl.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_file.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/asm/ia64.S#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bntest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/c_zlib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/crypto.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/cfb64ede.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/destest.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/ecb3_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/set_key.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_check.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_gen.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_key.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_gen.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_key.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_ossl.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_sign.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_vrf.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ec/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/engine/hw_cryptodev.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/err_all.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/openssl.ec#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_md.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_allc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_des.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_des3.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_old.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/krb5/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/krb5/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md32_common.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_str.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_str.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/o_time.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_mac.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_mac.num#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.txt#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ocsp/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_all.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_pkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_attr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/md_rand.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_egd.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/randfile.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_eay.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/sha1dgst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/safestack.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/stack.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ui/Makefile.ssl#3 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_req.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/x509_vfy.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile.ssl#5 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/ext_dat.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_int.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/build.com#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/rsaref.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/rsaref.ec#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/rsaref_err.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/engines/rsaref/rsaref_err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/enc.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_num_bytes.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/RSA_public_encrypt.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/pem.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_session_id_context.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os2.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/os2/OS2-EMX.cmd#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.ssl#6 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s23_clnt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_clnt.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_srvr.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_lib.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_pkt.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_cert.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_ciph.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_locl.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_enc.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#7 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/test/bctest#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/evptests.txt#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testenc#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/testfipsssl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/Makefile#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/Makefile.ssl#4 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_issuer#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/domd#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/extract-names.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/fixNT.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/libeay.num#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mk1mf.pl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkdef.pl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkerr.pl#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkfiles.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkstack.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/BC-16.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/BC-32.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/Mingw32.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/OS2-EMX.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/VC-16.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/VC-32.pl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/VC-CE.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/linux.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/ultrix.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/unix.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pod2mantest#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/selftest.pl#4 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#41 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/pccard.conf#21 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#13 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#39 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#12 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#8 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#34 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#23 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#36 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.x11-4.dist#7 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/named.conf#8 integrate .. //depot/projects/trustedbsd/mac/etc/network.subr#7 integrate .. //depot/projects/trustedbsd/mac/etc/newsyslog.conf#12 integrate .. //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/etc/pccard_ether#10 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/460.status-mail-rejects#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/100.chksetuid#7 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/500.ipfwdenied#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/security/550.ipfwlimit#7 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/etc/ppp/ppp.conf#2 integrate .. //depot/projects/trustedbsd/mac/etc/protocols#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/amd#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cleartmp#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cron#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dhclient#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/dmesg#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/gbde#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/inetd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initdiskless#16 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/initrandom#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/isdnd#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ldconfig#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/lpd#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountcritremote#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/moused#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mrouted#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/named#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/newsyslog#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpd#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpdate#8 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/pflog#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/power_profile#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/powerd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.d/ppp-user#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/rarpd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/resolv#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sendmail#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/sshd#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/var#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/watchdogd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.shutdown#10 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#18 integrate .. //depot/projects/trustedbsd/mac/etc/syslog.conf#7 integrate .. //depot/projects/trustedbsd/mac/etc/usbd.conf#7 integrate .. //depot/projects/trustedbsd/mac/games/factor/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#34 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#24 delete .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#11 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#17 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/limerick#4 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/murphy#6 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/zippy#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/fortune/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/fortune/fortune.6#4 integrate .. //depot/projects/trustedbsd/mac/games/fortune/fortune/fortune.c#7 integrate .. //depot/projects/trustedbsd/mac/games/fortune/strfile/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.8#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.c#8 integrate .. //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.h#2 integrate .. //depot/projects/trustedbsd/mac/games/fortune/tools/do_sort#2 integrate .. //depot/projects/trustedbsd/mac/games/fortune/tools/do_uniq.py#1 branch .. //depot/projects/trustedbsd/mac/games/fortune/unstr/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/unstr/unstr.c#5 integrate .. //depot/projects/trustedbsd/mac/games/morse/morse.6#5 integrate .. //depot/projects/trustedbsd/mac/games/number/number.6#2 integrate .. //depot/projects/trustedbsd/mac/games/number/number.c#4 integrate .. //depot/projects/trustedbsd/mac/games/ppt/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/games/primes/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/games/random/random.6#4 integrate .. //depot/projects/trustedbsd/mac/games/random/random.c#6 integrate .. //depot/projects/trustedbsd/mac/gnu/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/checklist.c#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libdialog/dialog.3#4 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libg2c/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libobjc/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/gnu/lib/libstdc++/config.h#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ar/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/as/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gasp/gasp.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ranlib/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/c++filt/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1obj/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1plus/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/collect2/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/f771/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/include/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/protoize/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvsbug/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/dialog/TESTS/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/alpha/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/alpha/config.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/alpha/init.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/amd64/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/amd64/config.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/amd64/init.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/i386/config.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/i386/init.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/ia64/config.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/sparc64/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/sparc64/config.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/arch/sparc64/init.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdb/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdb/gdb.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/gdbtui/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/kgdb.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/kthr.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/main.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt_alpha.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt_amd64.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt_ia64.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/kgdb/trgt_sparc64.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/grep/grep.c#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/font/devX100-12/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/font/devX100/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/font/devX75-12/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/font/devX75/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grohtml/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/html/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#21 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.man#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/categories#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/tar.1#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#45 integrate .. //depot/projects/trustedbsd/mac/include/arpa/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/include/fts.h#5 integrate .. //depot/projects/trustedbsd/mac/include/netdb.h#7 integrate .. //depot/projects/trustedbsd/mac/include/nl_types.h#4 integrate .. //depot/projects/trustedbsd/mac/include/protocols/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/include/pthread.h#7 integrate .. //depot/projects/trustedbsd/mac/include/pwd.h#7 integrate .. //depot/projects/trustedbsd/mac/include/runefile.h#1 branch .. //depot/projects/trustedbsd/mac/include/stdbool.h#4 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#20 integrate .. //depot/projects/trustedbsd/mac/include/string.h#10 integrate .. //depot/projects/trustedbsd/mac/include/unistd.h#18 integrate .. //depot/projects/trustedbsd/mac/include/uuid.h#2 integrate .. //depot/projects/trustedbsd/mac/installworld_newk#2 delete .. //depot/projects/trustedbsd/mac/installworld_oldk#2 delete .. //depot/projects/trustedbsd/mac/kerberos5/Makefile.inc#13 integrate .. //depot/projects/trustedbsd/mac/kerberos5/include/config.h#10 integrate .. //depot/projects/trustedbsd/mac/kerberos5/include/version.h#10 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/kerberos5/tools/asn1_compile/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/tools/make-print-version/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/tools/make-roken/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/krb5-config/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/ksu/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#33 integrate .. //depot/projects/trustedbsd/mac/lib/bind/config.mk#3 integrate .. //depot/projects/trustedbsd/mac/lib/csu/i386/Makefile#4 delete .. //depot/projects/trustedbsd/mac/lib/csu/i386/c++rt0.c#2 delete .. //depot/projects/trustedbsd/mac/lib/csu/i386/crt0.c#3 delete .. //depot/projects/trustedbsd/mac/lib/libalias/alias_old.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/alias_skinny.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libalias/libalias.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/README#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive.h.in#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_open_file.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_iso9660.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_read_support_format_zip.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_string_sprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_util.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_util.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_open_file.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/configure.ac.in#2 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/libarchive-formats.5#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libarchive/tar.5#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 10 23:31:57 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ABC816A4D0; Thu, 10 Mar 2005 23:31:57 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F124216A4CE for ; Thu, 10 Mar 2005 23:31:56 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6547743D1D for ; Thu, 10 Mar 2005 23:31:56 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2ANVuWJ042167 for ; Thu, 10 Mar 2005 23:31:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2ANVu1Q042164 for perforce@freebsd.org; Thu, 10 Mar 2005 23:31:56 GMT (envelope-from sam@freebsd.org) Date: Thu, 10 Mar 2005 23:31:56 GMT Message-Id: <200503102331.j2ANVu1Q042164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72868 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2005 23:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=72868 Change 72868 by sam@sam_ebb on 2005/03/10 23:31:44 updated version; seems to work in sta+ap, untested in adhoc Obtained from: madwifi Affected files ... .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#2 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.h#2 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#2 (text+ko) ==== @@ -113,6 +113,20 @@ static void ath_rate_ctl_start(struct ath_softc *, struct ieee80211_node *); +static __inline int size_to_bin(int size) +{ + int x = 0; + for (x = 0; x < NUM_PACKET_SIZE_BINS; x++) { + if (size < packet_size_bins[x]) { + return x; + } + } + return NUM_PACKET_SIZE_BINS-1; +} +static __inline int bin_to_size(int index) { + return packet_size_bins[index]; +} + /* * Setup rate codes for management/control frames. We force * all such frames to the lowest rate. @@ -148,13 +162,13 @@ * returns the ndx with the lowest average_tx_time, * or -1 if all the average_tx_times are 0. */ -static __inline int best_rate_ndx(struct sample_node *sn) +static __inline int best_rate_ndx(struct sample_node *sn, int size_bin) { int x = 0; int best_rate_ndx = 0; int best_rate_tt = 0; for (x = 0; x < sn->num_rates; x++) { - int tt = sn->rates[x].average_tx_time; + int tt = sn->stats[size_bin][x].average_tx_time; if (tt > 0) { if (!best_rate_tt || best_rate_tt > tt) { best_rate_tt = tt; @@ -162,7 +176,6 @@ } } } - return (best_rate_tt) ? best_rate_ndx : -1; } @@ -171,10 +184,10 @@ * is less than the best bit-rate's average_tx_time * and the ndx has not had four successive failures. */ -static __inline int pick_sample_ndx(struct sample_node *sn) +static __inline int pick_sample_ndx(struct sample_node *sn, int size_bin) { int x = 0; - int best_ndx = best_rate_ndx(sn); + int best_ndx = best_rate_ndx(sn, size_bin); int best_tt = 0; int num_eligible = 0; @@ -183,8 +196,8 @@ return 0; } - best_tt = sn->rates[best_ndx].average_tx_time; - sn->sample_num++; + best_tt = sn->stats[size_bin][best_ndx].average_tx_time; + sn->sample_num[size_bin]++; /* * first, find the number of bit-rates we could potentially @@ -193,18 +206,18 @@ */ for (x = 0; x < sn->num_rates; x++) { if (x != best_ndx && - sn->rates[x].perfect_tx_time < best_tt && - sn->rates[x].successive_failures < 4) { + sn->stats[size_bin][x].perfect_tx_time < best_tt && + sn->stats[size_bin][x].successive_failures < 4) { num_eligible++; } } if (num_eligible > 0) { - int pick = sn->sample_num % num_eligible; + int pick = sn->sample_num[size_bin] % num_eligible; for (x = 0; x < sn->num_rates; x++) { if (x != best_ndx && - sn->rates[x].perfect_tx_time < best_tt && - sn->rates[x].successive_failures < 4) { + sn->stats[size_bin][x].perfect_tx_time < best_tt && + sn->stats[size_bin][x].successive_failures < 4) { if (pick == 0) { return x; } @@ -215,26 +228,30 @@ return best_ndx; } - void ath_rate_findrate(struct ath_softc *sc, struct ath_node *an, HAL_BOOL shortPreamble, size_t frameLen, u_int8_t *rix, int *try0, u_int8_t *txrate) { - struct sample_softc *osc = ATH_SOFTC_SAMPLE(sc); struct sample_node *sn = ATH_NODE_SAMPLE(an); - int ndx, best_ndx; - + struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc); + int x; + int ndx = 0; + int size_bin = size_to_bin(frameLen); + int best_ndx = best_rate_ndx(sn, size_bin); + if (sn->static_rate_ndx != -1) { *try0 = 4; *rix = sn->rates[sn->static_rate_ndx].rix; *txrate = sn->rates[sn->static_rate_ndx].rateCode; return; } - ndx = 0; - *try0 = 4; - best_ndx = best_rate_ndx(sn); - if (!sn->packets_sent || sn->packets_sent % osc->ath_sample_rate > 0) { + + *try0 = 2; + + best_ndx = best_rate_ndx(sn, size_bin); + if (!sn->packets_sent[size_bin] || + sn->packets_sent[size_bin] % ssc->ath_sample_rate > 0) { /* * for most packets, send the packet at the bit-rate with * the lowest estimated transmission time. @@ -246,19 +263,33 @@ * no packet has succeeded, try the highest bitrate * that hasn't failed. */ - *try0 = 2; for (ndx = sn->num_rates-1; ndx >= 0; ndx--) { - if (sn->rates[ndx].successive_failures == 0) { + if (sn->stats[size_bin][ndx].successive_failures == 0) { break; } } } + if (size_bin == 0) { + /* update the visible txrate for this node */ + an->an_node.ni_txrate = ndx; + } } else { + /* + * before we pick a bit-rate to "sample", clear any + * stale stuff out. + */ + for (x = 0; x < sn->num_rates; x++) { + if (ticks - sn->stats[size_bin][x].last_tx > ((hz * 10000)/1000)) { + sn->stats[size_bin][x].average_tx_time = sn->stats[size_bin][x].perfect_tx_time; + sn->stats[size_bin][x].successive_failures = 0; + sn->stats[size_bin][x].tries = 0; + sn->stats[size_bin][x].total_packets = 0; + sn->stats[size_bin][x].packets_acked = 0; + } + } + /* send the packet at a different bit-rate */ - ndx = pick_sample_ndx(sn); - if (best_ndx != ndx) { - *try0 = 2; - } + ndx = pick_sample_ndx(sn, size_bin); } @@ -270,13 +301,7 @@ *txrate = sn->rates[ndx].rateCode; } - - sn->packets_sent++; - DPRINTF(sc, "packets %d rate %d ndx %d rateCode %d try0 %d average %d\n", - sn->packets_sent, - sn->rates[ndx].rate, ndx, sn->rates[ndx].rateCode, - *try0, sn->rates[*rix].average_tx_time); - + sn->packets_sent[size_bin]++; } void @@ -284,25 +309,44 @@ struct ath_desc *ds, HAL_BOOL shortPreamble, u_int8_t rix) { struct sample_node *sn = ATH_NODE_SAMPLE(an); - int best_ndx = best_rate_ndx(sn); - int rateCode = 0; - if (best_ndx == -1) { + int rateCode = -1; + int frame_size; + int size_bin; + int best_ndx; + + frame_size = ds->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */ + if (frame_size == 0) + frame_size = 1500; + size_bin = size_to_bin(frame_size); + best_ndx = best_rate_ndx(sn, size_bin); + + if (best_ndx == -1 || !sn->stats[size_bin][best_ndx].packets_acked) { /* * no packet has succeeded, so also try twice at the lowest bitate. */ - rateCode = sn->rates[0].shortPreambleRateCode; + if (shortPreamble) { + rateCode = sn->rates[0].shortPreambleRateCode; + } else { + rateCode = sn->rates[0].rateCode; + } } else if (sn->rates[best_ndx].rix != rix) { /* * we're trying a different bit-rate, and it could be lossy, * so if it fails try at the best bit-rate. */ - rateCode = sn->rates[best_ndx].shortPreambleRateCode; + if (shortPreamble) { + rateCode = sn->rates[MAX(0,best_ndx-1)].shortPreambleRateCode; + } else { + rateCode = sn->rates[MAX(0,best_ndx-1)].rateCode; + } + } + if (rateCode != -1) { + ath_hal_setupxtxdesc(sc->sc_ah, ds + , rateCode, 1 /* series 1 */ + , rateCode, 1 /* series 2 */ + , rateCode, 1 /* series 3 */ + ); } - ath_hal_setupxtxdesc(sc->sc_ah, ds - , rateCode, 2 /* series 1 */ - , 0, 0 /* series 2 */ - , 0, 0 /* series 3 */ - ); } @@ -310,18 +354,24 @@ ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, const struct ath_desc *ds) { - struct sample_softc *osc = ATH_SOFTC_SAMPLE(sc); struct sample_node *sn = ATH_NODE_SAMPLE(an); + struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc); int rate = sc->sc_hwmap[ds->ds_txstat.ts_rate &~ HAL_TXSTAT_ALTRATE].ieeerate; - int used_alt_rate = ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE; int retries = ds->ds_txstat.ts_longretry; - int pktlen, tt, rix, x; - + int initial_rate_failed = ((ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE) + || ds->ds_txstat.ts_status != 0 || + retries > 3); + int tt = 0; + int rix = -1; + int x = 0; + int frame_size; /* low-order 12 bits of ds_ctl0 */ + int size_bin; + int size; + if (!sn->num_rates) { DPRINTF(sc, "%s: no rates yet\n", __func__); return; } - rix = -1; for (x = 0; x < sn->num_rates; x++) { if (sn->rates[x].rate == rate) { rix = x; @@ -334,30 +384,51 @@ return; } - pktlen = ds->ds_ctl0 & 0xfff; - if (pktlen == 0) /* XXX multi-descriptor tx */ - pktlen = 1500; - tt = calc_usecs_wifi_packet(pktlen, rate, MIN(retries, 4)); + frame_size = ds->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */ + if (frame_size == 0) + frame_size = 1500; + size_bin = size_to_bin(frame_size); + size = bin_to_size(size_bin); + tt = calc_usecs_unicast_packet(sc, size, sn->rates[rix].rix, + retries); + + DPRINTF(sc, "%s: rate %d rix %d frame_size %d (%d) retries %d status %d tt %d avg_tt %d perfect_tt %d ts-rate %d\n", + __func__, rate, rix, frame_size, size, retries, initial_rate_failed, tt, + sn->stats[size_bin][rix].average_tx_time, + sn->stats[size_bin][rix].perfect_tx_time, + ds->ds_txstat.ts_rate); - DPRINTF(sc, "%s: rate %d rix %d retries %d tt %d pktlen %d success %d ts_rate %d\n", - __func__, rate, rix, retries, tt, pktlen, used_alt_rate, ds->ds_txstat.ts_rate); - - if (!sn->rates[rix].average_tx_time) { - sn->rates[rix].average_tx_time = tt; + if (sn->stats[size_bin][rix].total_packets < 7) { + /* just average the first few packets */ + int avg_tx = sn->stats[size_bin][rix].average_tx_time; + int packets = sn->stats[size_bin][rix].total_packets; + sn->stats[size_bin][rix].average_tx_time = (tt+(avg_tx*packets))/(packets+1); } else { - sn->rates[rix].average_tx_time = - ((sn->rates[rix].average_tx_time * osc->ath_smoothing_rate) + - (tt * (100 - osc->ath_smoothing_rate))) / 100; + /* use a ewma */ + sn->stats[size_bin][rix].average_tx_time = + ((sn->stats[size_bin][rix].average_tx_time * ssc->ath_smoothing_rate) + + (tt * (100 - ssc->ath_smoothing_rate))) / 100; } - if (!used_alt_rate) { - sn->rates[rix].packets_acked++; - sn->rates[rix].successive_failures = 0; + if (initial_rate_failed) { + /* + * this packet failed - count this as a failure + * for larger packets also, since we assume + * if a small packet fails at a lower bit-rate + * then a larger one will also. + */ + int y; + for (y = size_bin; y < NUM_PACKET_SIZE_BINS; y++) { + sn->stats[y][rix].successive_failures++; + sn->stats[y][rix].last_tx = ticks; + } } else { - sn->rates[rix].successive_failures++; + sn->stats[size_bin][rix].packets_acked++; + sn->stats[size_bin][rix].successive_failures = 0; } - sn->rates[rix].tries += (1+retries); - + sn->stats[size_bin][rix].tries += (1+retries); + sn->stats[size_bin][rix].last_tx = ticks; + sn->stats[size_bin][rix].total_packets++; } void @@ -368,6 +439,44 @@ ath_rate_ctl_start(sc, &an->an_node); } +static void +ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni) +{ + struct ath_node *an = ATH_NODE(ni); + struct sample_node *sn = ATH_NODE_SAMPLE(an); + int x = 0; + int y = 0; + + for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) { + int size = bin_to_size(y); + sn->packets_sent[y] = 0; + sn->sample_num[y] = 0; + + for (x = 0; x < ni->ni_rates.rs_nrates; x++) { + sn->stats[y][x].successive_failures = 0; + sn->stats[y][x].tries = 0; + sn->stats[y][x].total_packets = 0; + sn->stats[y][x].packets_acked = 0; + sn->stats[y][x].last_tx = 0; + sn->stats[y][x].perfect_tx_time = calc_usecs_unicast_packet(sc, size, + sn->rates[x].rix, + 0); + sn->stats[y][x].average_tx_time = sn->stats[y][x].perfect_tx_time; + + + DPRINTF(sc, "%s: %d rate %d rix %d rateCode %d perfect_tx_time %d \n", __func__, + x, sn->rates[x].rate, + sn->rates[x].rix, sn->rates[x].rateCode, + sn->stats[0][x].perfect_tx_time); + } + + } + + /* set the visible bit-rate to the lowest one available */ + ni->ni_txrate = 0; + +} + /* * Initialize the tables for a node. */ @@ -379,9 +488,10 @@ struct ath_node *an = ATH_NODE(ni); struct sample_node *sn = ATH_NODE_SAMPLE(an); const HAL_RATE_TABLE *rt = sc->sc_currates; + + int x; int srate; - int x = 0; - + DPRINTF(sc, "%s:\n", __func__); KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); @@ -407,7 +517,6 @@ } sn->num_rates = ni->ni_rates.rs_nrates; - for (x = 0; x < ni->ni_rates.rs_nrates; x++) { sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL; sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate]; @@ -415,16 +524,9 @@ sn->rates[x].shortPreambleRateCode = rt->info[sn->rates[x].rix].rateCode | rt->info[sn->rates[x].rix].shortPreamble; - sn->rates[x].perfect_tx_time = calc_usecs_wifi_packet(1500, - sn->rates[x].rate, - 0); - - DPRINTF(sc, "%s: %d rate %d rix %d rateCode %d perfect_tx_time %d \n", __func__, - x, sn->rates[x].rate, - sn->rates[x].rix, sn->rates[x].rateCode, - sn->rates[x].perfect_tx_time); + } + ath_rate_ctl_reset(sc, ni); - } #undef RATE } @@ -435,18 +537,9 @@ ath_rate_newstate(struct ath_softc *sc, enum ieee80211_state state) { struct ieee80211com *ic = &sc->sc_ic; - struct ieee80211_node *ni; - if (ic->ic_opmode == IEEE80211_M_STA) { - /* - * Reset local xmit state; this is really only - * meaningful when operating in station mode. - */ - ni = ic->ic_bss; - if (state == IEEE80211_S_RUN) { - ath_rate_ctl_start(sc, ni); - } - } + if (state == IEEE80211_S_RUN) + ath_rate_newassoc(sc, ATH_NODE(ic->ic_bss), 1); } static void @@ -475,7 +568,7 @@ if (osc == NULL) return NULL; osc->arc.arc_space = sizeof(struct sample_node); - osc->ath_smoothing_rate = 90; /* ewma percentage (out of 100) */ + osc->ath_smoothing_rate = 95; /* ewma percentage (out of 100) */ osc->ath_sample_rate = 10; /* send a different bit-rate 1/X packets */ ath_rate_sysctlattach(sc, osc); return &osc->arc; ==== //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.h#2 (text+ko) ==== @@ -50,49 +50,43 @@ #define ATH_SOFTC_SAMPLE(sc) ((struct sample_softc *)sc->sc_rc) struct rate_info { - int rate; - int rix; - int rateCode; - int shortPreambleRateCode; + int rate; + int rix; + int rateCode; + int shortPreambleRateCode; +}; + - int average_tx_time; - int successive_failures; - int tries; - int packets_acked; - int perfect_tx_time; /* transmit time for 0 retries */ +struct rate_stats { + int average_tx_time; + int successive_failures; + int tries; + int total_packets; + int packets_acked; + int perfect_tx_time; /* transmit time for 0 retries */ + int last_tx; }; +/* + * for now, we track performance for three different packet + * size buckets + */ +#define NUM_PACKET_SIZE_BINS 3 +static int packet_size_bins[NUM_PACKET_SIZE_BINS] = {250, 1600, 3000}; /* per-node state */ struct sample_node { - int packets_sent; + int static_rate_ndx; + int num_rates; - int static_rate_ndx; - int num_rates; + struct rate_info rates[IEEE80211_RATE_MAXSIZE]; + + struct rate_stats stats[NUM_PACKET_SIZE_BINS][IEEE80211_RATE_MAXSIZE]; + int sample_num[NUM_PACKET_SIZE_BINS]; + int packets_sent[NUM_PACKET_SIZE_BINS]; - struct rate_info rates[IEEE80211_RATE_MAXSIZE]; - int sample_num; }; - - -#define WIFI_SLOT_B 20 -#define WIFI_DIFS_B 50 -#define WIFI_SIFS_B 10 -#define WIFI_ACK_B 304 -#define WIFI_PLCP_HEADER_LONG_B 192 -#define WIFI_PLCP_HEADER_SHORT_B 192 - -#define WIFI_SLOT_A 9 -#define WIFI_DIFS_A 28 -#define WIFI_SIFS_A 9 -#define WIFI_ACK_A 30 -#define WIFI_PLCP_HEADER_A 20 - - -#define is_b_rate(b) ((b == 2) || (b == 4) || (b == 11) || (b == 22)) - -#define WIFI_CW_MIN 31 -#define WIFI_CW_MAX 1023 +#define ATH_NODE_SAMPLE(an) ((struct sample_node *)&an[1]) #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) @@ -101,74 +95,41 @@ #define MAX(a,b) ((a) > (b) ? (a) : (b)) #endif -/* - * transmit time for data payload + plcp_header - */ -static unsigned calc_transmit_time(int rate, int length) { - unsigned t_plcp_header = 96; - if (rate == 1) { - t_plcp_header = 192; - } else if (!is_b_rate(rate)) { - t_plcp_header = 20; - } - return (2 * (t_plcp_header + ((length * 8))))/ rate; -} +#define WIFI_CW_MIN 31 +#define WIFI_CW_MAX 1023 /* - * expected backoff for t tries. + * Calculate the transmit duration of a frame. */ -static unsigned calc_backoff(int rate, int t) -{ - int t_slot = is_b_rate(rate) ? WIFI_SLOT_B : WIFI_SLOT_A; - int cw = WIFI_CW_MIN; - int x = 0; +static unsigned calc_usecs_unicast_packet(struct ath_softc *sc, + int length, + int rix, int retries) { + const HAL_RATE_TABLE *rt = sc->sc_currates; - /* there is backoff, even for the first packet */ - for (x = 0; x < t; x++) { - cw = MIN(WIFI_CW_MAX, (cw + 1) * 2); - } - return t_slot * cw / 2; + + /* pg 205 ieee.802.11.pdf */ + unsigned t_slot = 20; + unsigned t_difs = 50; + unsigned t_sifs = 10; + int tt = 0; + int x = 0; + int cw = WIFI_CW_MIN; + int cix = rt->info[rix].controlRate; + KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); + + if (rt->info[rix].phy == IEEE80211_T_OFDM) { + t_slot = 9; + t_sifs = 9; + t_difs = 28; + } + tt += t_difs; + tt += (retries+1)*(t_sifs + rt->info[cix].spAckDuration); + tt += (retries+1)*ath_hal_computetxtime(sc->sc_ah, rt, length, + rix, AH_TRUE); + for (x = 0; x <= retries; x++) { + cw = MIN(WIFI_CW_MAX, (cw + 1) * 2); + tt += (t_slot * cw/2); + } + return tt; } - - - -static unsigned calc_usecs_wifi_packet_tries(int length, - int rate, - int try0, int tryN) { - if (!rate || !length || try0 > tryN) { - return 99999; - } - - /* pg 205 ieee.802.11.pdf */ - unsigned t_slot = 20; - unsigned t_ack = 304; // 192 + 14*8/1 - unsigned t_difs = 50; - unsigned t_sifs = 10; - - - if (!is_b_rate(rate)) { - /* with 802.11g, things are at 6 mbit/s */ - t_slot = 9; - t_sifs = 9; - t_difs = 28; - t_ack = 30; - } - - int tt = 0; - int x = 0; - for (x = try0; x <= tryN; x++) { - tt += calc_backoff(rate, x) + - calc_transmit_time(rate, length) + - t_sifs + t_ack; - } - return tt; -} - -static unsigned calc_usecs_wifi_packet(int length, - int rate, int retries) { - return calc_usecs_wifi_packet_tries(length, rate, - 0, retries); -} - -#define ATH_NODE_SAMPLE(an) ((struct sample_node *)&an[1]) #endif /* _DEV_ATH_RATE_SAMPLE_H */ From owner-p4-projects@FreeBSD.ORG Fri Mar 11 13:29:27 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C744416A4D0; Fri, 11 Mar 2005 13:29:26 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8329A16A4CE for ; Fri, 11 Mar 2005 13:29:26 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56B6743D31 for ; Fri, 11 Mar 2005 13:29:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2BDTQ2W004564 for ; Fri, 11 Mar 2005 13:29:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BDTQn6004561 for perforce@freebsd.org; Fri, 11 Mar 2005 13:29:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 11 Mar 2005 13:29:26 GMT Message-Id: <200503111329.j2BDTQn6004561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 72897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2005 13:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=72897 Change 72897 by rwatson@rwatson_tislabs on 2005/03/11 13:29:08 Fix error in merge. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#27 (text+ko) ==== @@ -515,7 +515,7 @@ error = 1; } if (!error) { - if (chmod(fx->s, 0666) < 0) + if (chmod(fx->name, 0666) < 0) error = 1; } if (!error) { From owner-p4-projects@FreeBSD.ORG Fri Mar 11 19:42:11 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 235E616A4D1; Fri, 11 Mar 2005 19:42:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D57C116A4CE for ; Fri, 11 Mar 2005 19:42:10 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE5D043D46 for ; Fri, 11 Mar 2005 19:42:09 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2BJg9NC033415 for ; Fri, 11 Mar 2005 19:42:09 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BJg7kV033412 for perforce@freebsd.org; Fri, 11 Mar 2005 19:42:07 GMT (envelope-from peter@freebsd.org) Date: Fri, 11 Mar 2005 19:42:07 GMT Message-Id: <200503111942.j2BJg7kV033412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 72923 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2005 19:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=72923 Change 72923 by peter@peter_daintree on 2005/03/11 19:41:35 IFC @72922 Affected files ... .. //depot/projects/hammer/Makefile#31 integrate .. //depot/projects/hammer/Makefile.inc1#86 integrate .. //depot/projects/hammer/UPDATING#74 integrate .. //depot/projects/hammer/bin/Makefile#4 integrate .. //depot/projects/hammer/bin/sh/parser.c#8 integrate .. //depot/projects/hammer/bin/sh/sh.1#14 integrate .. //depot/projects/hammer/etc/Makefile#37 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#49 integrate .. //depot/projects/hammer/etc/etc.sparc64/ttys#8 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#33 integrate .. //depot/projects/hammer/etc/newsyslog.conf#10 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#32 integrate .. //depot/projects/hammer/etc/rc.d/initrandom#5 integrate .. //depot/projects/hammer/etc/rc.d/lpd#5 integrate .. //depot/projects/hammer/etc/rc.d/newsyslog#2 integrate .. //depot/projects/hammer/etc/rc.d/resolv#4 integrate .. //depot/projects/hammer/etc/rc.d/var#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#40 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/kgdb.1#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/kgdb/main.c#5 integrate .. //depot/projects/hammer/include/Makefile#39 integrate .. //depot/projects/hammer/lib/libalias/alias_skinny.c#7 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_gzip.c#7 integrate .. //depot/projects/hammer/lib/libc/alpha/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#10 integrate .. //depot/projects/hammer/lib/libc/arm/_fpmath.h#3 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#21 integrate .. //depot/projects/hammer/lib/libc/gen/frexp.3#4 integrate .. //depot/projects/hammer/lib/libc/gen/ldexp.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/times.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/tls.c#6 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/ttyname.c#4 integrate .. //depot/projects/hammer/lib/libc/i386/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/ia64/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/nls/ko_KR.UTF-8.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/ko_KR.eucKR.msg#1 branch .. //depot/projects/hammer/lib/libc/nls/pl_PL.ISO8859-2.msg#1 branch .. //depot/projects/hammer/lib/libc/powerpc/_fpmath.h#7 integrate .. //depot/projects/hammer/lib/libc/rpc/auth_time.c#3 integrate .. //depot/projects/hammer/lib/libc/rpc/clnt_vc.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/netnamer.c#4 integrate .. //depot/projects/hammer/lib/libc/rpc/rtime.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/_fpmath.h#5 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/hammer/lib/libc/string/strsignal.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/send.2#11 integrate .. //depot/projects/hammer/lib/libc/yp/yplib.c#4 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo.c#4 integrate .. //depot/projects/hammer/lib/libdisk/open_disk.c#8 integrate .. //depot/projects/hammer/lib/libfetch/http.c#11 integrate .. //depot/projects/hammer/lib/libmd/Makefile#5 integrate .. //depot/projects/hammer/lib/libmd/sha.3#6 integrate .. //depot/projects/hammer/lib/libmd/sha256.3#1 branch .. //depot/projects/hammer/lib/libmd/sha256.h#1 branch .. //depot/projects/hammer/lib/libmd/sha256c.c#1 branch .. //depot/projects/hammer/lib/libmd/shadriver.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_init.c#14 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_private.h#22 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_stack.c#4 integrate .. //depot/projects/hammer/lib/msun/Makefile#24 integrate .. //depot/projects/hammer/lib/msun/alpha/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/arm/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/msun/i387/s_scalbnf.S#2 integrate .. //depot/projects/hammer/lib/msun/i387/s_scalbnl.S#1 branch .. //depot/projects/hammer/lib/msun/ia64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/ia64/fenv.h#3 integrate .. //depot/projects/hammer/lib/msun/ia64/s_fmal.S#1 branch .. //depot/projects/hammer/lib/msun/man/fma.3#2 integrate .. //depot/projects/hammer/lib/msun/man/ieee.3#9 integrate .. //depot/projects/hammer/lib/msun/man/math.3#9 integrate .. //depot/projects/hammer/lib/msun/man/nextafter.3#2 integrate .. //depot/projects/hammer/lib/msun/man/scalbn.3#2 integrate .. //depot/projects/hammer/lib/msun/powerpc/Makefile.inc#1 branch .. //depot/projects/hammer/lib/msun/sparc64/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#27 integrate .. //depot/projects/hammer/lib/msun/src/s_fma.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_fmal.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_frexp.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_frexpl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_ldexp.c#2 delete .. //depot/projects/hammer/lib/msun/src/s_ldexpf.c#2 delete .. //depot/projects/hammer/lib/msun/src/s_nextafter.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_nextafterf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_nextafterl.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_nexttoward.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_nexttowardf.c#1 branch .. //depot/projects/hammer/lib/msun/src/s_rint.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_scalbln.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_scalbn.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_scalbnf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_scalbnl.c#1 branch .. //depot/projects/hammer/libexec/Makefile#28 integrate .. //depot/projects/hammer/libexec/rexecd/rexecd.c#5 integrate .. //depot/projects/hammer/release/Makefile#68 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/Makefile#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/Makefile#2 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#10 delete .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#72 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#12 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#86 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#16 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#7 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/Makefile#2 delete .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/early-adopter/article.sgml#4 delete .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/alpha/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/alpha/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#9 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/ia64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.sgml#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/Makefile#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#6 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#9 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#1 branch .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/catalog#2 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#1 branch .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#22 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#23 integrate .. //depot/projects/hammer/sbin/dump/tape.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#11 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#11 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#12 integrate .. //depot/projects/hammer/sbin/fsck_msdosfs/ext.h#6 integrate .. //depot/projects/hammer/sbin/md5/Makefile#4 integrate .. //depot/projects/hammer/sbin/md5/md5.1#7 integrate .. //depot/projects/hammer/sbin/md5/md5.c#7 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#19 integrate .. //depot/projects/hammer/share/colldef/Makefile#17 integrate .. //depot/projects/hammer/share/colldef/uk_UA.CP1251.src#1 branch .. //depot/projects/hammer/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#35 integrate .. //depot/projects/hammer/share/man/man4/Makefile#65 integrate .. //depot/projects/hammer/share/man/man4/aac.4#11 integrate .. //depot/projects/hammer/share/man/man4/amr.4#11 integrate .. //depot/projects/hammer/share/man/man4/ng_ccatm.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_ad1816.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_als4000.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_cmi.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_cs4281.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_ds1.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_es137x.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_ess.4#2 integrate .. //depot/projects/hammer/share/man/man4/snd_fm801.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_ich.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_solo.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_via82c686.4#1 branch .. //depot/projects/hammer/share/man/man4/snd_vibes.4#1 branch .. //depot/projects/hammer/share/man/man5/make.conf.5#34 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#50 integrate .. //depot/projects/hammer/share/man/man9/alq.9#5 integrate .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#8 integrate .. //depot/projects/hammer/share/man/man9/ktr.9#6 integrate .. //depot/projects/hammer/share/mk/bsd.compat.mk#3 integrate .. //depot/projects/hammer/share/mk/bsd.nls.mk#3 integrate .. //depot/projects/hammer/share/mklocale/Makefile#15 integrate .. //depot/projects/hammer/share/monetdef/Makefile#16 integrate .. //depot/projects/hammer/share/monetdef/uk_UA.CP1251.src#1 branch .. //depot/projects/hammer/share/msgdef/Makefile#17 integrate .. //depot/projects/hammer/share/msgdef/uk_UA.CP1251.src#1 branch .. //depot/projects/hammer/share/numericdef/Makefile#15 integrate .. //depot/projects/hammer/share/timedef/Makefile#17 integrate .. //depot/projects/hammer/share/timedef/uk_UA.CP1251.src#1 branch .. //depot/projects/hammer/sys/Makefile#9 integrate .. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#17 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#33 integrate .. //depot/projects/hammer/sys/alpha/include/_types.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#7 integrate .. //depot/projects/hammer/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/critical.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/endian.h#6 integrate .. //depot/projects/hammer/sys/alpha/include/in_cksum.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/ioctl_bt848.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/ioctl_meteor.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/limits.h#7 integrate .. //depot/projects/hammer/sys/alpha/include/stdarg.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/varargs.h#5 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#10 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#10 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#10 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#10 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#31 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#44 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#116 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#82 integrate .. //depot/projects/hammer/sys/amd64/amd64/mptable.c#39 integrate .. //depot/projects/hammer/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#64 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#30 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#30 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#25 integrate .. //depot/projects/hammer/sys/amd64/include/sf_buf.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#23 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#9 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#33 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#12 integrate .. //depot/projects/hammer/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/machdep.c#11 integrate .. //depot/projects/hammer/sys/arm/arm/pmap.c#17 integrate .. //depot/projects/hammer/sys/arm/arm/support.S#6 integrate .. //depot/projects/hammer/sys/arm/arm/swtch.S#13 integrate .. //depot/projects/hammer/sys/arm/include/_types.h#5 integrate .. //depot/projects/hammer/sys/arm/include/limits.h#7 integrate .. //depot/projects/hammer/sys/arm/include/stdarg.h#3 integrate .. //depot/projects/hammer/sys/boot/arc/include/arcfuncs.h#3 integrate .. //depot/projects/hammer/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/hammer/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_net.c#5 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#22 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#29 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#27 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#26 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#17 integrate .. //depot/projects/hammer/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/hammer/sys/compat/linux/linux_util.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#7 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#26 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#18 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#25 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#25 integrate .. //depot/projects/hammer/sys/conf/NOTES#82 integrate .. //depot/projects/hammer/sys/conf/files#106 integrate .. //depot/projects/hammer/sys/conf/files.i386#52 integrate .. //depot/projects/hammer/sys/conf/options#69 integrate .. //depot/projects/hammer/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/hptproc.c#3 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#4 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/hammer/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/hammer/sys/crypto/cast128/cast128.c#4 delete .. //depot/projects/hammer/sys/crypto/cast128/cast128.h#3 delete .. //depot/projects/hammer/sys/crypto/cast128/cast128sb.h#2 delete .. //depot/projects/hammer/sys/crypto/md5.c#5 delete .. //depot/projects/hammer/sys/crypto/md5.h#2 delete .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.c#5 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-alg-fst.h#4 delete .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.c#7 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api-fst.h#4 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael.h#3 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#20 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/hammer/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#56 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_battery.c#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_button.c#10 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#26 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#18 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_throttle.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#13 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#9 integrate .. //depot/projects/hammer/sys/dev/acpica/acpiio.h#7 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#40 integrate .. //depot/projects/hammer/sys/dev/adlink/adlink.c#11 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/amd/amd.c#12 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#18 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#16 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#14 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#28 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.c#1 branch .. //depot/projects/hammer/sys/dev/ath/ath_rate/sample/sample.h#1 branch .. //depot/projects/hammer/sys/dev/ath/if_ath.c#28 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#14 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#14 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#15 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#18 integrate .. //depot/projects/hammer/sys/dev/ciss/ciss.c#30 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#16 integrate .. //depot/projects/hammer/sys/dev/cx/machdep.h#5 integrate .. //depot/projects/hammer/sys/dev/cy/cy_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/digi/digi_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#39 integrate .. //depot/projects/hammer/sys/dev/en/if_en_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#7 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#5 integrate .. //depot/projects/hammer/sys/dev/fatm/if_fatm.c#9 integrate .. //depot/projects/hammer/sys/dev/fb/s3_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/fb/vgareg.h#4 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_isa.c#14 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#30 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#43 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#10 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#12 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/hatm/if_hatm.c#12 integrate .. //depot/projects/hammer/sys/dev/hfa/hfa_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/hifn/hifn7751.c#16 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/hptmv/access601.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/array.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/atapi.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/command.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/entry.c#6 integrate .. //depot/projects/hammer/sys/dev/hptmv/global.h#3 integrate .. //depot/projects/hammer/sys/dev/hptmv/gui_lib.c#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/i386-elf.raid.o.uu#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/mvSata.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/mvStorageDev.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/raid5n.h#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/readme.txt#2 integrate .. //depot/projects/hammer/sys/dev/hptmv/vdevice.h#2 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb.c#5 integrate .. //depot/projects/hammer/sys/dev/ichsmb/ichsmb_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/ida/ida_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/idt/idt_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/hammer/sys/dev/ieee488/upd7210.c#3 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#28 integrate .. //depot/projects/hammer/sys/dev/iir/iir.h#11 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#11 integrate .. //depot/projects/hammer/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/hammer/sys/dev/led/led.c#13 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#21 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/mcd/mcdreg.h#4 integrate .. //depot/projects/hammer/sys/dev/mlx/mlx_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#12 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/musycc/musycc.c#10 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#16 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#25 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_attach.c#7 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/pdq/if_fpa.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/pps.c#10 integrate .. //depot/projects/hammer/sys/dev/pst/pst-pci.c#7 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#15 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/random/hash.c#6 integrate .. //depot/projects/hammer/sys/dev/random/nehemiah.c#3 integrate .. //depot/projects/hammer/sys/dev/random/yarrow.c#7 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#23 integrate .. //depot/projects/hammer/sys/dev/rp/rp_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/safe/safe.c#6 integrate .. //depot/projects/hammer/sys/dev/sbsh/if_sbsh.c#6 integrate .. //depot/projects/hammer/sys/dev/scd/scdreg.h#4 integrate .. //depot/projects/hammer/sys/dev/si/si_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/sound/isa/ad1816.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/als4000.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/au88x0.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pci/aureal.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cmi.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/cs4281.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csa.c#7 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ds1.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/emu10k1.c#16 integrate .. //depot/projects/hammer/sys/dev/sound/pci/es137x.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/fm801.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/ich.c#19 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/maestro3.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/solo.c#11 integrate .. //depot/projects/hammer/sys/dev/sound/pci/t4dwave.c#12 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via8233.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/via82c686.c#13 integrate .. //depot/projects/hammer/sys/dev/sound/pci/vibes.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudio_pcm.c#8 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr_pci.c#7 integrate .. //depot/projects/hammer/sys/dev/stg/tmc18c30_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/sx/sx_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#15 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/tga/tga_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#17 integrate .. //depot/projects/hammer/sys/dev/twa/twa_freebsd.c#9 integrate .. //depot/projects/hammer/sys/dev/twe/twe_freebsd.c#15 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#18 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#15 integrate .. //depot/projects/hammer/sys/dev/uart/uart_core.c#10 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#13 integrate .. //depot/projects/hammer/sys/dev/usb/ehci.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/ehci_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ohci_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbcdc.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi_util.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi_util.h#6 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#33 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pci.c#12 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs.h#9 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#9 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_rule.c#8 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#28 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#12 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#13 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#9 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#12 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#30 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#12 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#11 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_init.c#8 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#21 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#63 integrate .. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#25 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/in_cksum.c#5 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#47 integrate .. //depot/projects/hammer/sys/i386/include/_types.h#8 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#7 integrate .. //depot/projects/hammer/sys/i386/include/bus_at386.h#7 integrate .. //depot/projects/hammer/sys/i386/include/clock.h#8 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#11 integrate .. //depot/projects/hammer/sys/i386/include/critical.h#7 integrate .. //depot/projects/hammer/sys/i386/include/endian.h#9 integrate .. //depot/projects/hammer/sys/i386/include/ieeefp.h#4 integrate .. //depot/projects/hammer/sys/i386/include/in_cksum.h#5 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_bt848.h#4 integrate .. //depot/projects/hammer/sys/i386/include/ioctl_meteor.h#4 integrate .. //depot/projects/hammer/sys/i386/include/limits.h#7 integrate .. //depot/projects/hammer/sys/i386/include/pcpu.h#9 integrate .. //depot/projects/hammer/sys/i386/include/profile.h#12 integrate .. //depot/projects/hammer/sys/i386/include/stdarg.h#7 integrate .. //depot/projects/hammer/sys/i386/include/varargs.h#6 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#21 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#23 integrate .. //depot/projects/hammer/sys/i386/isa/prof_machdep.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#10 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#13 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#13 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#17 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#48 integrate .. //depot/projects/hammer/sys/ia64/include/_types.h#7 integrate .. //depot/projects/hammer/sys/ia64/include/cpufunc.h#10 integrate .. //depot/projects/hammer/sys/ia64/include/critical.h#5 integrate .. //depot/projects/hammer/sys/ia64/include/endian.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/in_cksum.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/limits.h#7 integrate .. //depot/projects/hammer/sys/ia64/include/stdarg.h#5 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#14 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#42 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#18 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#56 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#75 integrate .. //depot/projects/hammer/sys/kern/kern_umtx.c#19 integrate .. //depot/projects/hammer/sys/kern/subr_hints.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_unit.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#39 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#16 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#41 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#41 integrate .. //depot/projects/hammer/sys/kern/tty.c#42 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#27 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#53 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#33 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#46 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#51 integrate .. //depot/projects/hammer/sys/modules/Makefile#68 integrate .. //depot/projects/hammer/sys/modules/ath_rate_sample/Makefile#1 branch .. //depot/projects/hammer/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/hptmv/Makefile#3 integrate .. //depot/projects/hammer/sys/net/bpf.c#28 integrate .. //depot/projects/hammer/sys/net/bridge.c#23 integrate .. //depot/projects/hammer/sys/net/if_ef.c#12 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#40 integrate .. //depot/projects/hammer/sys/net/if_var.h#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/hammer/sys/netgraph/netflow/netflow.c#7 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#16 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#28 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#17 integrate .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#9 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.h#5 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#20 integrate .. //depot/projects/hammer/sys/netinet/in.c#13 integrate .. //depot/projects/hammer/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#27 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#51 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#40 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#25 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#25 integrate .. //depot/projects/hammer/sys/netinet6/esp_core.c#8 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/hammer/sys/netinet6/ipsec.c#16 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/hammer/sys/netipx/README#3 integrate .. //depot/projects/hammer/sys/opencrypto/cryptosoft.c#8 integrate .. //depot/projects/hammer/sys/opencrypto/rijndael.c#5 delete .. //depot/projects/hammer/sys/opencrypto/rijndael.h#3 delete .. //depot/projects/hammer/sys/opencrypto/xform.c#4 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#11 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#41 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#17 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#42 integrate .. //depot/projects/hammer/sys/powerpc/include/_types.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/critical.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/endian.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/in_cksum.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/limits.h#7 integrate .. //depot/projects/hammer/sys/powerpc/include/stdarg.h#6 integrate .. //depot/projects/hammer/sys/powerpc/include/varargs.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#14 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#34 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#35 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#4 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#36 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#4 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#4 integrate .. //depot/projects/hammer/sys/sparc64/fhc/fhcvar.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/_types.h#7 integrate .. //depot/projects/hammer/sys/sparc64/include/critical.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/endian.h#6 integrate .. //depot/projects/hammer/sys/sparc64/include/limits.h#6 integrate .. //depot/projects/hammer/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/hammer/sys/sparc64/include/stdarg.h#6 integrate .. //depot/projects/hammer/sys/sparc64/include/varargs.h#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#14 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/intr_machdep.c#10 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#38 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#33 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#18 integrate .. //depot/projects/hammer/sys/sys/conf.h#29 integrate .. //depot/projects/hammer/sys/sys/dir.h#5 integrate .. //depot/projects/hammer/sys/sys/event.h#6 integrate .. //depot/projects/hammer/sys/sys/filio.h#3 integrate .. //depot/projects/hammer/sys/sys/ioctl.h#5 integrate .. //depot/projects/hammer/sys/sys/ktr.h#11 integrate .. //depot/projects/hammer/sys/sys/linker_set.h#7 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#38 integrate .. //depot/projects/hammer/sys/sys/mutex.h#16 integrate .. //depot/projects/hammer/sys/sys/param.h#55 integrate .. //depot/projects/hammer/sys/sys/proc.h#75 integrate .. //depot/projects/hammer/sys/sys/queue.h#6 integrate .. //depot/projects/hammer/sys/sys/socket.h#17 integrate .. //depot/projects/hammer/sys/sys/syscall.h#40 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#40 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#17 integrate .. //depot/projects/hammer/sys/sys/sysctl.h#24 integrate .. //depot/projects/hammer/sys/sys/syslimits.h#10 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#40 integrate .. //depot/projects/hammer/sys/sys/systm.h#31 integrate .. //depot/projects/hammer/sys/sys/umtx.h#10 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#34 integrate .. //depot/projects/hammer/tools/build/Makefile#6 integrate .. //depot/projects/hammer/tools/build/cross-build/Makefile#1 branch .. //depot/projects/hammer/tools/build/cross-build/date.sh#1 branch .. //depot/projects/hammer/tools/build/cross-build/hostname.sh#1 branch .. //depot/projects/hammer/tools/build/make_check/Makefile#2 integrate .. //depot/projects/hammer/tools/build/make_check/regress.t#2 integrate .. //depot/projects/hammer/tools/build/make_check/shell_test.sh#2 integrate .. //depot/projects/hammer/tools/regression/aio/kqueue/Makefile#1 branch .. //depot/projects/hammer/tools/regression/aio/kqueue/aio_kqueue.c#1 branch .. //depot/projects/hammer/tools/regression/aio/kqueue/lio/Makefile#1 branch .. //depot/projects/hammer/tools/regression/aio/kqueue/lio/lio_kqueue.c#1 branch .. //depot/projects/hammer/tools/regression/lib/libc/stdio/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-printfloat.c#8 integrate .. //depot/projects/hammer/tools/regression/lib/libc/stdio/test-scanfloat.c#4 integrate .. //depot/projects/hammer/tools/regression/lib/msun/Makefile#4 integrate .. //depot/projects/hammer/tools/regression/lib/msun/test-next.c#1 branch .. //depot/projects/hammer/tools/regression/lib/msun/test-next.t#1 branch .. //depot/projects/hammer/tools/regression/sockets/sigpipe/Makefile#1 branch .. //depot/projects/hammer/tools/regression/sockets/sigpipe/sigpipe.c#1 branch .. //depot/projects/hammer/tools/regression/usr.bin/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/usr.bin/make/Makefile#16 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2B.out#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.shell_2j.out#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.sysvmatch.out#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.t#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/regress.variables.out#2 delete .. //depot/projects/hammer/tools/regression/usr.bin/make/shell_test.sh#2 delete .. //depot/projects/hammer/tools/tools/README#13 integrate .. //depot/projects/hammer/tools/tools/sysdoc/Makefile#1 branch .. //depot/projects/hammer/tools/tools/sysdoc/sysctl.sh#1 branch .. //depot/projects/hammer/tools/tools/sysdoc/sysdoc.sh#1 branch .. //depot/projects/hammer/tools/tools/sysdoc/tunables.mdoc#1 branch .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#14 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#23 integrate .. //depot/projects/hammer/usr.bin/Makefile#41 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#32 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.c#7 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.8#4 integrate .. //depot/projects/hammer/usr.bin/make/GNode.h#2 integrate .. //depot/projects/hammer/usr.bin/make/arch.c#14 integrate .. //depot/projects/hammer/usr.bin/make/buf.c#8 integrate .. //depot/projects/hammer/usr.bin/make/buf.h#7 integrate .. //depot/projects/hammer/usr.bin/make/compat.c#17 integrate .. //depot/projects/hammer/usr.bin/make/cond.c#15 integrate .. //depot/projects/hammer/usr.bin/make/for.c#15 integrate .. //depot/projects/hammer/usr.bin/make/job.c#22 integrate .. //depot/projects/hammer/usr.bin/make/lst.h#11 integrate .. //depot/projects/hammer/usr.bin/make/main.c#29 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#24 integrate .. //depot/projects/hammer/usr.bin/make/pathnames.h#3 integrate .. //depot/projects/hammer/usr.bin/make/str.c#12 integrate .. //depot/projects/hammer/usr.bin/make/str.h#2 integrate .. //depot/projects/hammer/usr.bin/make/suff.c#15 integrate .. //depot/projects/hammer/usr.bin/make/suff.h#2 integrate .. //depot/projects/hammer/usr.bin/make/util.c#5 integrate .. //depot/projects/hammer/usr.bin/make/util.h#3 integrate .. //depot/projects/hammer/usr.bin/make/var.c#22 integrate .. //depot/projects/hammer/usr.bin/make/var.h#7 integrate .. //depot/projects/hammer/usr.bin/netstat/inet.c#15 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.c#6 integrate .. //depot/projects/hammer/usr.bin/sed/compile.c#5 integrate .. //depot/projects/hammer/usr.bin/talk/get_iface.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/syscalls.c#16 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.1#5 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#7 integrate .. //depot/projects/hammer/usr.sbin/dconschat/dconschat.c#7 integrate .. //depot/projects/hammer/usr.sbin/kldxref/ef_powerpc.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/cred.c#1 branch .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.8#4 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.c#4 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/portal.conf#2 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/portald.h#3 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_conf.c#4 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_file.c#4 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/pt_pipe.c#1 branch .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#14 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#21 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.8#7 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/cdrom.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#25 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#19 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_dnslookup.c#4 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#3 integrate Differences ... ==== //depot/projects/hammer/Makefile#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.317 2005/02/27 12:11:34 ru Exp $ +# $FreeBSD: src/Makefile,v 1.318 2005/03/02 12:33:22 harti Exp $ # # The user-driven targets are: # @@ -217,7 +217,7 @@ # for building the world. # upgrade_checks: - @if ! (cd ${.CURDIR}/tools/regression/usr.bin/make && \ + @if ! (cd ${.CURDIR}/tools/build/make_check && \ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ ==== //depot/projects/hammer/Makefile.inc1#86 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.486 2005/02/28 09:23:38 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.488 2005/03/02 16:40:50 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -127,12 +127,12 @@ .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE} == ${TARGET} +.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif -WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} +WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games @@ -798,6 +798,10 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 600020 +_pwd_mkdb= usr.sbin/pwd_mkdb +.endif + bootstrap-tools: .for _tool in \ ${_strfile} \ @@ -813,7 +817,8 @@ usr.bin/rpcgen \ usr.bin/xinstall \ usr.sbin/config \ - ${_crunchgen} + ${_crunchgen} \ + ${_pwd_mkdb} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/hammer/UPDATING#74 (text+ko) ==== @@ -6,7 +6,7 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running -portupgrade. Important recent entries: 20040724 (default X changes). +portupgrade. NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW: FreeBSD 6.x has many debugging features turned on, in @@ -48,6 +48,16 @@ "options CPU_ENABLE_TCC" obsolete. Please load cpufreq.ko or compile in "device cpufreq" to restore this functionality. +20050220: + The responsibility of recomputing the file system summary of + a SoftUpdates-enabled dirty volume has been transferred to the + background fsck. A rebuild of fsck(8) utility is recommended + if you have updated the kernel. + + To get the old behavior (recompute file system summary at mount + time), you can set vfs.ffs.compute_summary_at_mount=1 before + mounting the new volume. + 20050206: The cpufreq import is complete. As part of this, the sysctls for acpi(4) throttling have been removed. The power_profile script @@ -132,12 +142,6 @@ COMMON ITEMS: - # NOTE: 5.x below applies to 6.0-current as well, for the - # moment. 4.any -> 5.any upgrade support will remain in - # place for 6.0 current, but after 5.3 RELEASE, the 4.any -> - # 6.0-current upgrade path will require moving through 5.3 - # RELEASE or newer. - General Notes ------------- Avoid using make -j when upgrading. From time to time in the @@ -219,28 +223,14 @@ - To upgrade in-place from 4.x-stable to current + To upgrade in-place from 5.x-stable to current ---------------------------------------------- - # 5.x uses more space than 4.x. Also, the location of kernel - # modules has changed. If you are installing 5.x onto a 4.x - # system, you'll need about 30MB of free disk space on your / - # partition. If you have less than this, you may encounter difficult - # to back out of problems with this procedure. If /tmp is on - # the / partition, you may want to completely remove all its content - # before upgrading, as this can be a common source of shortage of - # space on /. - - [7] make buildworld [9] - cp sys/${MACHINE}/conf/GENERIC.hints /boot/device.hints [2] make kernel KERNCONF=YOUR_KERNEL_HERE [8] - cd sys/boot ; make STRIP="" install [6] [1] [3] - src/etc/rc.d/preseedrandom [10] mergemaster -p [5] - rm -rf /usr/include/g++ make installworld mergemaster -i [4] @@ -261,10 +251,6 @@ should disable them at this point so they don't crash your system on reboot. - [2] If you have legacy ISA devices, you may need to create - your own device.hints to reflect your unique hardware - configuration. - [3] From the bootblocks, boot -s, and then do fsck -p mount -u / @@ -273,9 +259,6 @@ adjkerntz -i # if CMOS is wall time Also, when doing a major release upgrade, it is required that you boot into single user mode to do the installworld. - For the 4.x -> 5.x upgrade, you will also see many messages about - needing to recompile your userland. These are harmless and can - be ignored while you proceed to the next step. [4] Note: This step is non-optional. Failure to do this step can result in a significant reduction in the functionality of the @@ -291,21 +274,6 @@ install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. - [6] 4.x boot loader can be used to boot a 5.x system, however - it is difficult to do that at best. If you wish to try, then - you should interrupt the boot and at the ok prompt type: - ok unload - ok boot /boot/kernel/kernel - If this fails to work, you must install a new boot loader as - described here. - - [7] Before you upgrade, please make sure that you are not using - compatibility slices. These are device names of the form /dev/ad0a - without the actual slice name. These will break with 5.x and newer. - You generally must update these entries to use the post FreeBSD - 2.x form of /dev/ad0s1a. i386 and pc98 are affected, while alpha - is not. - [8] In order to have a kernel that can run the 4.x binaries needed to do an installworld, you must include the COMPAT_FREEBSD4 option in your kernel. Failure to do so may leave you with a system @@ -324,26 +292,16 @@ MAKEOBJDIRPREFIX must be defined in an environment variable, and not on the command line, or in /etc/make.conf. buildworld will warn if it is improperly defined. - - In case you would like to avoid installing new packages of everything, - you might want to uncomment the "COMPAT4X= YES" entry, so that 4.x - compatibility libraries are built which should allow you to continue - using your existing software for a while. Alternatively, you can - install the misc/compat4x port. - - [10] In order to create temporary files, /dev/random must be - initialized by feeding data into it. src/etc/rc.d/preseedrandom - takes care of this. FORMAT: This file contains a list, in reverse chronological order, of major breakages in tracking -current. Not all things will be listed here, -and it only starts on March 15, 2000. Updating files can found in +and it only starts on October 16, 2004. Updating files can found in previous releases if your system is older than this. Copyright information: -Copyright 1998-2004 M. Warner Losh. All Rights Reserved. +Copyright 1998-2005 M. Warner Losh. All Rights Reserved. Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this @@ -367,4 +325,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.397 2005/02/26 22:26:10 ru Exp $ +$FreeBSD: src/UPDATING,v 1.400 2005/03/03 08:44:33 imp Exp $ ==== //depot/projects/hammer/bin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.24 2004/01/16 15:23:18 ru Exp $ +# $FreeBSD: src/bin/Makefile,v 1.25 2005/03/02 11:53:21 trhodes Exp $ SUBDIR= cat \ chflags \ @@ -37,7 +37,7 @@ sync \ test -.if !defined(NO_RCMNDS) +.if !defined(NO_RCMDS) _rcp= rcp .endif ==== //depot/projects/hammer/bin/sh/parser.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.51 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.52 2005/03/01 03:35:58 obrien Exp $"); #include @@ -63,7 +63,8 @@ * Shell command parser. */ -#define EOFMARKLEN 79 +#define EOFMARKLEN 79 +#define PROMPTLEN 128 /* values returned by readtoken */ #include "token.h" @@ -1562,14 +1563,100 @@ char * getprompt(void *unused __unused) { + static char ps[PROMPTLEN]; + char *fmt; + int i, j, trim; + + /* + * Select prompt format. + */ switch (whichprompt) { case 0: - return ""; + fmt = ""; + break; case 1: - return ps1val(); + fmt = ps1val(); + break; case 2: - return ps2val(); + fmt = ps2val(); + break; default: return ""; } + + /* + * Format prompt string. + */ + for (i = 0; (i < 127) && (*fmt != '\0'); i++, fmt++) + if (*fmt == '\\') + switch (*++fmt) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 11 20:49:32 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28CF616A4D0; Fri, 11 Mar 2005 20:49:32 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F25F716A4CE for ; Fri, 11 Mar 2005 20:49:31 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84F9843D58 for ; Fri, 11 Mar 2005 20:49:31 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2BKnVaF043617 for ; Fri, 11 Mar 2005 20:49:31 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BKnV6o043614 for perforce@freebsd.org; Fri, 11 Mar 2005 20:49:31 GMT (envelope-from peter@freebsd.org) Date: Fri, 11 Mar 2005 20:49:31 GMT Message-Id: <200503112049.j2BKnV6o043614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 72925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2005 20:49:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=72925 Change 72925 by peter@peter_daintree on 2005/03/11 20:48:57 integ -b i386_hammer. Attempt to unspam the !@#%!@# compiler kludges where the same changes were made gratuitously differently in both branches (different whitespace etc. grrr!) Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#32 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#38 integrate .. //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#45 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#117 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#58 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/clock.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#31 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#19 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#21 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#26 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#10 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#34 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/acpi_wakeup.c#13 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#32 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#25 (text+ko) ==== @@ -77,7 +77,7 @@ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") -#else /* !__GNUCLIKE_ASM */ +#else /* !(__GNUCLIKE_ASM && !lint) */ void fldcw(caddr_t addr); void fnclex(void); @@ -89,7 +89,7 @@ void start_emulating(void); void stop_emulating(void); -#endif /* __GNUCLIKE_ASM */ +#endif /* __GNUCLIKE_ASM && !lint */ #define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_cw) #define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_env.en_sw) ==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#38 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/in_cksum.c#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#45 (text+ko) ==== @@ -67,9 +67,9 @@ CTASSERT(APIC_LOCAL_INTS == 240); CTASSERT(IPI_STOP < APIC_SPURIOUS_INT); -#define LAPIC_TIMER_HZ_DIVIDER 3 -#define LAPIC_TIMER_STATHZ_DIVIDER 23 -#define LAPIC_TIMER_PROFHZ_DIVIDER 2 +#define LAPIC_TIMER_HZ_DIVIDER 2 +#define LAPIC_TIMER_STATHZ_DIVIDER 15 +#define LAPIC_TIMER_PROFHZ_DIVIDER 3 /* * Support for local APICs. Local APICs manage interrupts on each @@ -131,8 +131,6 @@ volatile lapic_t *lapic; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; -static u_long *lapic_virtual_hardclock, *lapic_virtual_statclock, - *lapic_virtual_profclock; static void lapic_enable(void); static void lapic_timer_enable_intr(void); @@ -370,9 +368,6 @@ stathz = lapic_timer_hz / LAPIC_TIMER_STATHZ_DIVIDER; profhz = lapic_timer_hz / LAPIC_TIMER_PROFHZ_DIVIDER; lapic_timer_period = value / lapic_timer_hz; - intrcnt_add("lapic: hardclock", &lapic_virtual_hardclock); - intrcnt_add("lapic: statclock", &lapic_virtual_statclock); - intrcnt_add("lapic: profclock", &lapic_virtual_profclock); /* * Start up the timer on the BSP. The APs will kick off their @@ -627,10 +622,9 @@ la->la_hard_ticks += hz; if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) { - (*lapic_virtual_hardclock)++; + if (PCPU_GET(cpuid) == 0) hardclock(&frame); - } else + else hardclock_process(&frame); } @@ -638,8 +632,6 @@ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_statclock)++; statclock(&frame); } @@ -647,8 +639,6 @@ la->la_prof_ticks += profhz; if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; - if (PCPU_GET(cpuid) == 0) - (*lapic_virtual_profclock)++; if (profprocs != 0) profclock(&frame); } ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#117 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/NOTES#58 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1187) +# (XXX from i386:NOTES,v 1.1188) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.26 2005/02/28 00:58:06 obrien Exp $ # @@ -255,6 +255,7 @@ device ath_hal # Atheros HAL (includes binary component) device ath_rate_onoe # Onoe rate control for ath driver #device ath_rate_amrr # AMRR rate control for ath driver +#device ath_rate_sample # SampleRate rate control for the ath driver device wlan # 802.11 layer # ==== //depot/projects/hammer/sys/amd64/include/_types.h#12 (text+ko) ==== @@ -108,8 +108,8 @@ #endif #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ && !defined(__NO_GNUC_VA_LIST) -#define __GNUC_VA_LIST -typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ +#define __GNUC_VA_LIST +typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif #endif /* !_MACHINE__TYPES_H_ */ ==== //depot/projects/hammer/sys/amd64/include/atomic.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#13 (text+ko) ==== @@ -72,6 +72,10 @@ #ifndef _AMD64_BUS_AMD64_H_ #define _AMD64_BUS_AMD64_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include #ifndef _SYS_CDEFS_H_ @@ -437,7 +441,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: inw %w2,%%ax \n\ @@ -456,7 +460,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -479,7 +483,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: inl %w2,%%eax \n\ @@ -498,7 +502,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -627,7 +631,7 @@ else #endif { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -656,7 +660,7 @@ else #endif { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -685,7 +689,7 @@ else #endif { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -735,7 +739,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsb \n\ @@ -754,7 +758,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -777,7 +781,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsw \n\ @@ -796,7 +800,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -819,7 +823,7 @@ #endif { int _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ 1: lodsl \n\ @@ -838,7 +842,7 @@ #endif { bus_space_handle_t _port_ = bsh + offset; -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM __asm __volatile(" \n\ cld \n\ repne \n\ @@ -1217,7 +1221,7 @@ bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused, bus_size_t offset __unused, bus_size_t len __unused, int flags) { -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM if (flags & BUS_SPACE_BARRIER_READ) __asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory"); else ==== //depot/projects/hammer/sys/amd64/include/clock.h#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#31 (text+ko) ==== @@ -161,7 +161,7 @@ #define inb(port) inbv(port) #define outb(port, data) outbv(port, data) -#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ +#else /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3 */ /* * The following complications are to get around gcc not having a @@ -208,7 +208,7 @@ __asm __volatile("outb %0,%1" : : "a" (data), "id" ((u_short)(port))); } -#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P */ +#endif /* __GNUCLIKE_BUILTIN_CONSTANT_P && __GNUCLIKE_ASM >= 3*/ static __inline u_char inbv(u_int port) ==== //depot/projects/hammer/sys/amd64/include/critical.h#19 (text+ko) ==== @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#ifdef __CC_SUPPORTS___INLINE +#ifdef __CC_SUPPORTS___INLINE /* * cpu_critical_enter: @@ -79,7 +79,7 @@ void cpu_critical_enter(struct thread *td); void cpu_critical_exit(struct thread *td); -#endif /* __CC_SUPPORTS___INLINE */ +#endif /* __CC_SUPPORTS___INLINE */ __END_DECLS ==== //depot/projects/hammer/sys/amd64/include/endian.h#12 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/ieeefp.h#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#12 (text+ko) ==== @@ -35,6 +35,10 @@ #ifndef _MACHINE_IN_CKSUM_H_ #define _MACHINE_IN_CKSUM_H_ 1 +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include #define in_cksum(m, len) in_cksum_skip(m, len, 0) ==== //depot/projects/hammer/sys/amd64/include/limits.h#11 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#21 (text+ko) ==== @@ -59,8 +59,8 @@ #define PCPU_PTR(member) (&pcpup->pc_ ## member) #define PCPU_SET(member,value) (pcpup->pc_ ## member = (value)) -#elif defined(__GNUCLIKE___TYPEOF) && defined(__GNUCLIKE___OFFSETOF) \ - && defined(__GNUCLIKE_ASM) +#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) \ + && defined(__GNUCLIKE___OFFSETOF) /* * Evaluates to the byte offset of the per-cpu variable name. ==== //depot/projects/hammer/sys/amd64/include/profile.h#26 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/profile.h,v 1.44 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/i386/include/profile.h,v 1.40 2005/03/02 21:33:26 joerg Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -75,7 +75,7 @@ #define MEXITCOUNT_OVERHEAD_GETLABEL() #else #error this file needs to be ported to your compiler -#endif /* __GNUCLIKE_ASM */ +#endif /* !__GNUCLIKE_ASM */ #else /* !GUPROF */ #define MCOUNT_DECL(s) u_long s; #ifdef SMP @@ -112,7 +112,7 @@ static void _mcount(uintfptr_t frompc, uintfptr_t selfpc) __used; \ static void _mcount -#ifdef __GNUCLIKE_ASM +#ifdef __GNUCLIKE_ASM #define MCOUNT __asm(" \n\ .globl .mcount \n\ .type .mcount @function \n\ ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#9 (text+ko) ==== @@ -39,7 +39,8 @@ typedef __va_list va_list; #endif -#if defined(__GNUCLIKE_BUILTIN_STDARG) +#ifdef __GNUCLIKE_BUILTIN_STDARG + #define va_start(ap, last) \ __builtin_stdarg_start((ap), (last)) ==== //depot/projects/hammer/sys/amd64/include/varargs.h#10 (text+ko) ==== @@ -71,7 +71,7 @@ #define __va_size(type) \ (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int)) -#ifdef __GNUCLIKE_BUILTIN_VAALIST +#if defined(__GNUCLIKE_BUILTIN_VAALIST) #define va_alist __builtin_va_alist #endif #define va_dcl int va_alist; ... ==== //depot/projects/hammer/sys/amd64/isa/clock.c#34 (text+ko) ==== @@ -89,6 +89,7 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) + int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ @@ -154,6 +155,7 @@ hardclock(frame); } + int acquire_timer2(int mode) { @@ -174,6 +176,7 @@ return (0); } + int release_timer2() { From owner-p4-projects@FreeBSD.ORG Fri Mar 11 21:31:40 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63F6416A4D0; Fri, 11 Mar 2005 21:31:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E91FB16A4D0; Fri, 11 Mar 2005 21:31:36 +0000 (GMT) Received: from dragon.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D55B43D49; Fri, 11 Mar 2005 21:31:34 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.13.1/8.13.1) with ESMTP id j2BLVYhp014909; Fri, 11 Mar 2005 13:31:34 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.13.3/8.13.1/Submit) id j2BLVYwG014908; Fri, 11 Mar 2005 13:31:34 -0800 (PST) (envelope-from obrien) Date: Fri, 11 Mar 2005 13:31:34 -0800 From: "David O'Brien" To: Peter Wemm Message-ID: <20050311213134.GA14873@dragon.nuxi.com> References: <200503112049.j2BKnV6o043614@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200503112049.j2BKnV6o043614@repoman.freebsd.org> X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 User-Agent: Mutt/1.5.8i cc: Perforce Change Reviews Subject: Re: PERFORCE change 72925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2005 21:31:40 -0000 On Fri, Mar 11, 2005 at 08:49:31PM +0000, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=72925 > > Change 72925 by peter@peter_daintree on 2005/03/11 20:48:57 > > integ -b i386_hammer. Attempt to unspam the !@#%!@# compiler kludges where > the same changes were made gratuitously differently in both branches (different > whitespace etc. grrr!) Isn't it time we created /sys/x86 for all the shared files? From owner-p4-projects@FreeBSD.ORG Fri Mar 11 22:26:36 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6787916A4D0; Fri, 11 Mar 2005 22:26:36 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2893E16A4CE for ; Fri, 11 Mar 2005 22:26:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 270AA43D31 for ; Fri, 11 Mar 2005 22:26:35 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2BMQZ6N049099 for ; Fri, 11 Mar 2005 22:26:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BMQY66049096 for perforce@freebsd.org; Fri, 11 Mar 2005 22:26:34 GMT (envelope-from peter@freebsd.org) Date: Fri, 11 Mar 2005 22:26:34 GMT Message-Id: <200503112226.j2BMQY66049096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 72934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2005 22:26:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=72934 Change 72934 by peter@peter_daintree on 2005/03/11 22:25:33 IFC @72933 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#46 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/bus_amd64.h#14 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#32 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#22 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#27 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/varargs.h#11 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#35 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael.h#4 integrate .. //depot/projects/hammer/sys/i386/include/critical.h#8 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#22 integrate .. //depot/projects/hammer/sys/kern/uipc_accf.c#7 integrate .. //depot/projects/hammer/sys/modules/Makefile#69 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.156 2005/03/02 21:33:21 joerg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#46 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.12 2005/02/28 23:37:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.13 2005/03/11 22:12:38 peter Exp $"); #include #include ==== //depot/projects/hammer/sys/amd64/include/_types.h#13 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.7 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.8 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/bus_amd64.h#14 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.28 2005/03/02 21:33:21 joerg Exp $ */ +/* $FreeBSD: src/sys/amd64/include/bus_amd64.h,v 1.29 2005/03/11 22:16:09 peter Exp $ */ #ifndef _AMD64_BUS_AMD64_H_ #define _AMD64_BUS_AMD64_H_ ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#32 (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/include/cpufunc.h,v 1.146 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.147 2005/03/11 22:16:09 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/critical.h#20 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.9 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.10 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/hammer/sys/amd64/include/endian.h#13 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/amd64/include/endian.h,v 1.7 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/endian.h,v 1.8 2005/03/11 21:46:01 peter Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -36,6 +36,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* * Define the order of 32-bit words in 64-bit words. */ @@ -188,4 +192,8 @@ #endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */ +#ifdef __cplusplus +} +#endif + #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/hammer/sys/amd64/include/in_cksum.h#13 (text+ko) ==== @@ -29,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.4 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/in_cksum.h,v 1.5 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#22 (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/pcpu.h,v 1.43 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE_PCPU_H_ ==== //depot/projects/hammer/sys/amd64/include/profile.h#27 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/profile.h,v 1.40 2005/03/02 21:33:26 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/profile.h,v 1.45 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.7 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.8 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE_STDARG_H_ ==== //depot/projects/hammer/sys/amd64/include/varargs.h#11 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.13 2005/03/02 21:33:21 joerg Exp $ + * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.14 2005/03/11 22:16:09 peter Exp $ */ #ifndef _MACHINE_VARARGS_H_ ==== //depot/projects/hammer/sys/amd64/isa/clock.c#35 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.216 2005/02/28 23:37:35 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.217 2005/03/11 21:57:38 peter Exp $"); /* * Routines to handle clock hardware. @@ -832,7 +832,7 @@ if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || ((count < 20 || (!(rflags & PSL_I) && count < timer0_max_count / 2u)) && - i8254_intsrc != NULL && i8254_pending(i8254_intsrc))))) { + i8254_pending != NULL && i8254_pending(i8254_intsrc))))) { i8254_ticked = 1; i8254_offset += timer0_max_count; } ==== //depot/projects/hammer/sys/crypto/rijndael/rijndael.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $ */ -/* $FreeBSD: src/sys/crypto/rijndael/rijndael.h,v 1.5 2005/03/11 17:24:46 ume Exp $ */ +/* $FreeBSD: src/sys/crypto/rijndael/rijndael.h,v 1.6 2005/03/11 22:07:04 ume Exp $ */ /** * rijndael-alg-fst.h @@ -45,13 +45,11 @@ void rijndael_decrypt(const rijndael_ctx *, const u_char *, u_char *); void rijndael_encrypt(const rijndael_ctx *, const u_char *, u_char *); -#ifdef _KERNEL int rijndaelKeySetupEnc(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int); int rijndaelKeySetupDec(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int); void rijndaelEncrypt(const u_int32_t [/*4*(Nr+1)*/], int, const u_int8_t[16], u_int8_t [16]); void rijndaelDecrypt(const u_int32_t [/*4*(Nr+1)*/], int, const u_int8_t [16], u_int8_t [16]); -#endif #endif /* __RIJNDAEL_H */ ==== //depot/projects/hammer/sys/i386/include/critical.h#8 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/i386/include/critical.h,v 1.9 2005/03/02 21:33:26 joerg Exp $ + * $FreeBSD: src/sys/i386/include/critical.h,v 1.10 2005/03/11 21:42:11 peter Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -53,14 +53,11 @@ * * This routine is called from critical_enter() on the 0->1 transition * of td_critnest, prior to it being incremented to 1. - * - * If new-style critical section handling we do not have to do anything. - * However, as a side effect any interrupts occuring while td_critnest - * is non-zero will be deferred. */ static __inline void cpu_critical_enter(struct thread *td) { + td->td_md.md_savecrit = intr_disable(); } @@ -70,10 +67,6 @@ * This routine is called from critical_exit() on a 1->0 transition * of td_critnest, after it has been decremented to 0. We are * exiting the last critical section. - * - * Note that the td->critnest (1->0) transition interrupt race against - * our int_pending/unpend() check below is handled by the interrupt - * code for us, so we do not have to do anything fancy. */ static __inline void cpu_critical_exit(struct thread *td) ==== //depot/projects/hammer/sys/i386/isa/clock.c#22 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.216 2005/03/09 15:33:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.217 2005/03/11 22:10:25 peter Exp $"); /* * Routines to handle clock hardware. @@ -98,7 +98,6 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) - int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ @@ -169,7 +168,6 @@ #endif } - int acquire_timer2(int mode) { @@ -190,7 +188,6 @@ return (0); } - int release_timer2() { ==== //depot/projects/hammer/sys/kern/uipc_accf.c#7 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2000 Paycounter, Inc. + * Copyright (c) 2005 Robert N. M. Watson * Author: Alfred Perlstein , * All rights reserved. * @@ -26,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.15 2005/02/18 19:01:22 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_accf.c,v 1.16 2005/03/11 21:37:45 rwatson Exp $"); #define ACCEPT_FILTER_MOD @@ -169,33 +170,23 @@ struct so_accf *newaf; int error = 0; - newaf = NULL; - afap = NULL; - /* - * XXXRW: Configuring accept filters should be an atomic test-and-set - * operation to prevent races during setup and attach. There may be - * more general issues of racing and ordering here that are not yet - * addressed by locking. + * Handle the simple delete case first. */ - /* do not set/remove accept filters on non listen sockets */ - SOCK_LOCK(so); - if ((so->so_options & SO_ACCEPTCONN) == 0) { - SOCK_UNLOCK(so); - return (EINVAL); - } - - /* removing the filter */ if (sopt == NULL) { + SOCK_LOCK(so); + if ((so->so_options & SO_ACCEPTCONN) == 0) { + SOCK_UNLOCK(so); + return (EINVAL); + } if (so->so_accf != NULL) { struct so_accf *af = so->so_accf; if (af->so_accept_filter != NULL && af->so_accept_filter->accf_destroy != NULL) { af->so_accept_filter->accf_destroy(so); } - if (af->so_accept_filter_str != NULL) { + if (af->so_accept_filter_str != NULL) FREE(af->so_accept_filter_str, M_ACCF); - } FREE(af, M_ACCF); so->so_accf = NULL; } @@ -203,6 +194,22 @@ SOCK_UNLOCK(so); return (0); } + + newaf = NULL; + afap = NULL; + + /* + * XXXRW: Configuring accept filters should be an atomic test-and-set + * operation to prevent races during setup and attach. There may be + * more general issues of racing and ordering here that are not yet + * addressed by locking. + */ + /* do not set/remove accept filters on non listen sockets */ + SOCK_LOCK(so); + if ((so->so_options & SO_ACCEPTCONN) == 0) { + SOCK_UNLOCK(so); + return (EINVAL); + } SOCK_UNLOCK(so); /*- ==== //depot/projects/hammer/sys/modules/Makefile#69 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.430 2005/03/11 01:39:56 sam Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.431 2005/03/11 19:40:34 sam Exp $ # oldcard -- specialized use for debugging only. # owi -- totally unsupported for debugging only. @@ -26,8 +26,8 @@ ath \ ${_ath_hal} \ ath_rate_amrr \ + ath_rate_sample \ ath_rate_onoe \ - ath_rate_sample \ aue \ ${_auxio} \ ${_awi} \ From owner-p4-projects@FreeBSD.ORG Fri Mar 11 22:27:37 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2790716A4D0; Fri, 11 Mar 2005 22:27:37 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3C1616A4CE for ; Fri, 11 Mar 2005 22:27:36 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D98E543D2D for ; Fri, 11 Mar 2005 22:27:36 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2BMRagR049152 for ; Fri, 11 Mar 2005 22:27:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2BMRa8E049149 for perforce@freebsd.org; Fri, 11 Mar 2005 22:27:36 GMT (envelope-from peter@freebsd.org) Date: Fri, 11 Mar 2005 22:27:36 GMT Message-Id: <200503112227.j2BMRa8E049149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 72935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2005 22:27:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=72935 Change 72935 by peter@peter_daintree on 2005/03/11 22:26:47 integ -b i386_hammer (again) Affected files ... .. //depot/projects/hammer/sys/amd64/include/critical.h#21 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#36 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/include/critical.h#21 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#36 (text+ko) ==== @@ -89,7 +89,6 @@ #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) - int adjkerntz; /* local offset from GMT in seconds */ int clkintr_pending; int disable_rtc_set; /* disable resettodr() if != 0 */ @@ -155,7 +154,6 @@ hardclock(frame); } - int acquire_timer2(int mode) { @@ -176,7 +174,6 @@ return (0); } - int release_timer2() { From owner-p4-projects@FreeBSD.ORG Sat Mar 12 06:01:47 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28D4C16A4D0; Sat, 12 Mar 2005 06:01:47 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD93A16A4CE for ; Sat, 12 Mar 2005 06:01:46 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B024A43D31 for ; Sat, 12 Mar 2005 06:01:46 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2C61kTc084675 for ; Sat, 12 Mar 2005 06:01:46 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2C61kSI084672 for perforce@freebsd.org; Sat, 12 Mar 2005 06:01:46 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Mar 2005 06:01:46 GMT Message-Id: <200503120601.j2C61kSI084672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2005 06:01:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=72946 Change 72946 by sam@sam_ebb on 2005/03/12 06:01:42 typo Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#4 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#4 (text+ko) ==== @@ -345,7 +345,7 @@ error = copyin(params, &cp, sizeof(cp)); if (error) return error; - ifp = ifunit(cp.icp_name); + ifp = ifunit(cp.icp_parent); if (ifp == NULL) return ENXIO; ic = ifp->if_softc; /* XXX */ From owner-p4-projects@FreeBSD.ORG Sat Mar 12 06:04:51 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 281FD16A4D0; Sat, 12 Mar 2005 06:04:51 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0375D16A4CE for ; Sat, 12 Mar 2005 06:04:51 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9C6643D4C for ; Sat, 12 Mar 2005 06:04:50 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2C64oTl084761 for ; Sat, 12 Mar 2005 06:04:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2C64oYj084758 for perforce@freebsd.org; Sat, 12 Mar 2005 06:04:50 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Mar 2005 06:04:50 GMT Message-Id: <200503120604.j2C64oYj084758@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2005 06:04:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=72947 Change 72947 by sam@sam_ebb on 2005/03/12 06:03:51 notify on station re-association in ap mode so the authenticator does re-keying Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#5 edit .. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#3 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#5 (text+ko) ==== @@ -222,18 +222,22 @@ struct ifnet *ifp = &vap->iv_if; struct ieee80211_join_event iev; + memset(&iev, 0, sizeof(iev)); if (ni == vap->iv_bss) { - memset(&iev, 0, sizeof(iev)); IEEE80211_ADDR_COPY(iev.iev_addr, ni->ni_bssid); rt_ieee80211msg(ifp, newassoc ? RTM_IEEE80211_ASSOC : RTM_IEEE80211_REASSOC, &iev, sizeof(iev)); if_link_state_change(ifp, LINK_STATE_UP); - } else if (newassoc) { - /* fire off wireless event only for new station */ - memset(&iev, 0, sizeof(iev)); + } else { IEEE80211_ADDR_COPY(iev.iev_addr, ni->ni_macaddr); +#ifdef notyet + rt_ieee80211msg(ifp, newassoc ? + RTM_IEEE80211_JOIN : RTM_IEEE80211_REJOIN, + &iev, sizeof(iev)); +#else rt_ieee80211msg(ifp, RTM_IEEE80211_JOIN, &iev, sizeof(iev)); +#endif } } ==== //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#3 (text+ko) ==== @@ -232,5 +232,6 @@ #define RTM_IEEE80211_SCAN 105 /* scan complete, results available */ #define RTM_IEEE80211_REPLAY 106 /* sequence counter replay detected */ #define RTM_IEEE80211_MICHAEL 107 /* Michael MIC failure detected */ +#define RTM_IEEE80211_REJOIN 108 /* station re-associate (ap mode) */ #endif /* _NET80211_IEEE80211_FREEBSD_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Mar 12 06:10:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51BA316A4D0; Sat, 12 Mar 2005 06:10:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D36816A4CE for ; Sat, 12 Mar 2005 06:10:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1227943D54 for ; Sat, 12 Mar 2005 06:10:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2C6AwmJ085107 for ; Sat, 12 Mar 2005 06:10:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2C6AwHv085103 for perforce@freebsd.org; Sat, 12 Mar 2005 06:10:58 GMT (envelope-from sam@freebsd.org) Date: Sat, 12 Mar 2005 06:10:58 GMT Message-Id: <200503120610.j2C6AwHv085103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 72949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2005 06:10:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=72949 Change 72949 by sam@sam_ebb on 2005/03/12 06:10:27 o reject association requests w/o a wpa/rsn ie when wpa authentication is enabled Submitted by: Divy Le Ray Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_input.c#6 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_input.c#6 (text+ko) ==== @@ -2454,6 +2454,23 @@ vap->iv_stats.is_rx_assoc_notauth++; return; } + if (wpa == NULL && (vap->iv_flags & IEEE80211_F_WPA)) { + /* + * When operating with WPA/RSN, there must be + * proper security credentials. + */ + IEEE80211_DPRINTF(vap, + IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA, + "[%s] deny %s request, no WPA/RSN ie\n", + ether_sprintf(wh->i_addr2), + reassoc ? "reassoc" : "assoc"); + IEEE80211_SEND_MGMT(ni, + IEEE80211_FC0_SUBTYPE_DEAUTH, + IEEE80211_REASON_RSN_REQUIRED); + ieee80211_node_leave(ni); + vap->iv_stats.is_rx_assoc_badwpaie++; /*XXX*/ + return; + } if (wpa != NULL) { /* * Parse WPA information element. Note that From owner-p4-projects@FreeBSD.ORG Sat Mar 12 15:14:08 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE84816A4D0; Sat, 12 Mar 2005 15:14:07 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C330116A4CE for ; Sat, 12 Mar 2005 15:14:07 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDB9543D49 for ; Sat, 12 Mar 2005 15:14:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2CFE6Ha050591 for ; Sat, 12 Mar 2005 15:14:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2CFE5Pe050588 for perforce@freebsd.org; Sat, 12 Mar 2005 15:14:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 12 Mar 2005 15:14:05 GMT Message-Id: <200503121514.j2CFE5Pe050588@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 72974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Mar 2005 15:14:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=72974 Change 72974 by rwatson@rwatson_paprika on 2005/03/12 15:13:20 Integrate netperf_socket from FreeBSD CVS HEAD: - cscope targets - busdma changes? - armisms - ndisisms - compat32isms, including kevent_copyout() - fewer major numbers - BUS_PROBE_DEFAULT - minor ata tweaks - The normal spattering of PCI IDs. - devfs_random() :-), devname() sysctl helper. - sundry MFi386 to amd64, including lapic - CLONE_THREAD so that SIGTHR can be protected better with linux emulation. - td_sigmask cleanup - unit locking - SIGPIPE fix for soo_write() - TCP SACK fixes, configurable limits. - More sparc64 pmap locking. mpsafevm now works? netperf-related: - NFS server mutex in hard-coded witness lock order. - uipc_accf locking cleanup, do_getopt_accept_filter() centralized, etc. - Mbuf cluster reference count race fixes. - Some socket creation/teardown cleanup and optimization. - soisconnected() lock scope increase. - NET_CALLOUT_MPSAFE, more netgraph nodes use it. - BPF locking tweaks during descriptor attach/tear-down. - CARP locking work Affected files ... .. //depot/projects/netperf_socket/sys/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#14 integrate .. //depot/projects/netperf_socket/sys/alpha/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/atomic.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#7 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#6 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/busdma_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/fpu.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#24 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#7 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#22 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#12 integrate .. //depot/projects/netperf_socket/sys/amd64/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/bus_amd64.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/netperf_socket/sys/amd64/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/ieeefp.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#8 integrate .. //depot/projects/netperf_socket/sys/amd64/include/sf_buf.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_proto.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_syscall.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/linux32/syscalls.master#2 integrate .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#9 integrate .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#15 integrate .. //depot/projects/netperf_socket/sys/arm/arm/support.S#6 integrate .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#8 integrate .. //depot/projects/netperf_socket/sys/arm/include/_types.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/arm/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/arc/include/arcfuncs.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/netperf_socket/sys/boot/ofw/libofw/ofw_net.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#11 integrate .. //depot/projects/netperf_socket/sys/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/linux/linux_util.h#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#21 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/ndis_var.h#12 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ndis.c#18 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#21 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#49 integrate .. //depot/projects/netperf_socket/sys/conf/files#61 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#21 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#34 integrate .. //depot/projects/netperf_socket/sys/conf/majors#9 integrate .. //depot/projects/netperf_socket/sys/conf/options#36 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/access601.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/array.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/atapi.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/command.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/gui_lib.c#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/hptproc.c#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/ioctl.c#3 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvSata.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvStorageDev.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/raid5n.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/readme.txt#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/vdevice.h#2 delete .. //depot/projects/netperf_socket/sys/contrib/dev/nve/adapter.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/basetype.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/drvinfo.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/os.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/dev/nve/phy.h#1 branch .. //depot/projects/netperf_socket/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/netperf_socket/sys/crypto/cast128/cast128.c#2 delete .. //depot/projects/netperf_socket/sys/crypto/cast128/cast128.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/cast128/cast128sb.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/md5.c#3 delete .. //depot/projects/netperf_socket/sys/crypto/md5.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-alg-fst.h#2 delete .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/netperf_socket/sys/crypto/rijndael/rijndael.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#45 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcibvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_video.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#26 integrate .. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahd_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/amd/amd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ar/if_ar_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#21 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#19 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/sample/sample.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ath/ath_rate/sample/sample.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/netperf_socket/sys/dev/ath/if_ath_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/awi/awi.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/cx/machdep.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/digi/digi_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/esp/esp_sbus.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/esp/ncr53c9x.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc_isa.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxpvar.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/hfa/hfa_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/access601.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/array.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/atapi.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/command.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/global.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/hptmv/gui_lib.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/hptproc.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/i386-elf.raid.o.uu#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/ioctl.c#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/mvSata.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/mvStorageDev.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/raid5n.h#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/readme.txt#1 branch .. //depot/projects/netperf_socket/sys/dev/hptmv/vdevice.h#1 branch .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/idt/idt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/ixgb/if_ixgb.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/mcd/mcdreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/mly/mly.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/null/null.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/nve/if_nve.c#1 branch .. //depot/projects/netperf_socket/sys/dev/nve/if_nvereg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/patm/if_patm_attach.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ppbus/pps.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/pst/pst-pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/random/hash.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/random/nehemiah.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/safe/safe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/scd/scdreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/si/si_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/mss.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/csa.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pci/vibes.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/mixer.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/sound.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/sound/usb/uaudio_pcm.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sr/if_sr_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sx/sx_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/syscons.c#16 integrate .. //depot/projects/netperf_socket/sys/dev/syscons/sysmouse.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/tga/tga_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/trm/trm.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_core.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#15 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohci_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#13 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbcdc.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdi_util.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_rule.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#13 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_conv.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/netperf_socket/sys/fs/pseudofs/pseudofs_vncache.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_crypt.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_lock.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#16 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#10 integrate .. //depot/projects/netperf_socket/sys/geom/geom_aes.c#5 integrate .. //depot/projects/netperf_socket/sys/geom/geom_dev.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.c#9 integrate .. //depot/projects/netperf_socket/sys/geom/label/g_label.h#4 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.c#18 integrate .. //depot/projects/netperf_socket/sys/geom/mirror/g_mirror.h#10 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.c#12 integrate .. //depot/projects/netperf_socket/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/netperf_socket/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/shsec/g_shsec.h#2 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#15 integrate .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.h#7 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum.c#13 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_drive.c#13 integrate .. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_init.c#7 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_alloc.c#4 integrate .. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#13 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#34 integrate .. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/netperf_socket/sys/i386/i386/in_cksum.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#18 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mp_watchdog.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/_types.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/atomic.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/clock.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/cpufunc.h#6 integrate .. //depot/projects/netperf_socket/sys/i386/include/critical.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/endian.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/ieeefp.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/in_cksum.h#5 integrate .. //depot/projects/netperf_socket/sys/i386/include/ioctl_bt848.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/ioctl_meteor.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/profile.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/varargs.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#8 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#11 integrate .. //depot/projects/netperf_socket/sys/i386/isa/prof_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#7 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/busdma_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/netperf_socket/sys/ia64/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/cpufunc.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/stdarg.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/vga_isa.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/init_sysent.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_acct.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_conf.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/netperf_socket/sys/kern/kern_environment.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_event.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mib.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_prot.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#26 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#33 integrate .. //depot/projects/netperf_socket/sys/kern/kern_umtx.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_bus.c#19 integrate .. //depot/projects/netperf_socket/sys/kern/subr_hints.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_log.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/subr_unit.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_witness.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/sys_socket.c#13 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.c#17 integrate .. //depot/projects/netperf_socket/sys/kern/syscalls.master#17 integrate .. //depot/projects/netperf_socket/sys/kern/tty.c#21 integrate .. //depot/projects/netperf_socket/sys/kern/tty_cons.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/tty_pty.c#16 integrate .. //depot/projects/netperf_socket/sys/kern/tty_tty.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_accf.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#47 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#27 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#32 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#16 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#27 integrate .. //depot/projects/netperf_socket/sys/modules/ath_rate_sample/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/hptmv/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/nve/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/bpf.c#16 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#14 integrate .. //depot/projects/netperf_socket/sys/net/if.c#28 integrate .. //depot/projects/netperf_socket/sys/net/if_ef.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#25 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211_node.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.c#5 integrate .. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#12 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#17 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_one2many.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#7 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#8 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_source.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#15 integrate .. //depot/projects/netperf_socket/sys/netinet/in.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#23 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#28 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#17 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#15 integrate .. //depot/projects/netperf_socket/sys/netinet6/esp_core.c#3 integrate .. //depot/projects/netperf_socket/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#7 integrate .. //depot/projects/netperf_socket/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/netperf_socket/sys/netipx/README#4 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptodev.c#9 integrate .. //depot/projects/netperf_socket/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/netperf_socket/sys/opencrypto/rijndael.c#4 delete .. //depot/projects/netperf_socket/sys/opencrypto/rijndael.h#3 delete .. //depot/projects/netperf_socket/sys/opencrypto/xform.c#3 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#8 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#21 integrate .. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#16 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/clock.c#9 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/pc98gdc.c#7 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#14 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/critical.h#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/in_cksum.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/limits.h#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/varargs.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/busdma_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/machdep.c#11 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#21 integrate .. //depot/projects/netperf_socket/sys/sparc64/central/central.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_central.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhc_nexus.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/fhc/fhcvar.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/_types.h#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/critical.h#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/endian.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/limits.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/stdarg.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/varargs.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/machdep.c#13 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/netperf_socket/sys/sys/cdefs.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/conf.h#14 integrate .. //depot/projects/netperf_socket/sys/sys/dir.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/event.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/filio.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/ioctl.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/ktr.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/linker_set.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#22 integrate .. //depot/projects/netperf_socket/sys/sys/mutex.h#9 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#35 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#33 integrate .. //depot/projects/netperf_socket/sys/sys/queue.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#12 integrate .. //depot/projects/netperf_socket/sys/sys/socketvar.h#26 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/syscall.mk#16 integrate .. //depot/projects/netperf_socket/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#11 integrate .. //depot/projects/netperf_socket/sys/sys/syslimits.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sysproto.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/systm.h#16 integrate .. //depot/projects/netperf_socket/sys/sys/umtx.h#5 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#15 integrate Differences ... ==== //depot/projects/netperf_socket/sys/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.31 2004/08/19 09:54:28 des Exp $ +# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $ # The boot loader .if !defined(NO_BOOT) @@ -7,11 +7,30 @@ .endif .endif +# Directories to include in cscope name file and TAGS. +CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \ + isofs kern libkern modules net netatalk netatm netgraph \ + netinet netinet6 netipx netkey netnatm netncp netsmb nfs \ + pccard pci posix4 sys ufs vm ${ARCHDIR} + +ARCHDIR ?= ${MACHINE} + # Loadable kernel modules + .if defined(MODULES_WITH_WORLD) SUBDIR+=modules .endif HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` +cscope: ${.CURDIR}/cscopenamefile + cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile + +${.CURDIR}/cscopenamefile: + cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} + +TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile + rm -f ${.CURDIR}/TAGS + cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile + .include ==== //depot/projects/netperf_socket/sys/alpha/alpha/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.48 2005/01/15 20:11:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.50 2005/03/12 02:43:50 mux Exp $"); #include #include @@ -85,7 +85,6 @@ static int reserved_bpages; static int active_bpages; static int total_bpages; -static bus_addr_t bounce_lowaddr = BUS_SPACE_MAXADDR; struct bus_dmamap { struct bp_list bpages; @@ -250,14 +249,6 @@ if (newtag->lowaddr < ptoa(Maxmem) && (flags & BUS_DMA_ALLOCNOW) != 0) { /* Must bounce */ - if (lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dma_tag_create: page reallocation " - "not implemented"); - } if (ptoa(total_bpages) < maxsize) { int pages; @@ -367,14 +358,6 @@ && total_bpages < maxpages)) { int pages; - if (dmat->lowaddr > bounce_lowaddr) { - /* - * Go through the pool and kill any pages - * that don't reside below lowaddr. - */ - panic("bus_dmamap_create: page reallocation " - "not implemented"); - } pages = atop(dmat->maxsize) + 1; pages = MIN(maxpages - total_bpages, pages); @@ -595,7 +578,7 @@ } if (sg->ds_len == 0) { - sg->ds_addr = paddr + alpha_XXX_dmamap_or; + sg->ds_addr = paddr | alpha_XXX_dmamap_or; sg->ds_len = size; } else if (paddr == nextpaddr) { sg->ds_len += size; @@ -605,7 +588,7 @@ seg++; if (seg > dmat->nsegments) break; - sg->ds_addr = paddr + alpha_XXX_dmamap_or; + sg->ds_addr = paddr | alpha_XXX_dmamap_or; sg->ds_len = size; } vaddr += size; @@ -685,7 +668,7 @@ * previous segment if possible. */ if (first) { - segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; segs[seg].ds_len = sgsize; first = 0; } else { @@ -697,7 +680,7 @@ else { if (++seg >= dmat->nsegments) break; - segs[seg].ds_addr = curaddr + alpha_XXX_dmamap_or; + segs[seg].ds_addr = curaddr | alpha_XXX_dmamap_or; segs[seg].ds_len = sgsize; } } ==== //depot/projects/netperf_socket/sys/alpha/alpha/machdep.c#14 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.232 2005/02/06 01:55:06 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.233 2005/03/01 21:55:26 wes Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -194,6 +194,7 @@ struct msgbuf *msgbufp=0; long Maxmem = 0; +long realmem = 0; long totalphysmem; /* total amount of physical memory in system */ long resvmem; /* amount of memory reserved for PROM */ @@ -250,6 +251,7 @@ #endif printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1048576); + realmem = alpha_ptob(Maxmem); /* * Display any holes after the first chunk of extended memory. ==== //depot/projects/netperf_socket/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,12 +33,16 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.5 2004/03/20 20:41:39 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE__TYPES_H_ #define _MACHINE__TYPES_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + /* * Basic types upon which most other types are built. */ @@ -97,7 +101,7 @@ /* * Unusual type definitions. */ -#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) +#ifdef __GNUCLIKE_BUILTIN_VAALIST typedef __builtin_va_list __va_list; /* internally known to gcc */ #else typedef struct { @@ -105,8 +109,9 @@ int __offset; int __pad; } __va_list; -#endif /* post GCC 2.95 */ -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#endif /* __GNUCLIKE_BUILTIN_VAALIST */ +#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ + && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/netperf_socket/sys/alpha/include/atomic.h#3 (text+ko) ==== @@ -23,12 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.19 2004/09/10 05:00:27 marcel Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.20 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + #include /* @@ -50,7 +54,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %2\n\t" /* load old value */ "bis %0, %3, %0\n\t" /* calculate new value */ @@ -66,7 +70,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -82,7 +86,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ @@ -98,7 +102,7 @@ { u_int32_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ @@ -114,7 +118,7 @@ { u_int32_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ @@ -133,7 +137,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ @@ -149,7 +153,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ @@ -165,7 +169,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "addq %0, %2, %0\n\t" /* calculate new value */ @@ -181,7 +185,7 @@ { u_int64_t temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "subq %0, %2, %0\n\t" /* calculate new value */ @@ -197,7 +201,7 @@ { u_int64_t result,temp; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ "1:\tldq_l %0,%2\n\t" /* load current value, asserting lock */ @@ -336,7 +340,7 @@ { u_int32_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldl_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ @@ -363,7 +367,7 @@ { u_int64_t ret; -#ifdef __GNUC__ +#ifdef __GNUCLIKE_ASM __asm __volatile ( "1:\tldq_l %0, %1\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ ==== //depot/projects/netperf_socket/sys/alpha/include/cpufunc.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/alpha/include/cpufunc.h,v 1.15 2002/04/01 23:51:22 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -35,9 +35,13 @@ #include #include +#ifndef _SYS_CDEFS_H_ +#error this file needs sys/cdefs.h as a prerequisite +#endif + struct thread; -#ifdef __GNUC__ +#if defined(__GNUCLIKE_ASM) static __inline void breakpoint(void) ==== //depot/projects/netperf_socket/sys/alpha/include/critical.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/alpha/include/critical.h,v 1.5 2004/07/27 16:41:00 rwatson Exp $ + * $FreeBSD: src/sys/alpha/include/critical.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -46,7 +46,7 @@ */ void cpu_critical_fork_exit(void); -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE /* * cpu_critical_enter: @@ -75,12 +75,12 @@ intr_restore(td->td_md.md_savecrit); } -#else /* !__GNUC__ */ +#else /* !__CC_SUPPORTS___INLINE */ void cpu_critical_enter(struct thread *td); void cpu_critical_exit(struct thread *td); -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE */ __END_DECLS ==== //depot/projects/netperf_socket/sys/alpha/include/endian.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.15 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.16 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -64,7 +64,7 @@ #define BYTE_ORDER _BYTE_ORDER #endif -#ifdef __GNUC__ +#if defined(__CC_SUPPORTS___INLINE) && defined(__GNUCLIKE_ASM) static __inline __uint64_t __bswap64(__uint64_t _x) @@ -113,7 +113,7 @@ #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) -#else /* !__GNUC__ */ +#else /* !(__CC_SUPPORTS___INLINE && __GNUCLIKE_ASM) */ /* * No optimizations are available for this compiler. Fall back to @@ -122,6 +122,6 @@ */ #define _BYTEORDER_FUNC_DEFINED -#endif /* __GNUC__ */ +#endif /* __CC_SUPPORTS___INLINE && __GNUCLIKE_ASM */ #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/netperf_socket/sys/alpha/include/in_cksum.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.6 2004/04/05 21:00:50 imp Exp $ + * $FreeBSD: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg Exp $ */ #ifndef _MACHINE_IN_CKSUM_H_ @@ -45,7 +45,7 @@ * in the normal case (where there are no options and the header length is * therefore always exactly five 32-bit words. */ -#ifdef __GNUC__ +#ifdef __CC_SUPPORTS___INLINE static __inline void in_cksum_update(struct ip *ip) ==== //depot/projects/netperf_socket/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -23,13 +23,15 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<<