From owner-p4-projects@FreeBSD.ORG Sun Jan 1 16:06:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43AA416A422; Sun, 1 Jan 2006 16:06:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 149DD16A41F for ; Sun, 1 Jan 2006 16:06:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FA0143D55 for ; Sun, 1 Jan 2006 16:06:03 +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 k01G63ZI077185 for ; Sun, 1 Jan 2006 16:06:03 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 k01G5oQe077178 for perforce@freebsd.org; Sun, 1 Jan 2006 16:05:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 1 Jan 2006 16:05:50 GMT Message-Id: <200601011605.k01G5oQe077178@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jan 2006 16:06:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=89012 Change 89012 by rwatson@rwatson_sesame on 2006/01/01 16:05:22 Integrate netsmp branch, including looping back sosend_copyin(). Affected files ... .. //depot/projects/netsmp/src/sys/alpha/alpha/clock.c#3 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/netsmp/src/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/netsmp/src/sys/alpha/conf/DEFAULTS#2 integrate .. //depot/projects/netsmp/src/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/netsmp/src/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/netsmp/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/netsmp/src/sys/alpha/include/param.h#3 integrate .. //depot/projects/netsmp/src/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/netsmp/src/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/netsmp/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/netsmp/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/db_trace.c#5 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/netsmp/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/netsmp/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/netsmp/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/netsmp/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/netsmp/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/netsmp/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/netsmp/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/netsmp/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/netsmp/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/netsmp/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/netsmp/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/netsmp/src/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/netsmp/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/netsmp/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/netsmp/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/netsmp/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/netsmp/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/netsmp/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/netsmp/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/i80321_timer.c#3 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/netsmp/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/netsmp/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/netsmp/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/netsmp/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/netsmp/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/netsmp/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/netsmp/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/netsmp/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/netsmp/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/netsmp/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_ioctl.c#5 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/netsmp/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/netsmp/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.arm#6 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.i386#4 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/netsmp/src/sys/conf/Makefile.sparc64#4 integrate .. //depot/projects/netsmp/src/sys/conf/NOTES#5 integrate .. //depot/projects/netsmp/src/sys/conf/files#15 integrate .. //depot/projects/netsmp/src/sys/conf/files.alpha#3 integrate .. //depot/projects/netsmp/src/sys/conf/files.amd64#5 integrate .. //depot/projects/netsmp/src/sys/conf/files.i386#8 integrate .. //depot/projects/netsmp/src/sys/conf/files.ia64#3 integrate .. //depot/projects/netsmp/src/sys/conf/files.pc98#5 integrate .. //depot/projects/netsmp/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/netsmp/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/netsmp/src/sys/conf/kern.post.mk#5 integrate .. //depot/projects/netsmp/src/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/netsmp/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/netsmp/src/sys/conf/options#5 integrate .. //depot/projects/netsmp/src/sys/conf/options.amd64#3 integrate .. //depot/projects/netsmp/src/sys/conf/options.arm#2 integrate .. //depot/projects/netsmp/src/sys/conf/options.i386#4 integrate .. //depot/projects/netsmp/src/sys/conf/options.pc98#4 integrate .. //depot/projects/netsmp/src/sys/conf/systags.sh#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/netsmp/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/netsmp/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#7 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#8 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/pf.c#4 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/pf_norm.c#3 integrate .. //depot/projects/netsmp/src/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/netsmp/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdSynch.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/netsmp/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/netsmp/src/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/netsmp/src/sys/dev/drm/drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_sarea.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_state.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_ucode.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r128_state.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_mem.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/sis_drm.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/sis_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/sis_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/sis_ds.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/sis_ds.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/sis_mm.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/em/README#2 integrate .. //depot/projects/netsmp/src/sys/dev/em/if_em.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/hptmv/hptproc.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/hptmv/mvOs.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_commands.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_disk.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_ioctl.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/md/md.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/netsmp/src/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/my/if_my.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/nge/if_nge.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/nve/if_nvereg.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/pci/hostb_pci.c#1 branch .. //depot/projects/netsmp/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/pci/vga_pci.c#1 branch .. //depot/projects/netsmp/src/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ral.c#10 integrate .. //depot/projects/netsmp/src/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/rp/rp.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/snc/dp83932.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/netsmp/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/netsmp/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/netsmp/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/netsmp/src/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/netsmp/src/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/netsmp/src/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/netsmp/src/sys/dev/txp/if_txp.c#11 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_cdce.c#6 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_udav.c#10 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#10 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ugraphire_rdesc.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/netsmp/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/netsmp/src/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/netsmp/src/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/netsmp/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/nwfs/nwfs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/netsmp/src/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/netsmp/src/sys/geom/geom_aes.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_apple.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_fox.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_gpt.c#5 integrate .. //depot/projects/netsmp/src/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_sunlabel.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/label/g_label_ufs.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/netsmp/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/netsmp/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.c#5 integrate .. //depot/projects/netsmp/src/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_drive.c#6 integrate .. //depot/projects/netsmp/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/netsmp/src/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/netsmp/src/sys/i386/conf/DEFAULTS#3 integrate .. //depot/projects/netsmp/src/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/netsmp/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/netsmp/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/netsmp/src/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/netsmp/src/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/netsmp/src/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/netsmp/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/netsmp/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/netsmp/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/netsmp/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#11 integrate .. //depot/projects/netsmp/src/sys/i386/i386/swtch.s#3 integrate .. //depot/projects/netsmp/src/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/netsmp/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/bus.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/frame.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/netsmp/src/sys/i386/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/include/smp.h#4 integrate .. //depot/projects/netsmp/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/isa/icu.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/netsmp/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/netsmp/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/netsmp/src/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/netsmp/src/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/netsmp/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/netsmp/src/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/netsmp/src/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/netsmp/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/netsmp/src/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/netsmp/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/netsmp/src/sys/ia64/conf/SKI#2 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/netsmp/src/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/ia64/include/param.h#4 integrate .. //depot/projects/netsmp/src/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/netsmp/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/imgact_elf.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/kern_exec.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/kern_pmc.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_sig.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/kern_thread.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/kern_time.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/link_elf.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/link_elf_obj.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/netsmp/src/sys/kern/subr_kobj.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/netsmp/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/netsmp/src/sys/kern/sys_process.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/syscalls.master#5 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/netsmp/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/netsmp/src/sys/modules/Makefile#9 integrate .. //depot/projects/netsmp/src/sys/modules/cardbus/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/drm/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/drm/i915/Makefile#1 branch .. //depot/projects/netsmp/src/sys/modules/drm/savage/Makefile#1 branch .. //depot/projects/netsmp/src/sys/modules/i2c/controllers/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/i2c/controllers/amdsmb/Makefile#1 branch .. //depot/projects/netsmp/src/sys/modules/i2c/controllers/nfsmb/Makefile#1 branch .. //depot/projects/netsmp/src/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/netsmp/src/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/netgraph/bpf/Makefile#2 integrate .. //depot/projects/netsmp/src/sys/modules/ti/Makefile#3 integrate .. //depot/projects/netsmp/src/sys/modules/xfs/Makefile#1 branch .. //depot/projects/netsmp/src/sys/net/bpf.c#8 integrate .. //depot/projects/netsmp/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/netsmp/src/sys/net/bpf_jitter.c#1 branch .. //depot/projects/netsmp/src/sys/net/bpf_jitter.h#1 branch .. //depot/projects/netsmp/src/sys/net/bpfdesc.h#5 integrate .. //depot/projects/netsmp/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/netsmp/src/sys/net/if_bridge.c#12 integrate .. //depot/projects/netsmp/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/netsmp/src/sys/net/if_ethersubr.c#11 integrate .. //depot/projects/netsmp/src/sys/net/if_gif.c#7 integrate .. //depot/projects/netsmp/src/sys/net/if_gif.h#2 integrate .. //depot/projects/netsmp/src/sys/net/if_media.c#2 integrate .. //depot/projects/netsmp/src/sys/net/if_ppp.c#7 integrate .. //depot/projects/netsmp/src/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/netsmp/src/sys/net/if_vlan.c#13 integrate .. //depot/projects/netsmp/src/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/netsmp/src/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_freebsd.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#10 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.h#5 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.h#6 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_output.c#7 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/netsmp/src/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/netsmp/src/sys/netatm/atm_sys.h#2 integrate .. //depot/projects/netsmp/src/sys/netatm/uni/unisig_encode.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/netsmp/src/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/if_ether.c#8 integrate .. //depot/projects/netsmp/src/sys/netinet/in.h#5 integrate .. //depot/projects/netsmp/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/in_proto.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_dummynet.c#3 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet/ip_output.c#11 integrate .. //depot/projects/netsmp/src/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/netsmp/src/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/netsmp/src/sys/netinet6/ip6_mroute.c#6 integrate .. //depot/projects/netsmp/src/sys/netinet6/nd6_nbr.c#9 integrate .. //depot/projects/netsmp/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/netsmp/src/sys/netkey/key_debug.c#2 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_diskless.c#3 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/netsmp/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/ppc.c#2 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/netsmp/src/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/DEFAULTS#3 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/netsmp/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/netsmp/src/sys/pc98/include/bus.h#2 integrate .. //depot/projects/netsmp/src/sys/pc98/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/netsmp/src/sys/pci/agp.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_amd64.c#4 integrate .. //depot/projects/netsmp/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_i810.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_intel.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/netsmp/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/agpreg.h#4 integrate .. //depot/projects/netsmp/src/sys/pci/agpvar.h#2 integrate .. //depot/projects/netsmp/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/netsmp/src/sys/pci/amdsmb.c#1 branch .. //depot/projects/netsmp/src/sys/pci/if_de.c#12 integrate .. //depot/projects/netsmp/src/sys/pci/if_devar.h#7 integrate .. //depot/projects/netsmp/src/sys/pci/if_ti.c#9 delete .. //depot/projects/netsmp/src/sys/pci/if_tireg.h#3 delete .. //depot/projects/netsmp/src/sys/pci/nfsmb.c#1 branch .. //depot/projects/netsmp/src/sys/pci/ti_fw.h#2 delete .. //depot/projects/netsmp/src/sys/pci/ti_fw2.h#2 delete .. //depot/projects/netsmp/src/sys/pci/viapm.c#3 integrate .. //depot/projects/netsmp/src/sys/posix4/mqueue.h#2 delete .. //depot/projects/netsmp/src/sys/powerpc/conf/DEFAULTS#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/netsmp/src/sys/powerpc/conf/Makefile#1 branch .. //depot/projects/netsmp/src/sys/powerpc/conf/NOTES#1 branch .. //depot/projects/netsmp/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/netsmp/src/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/db_trace.c#4 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/interrupt.c#2 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/trap_subr.S#3 integrate .. //depot/projects/netsmp/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/netsmp/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/conf/DEFAULTS#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/netsmp/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/fhc/clkbrd.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/ktr.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/ofw_upa.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/tick.c#3 integrate .. //depot/projects/netsmp/src/sys/sys/_lock.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/_timeval.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/buf.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/condvar.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/elf32.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/elf64.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/elf_generic.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/kbio.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/ktr.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/limits.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/linker.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/lock.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/malloc.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/mbuf.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/mount.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/mouse.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/mqueue.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#8 integrate .. //depot/projects/netsmp/src/sys/sys/pmc.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/proc.h#7 integrate .. //depot/projects/netsmp/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/signal.h#6 integrate .. //depot/projects/netsmp/src/sys/sys/signalvar.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/netsmp/src/sys/sys/sysproto.h#5 integrate .. //depot/projects/netsmp/src/sys/sys/systm.h#3 integrate .. //depot/projects/netsmp/src/sys/sys/timers.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/unistd.h#4 integrate .. //depot/projects/netsmp/src/sys/sys/vnode.h#6 integrate .. //depot/projects/netsmp/src/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/memguard.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/memguard.h#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_map.c#5 integrate .. //depot/projects/netsmp/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/netsmp/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/netsmp/src/tools/regression/geom_concat/Makefile#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_concat/conf.sh#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_concat/runtests.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_concat/test-1.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_concat/test-1.t#2 integrate .. //depot/projects/netsmp/src/tools/regression/geom_concat/test-2.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_concat/test-2.t#2 integrate .. //depot/projects/netsmp/src/tools/regression/geom_mirror/Makefile#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/conf.sh#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/runtests.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-1.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-1.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-2.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-2.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-3.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-3.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-4.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-4.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-5.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-5.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-6.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-6.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-7.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_mirror/test-7.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_nop/Makefile#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_nop/conf.sh#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_nop/runtests.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_nop/test-1.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_nop/test-1.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_nop/test-2.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_nop/test-2.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/Makefile#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/conf.sh#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/runtests.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-1.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-1.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-10.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-10.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-11.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-11.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-12.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-12.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-2.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-2.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-3.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-3.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-4.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-4.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-5.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-5.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-6.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-6.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-7.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-7.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-8.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-8.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-9.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_raid3/test-9.t#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_shsec/Makefile#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_shsec/conf.sh#1 branch .. //depot/projects/netsmp/src/tools/regression/geom_shsec/runtests.sh#2 delete .. //depot/projects/netsmp/src/tools/regression/geom_shsec/test-1.sh#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 1 17:12:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59DB016A422; Sun, 1 Jan 2006 17:12:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E51816A41F for ; Sun, 1 Jan 2006 17:12:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBAB243D4C for ; Sun, 1 Jan 2006 17:12:24 +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 k01HCOlW086832 for ; Sun, 1 Jan 2006 17:12:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k01HCOKQ086829 for perforce@freebsd.org; Sun, 1 Jan 2006 17:12:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 1 Jan 2006 17:12:24 GMT Message-Id: <200601011712.k01HCOKQ086829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jan 2006 17:12:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=89014 Change 89014 by rwatson@rwatson_sesame on 2006/01/01 17:11:55 Further integrate netsmp branch. Affected files ... .. //depot/projects/netsmp/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/netsmp/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/netsmp/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/netsmp/src/sys/conf/NOTES#6 integrate .. //depot/projects/netsmp/src/sys/conf/options#6 integrate .. //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/netsmp/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/netsmp/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/netsmp/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/netsmp/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/netsmp/src/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/netsmp/src/sys/sys/copyright.h#2 integrate .. //depot/projects/netsmp/src/sys/sys/param.h#9 integrate .. //depot/projects/netsmp/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/netsmp/src/sys/vm/vm_fault.c#4 integrate .. //depot/projects/netsmp/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/netsmp/src/sys/vm/vm_page.c#6 integrate .. //depot/projects/netsmp/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/netsmp/src/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/netsmp/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/netsmp/src/sys/vm/vm_zeroidle.c#3 integrate .. //depot/projects/netsmp/src/tools/regression/msdosfs/msdosfstest-6.sh#1 branch Differences ... ==== //depot/projects/netsmp/src/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/netsmp/src/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.141 2005/11/17 02:32:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.143 2006/01/01 05:35:57 netchild Exp $"); #include "opt_cpu.h" @@ -69,6 +69,8 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); +void setPQL2(int *const size, int *const ways); +static void setPQL2_AMD(int *const size, int *const ways); int cpu_class; char machine[] = "amd64"; @@ -93,6 +95,9 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +extern int pq_l2size; +extern int pq_l2nways; + void printcpuinfo(void) { @@ -526,3 +531,30 @@ print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } + +static void +setPQL2_AMD(int *const size, int *const ways) +{ + if (cpu_exthigh >= 0x80000006) { + u_int regs[4]; + + do_cpuid(0x80000006, regs); + *size = regs[2] >> 16; + *ways = (regs[2] >> 12) & 0x0f; + switch (*ways) { + case 0: /* disabled/not present */ + case 15: /* fully associative */ + default: *ways = 1; break; /* reserved configuration */ + case 4: *ways = 4; break; + case 6: *ways = 8; break; + case 8: *ways = 16; break; + } + } +} + +void +setPQL2(int *const size, int *const ways) +{ + if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + setPQL2_AMD(size, ways); +} ==== //depot/projects/netsmp/src/sys/arm/arm/identcpu.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.5 2005/11/21 19:06:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.6 2005/12/31 14:39:18 netchild Exp $"); #include #include #include @@ -298,6 +298,15 @@ "**unknown 15**", }; +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} + + extern int ctrl; void identify_arm_cpu(void) ==== //depot/projects/netsmp/src/sys/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1340 2005/12/29 02:12:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1341 2005/12/31 14:39:19 netchild Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -111,14 +111,8 @@ options BLKDEV_IOSIZE=8192 # Options for the VM subsystem -# L2 cache size (in KB) can be specified in PQ_CACHESIZE -options PQ_CACHESIZE=512 # color for 512k cache # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring -#options PQ_LARGECACHE # color for 512k cache -#options PQ_HUGECACHE # color for 1024k cache -#options PQ_MEDIUMCACHE # color for 256k cache -#options PQ_NORMALCACHE # color for 64k cache # This allows you to actually store this configuration file into # the kernel binary itself, where it may be later read by saying: @@ -409,7 +403,7 @@ # # RESTARTABLE_PANICS allows one to continue from a panic as if it were -# a call to the debugger via the Debugger() function instead. It is only +# a call to the debugger to continue from a panic as instead. It is only # useful if a kernel debugger is present. To restart from a panic, reset # the panicstr variable to NULL and continue execution. This option is # for development use only and should NOT be used in production systems ==== //depot/projects/netsmp/src/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.521 2005/12/12 10:15:11 ru Exp $ +# $FreeBSD: src/sys/conf/options,v 1.522 2005/12/31 14:39:19 netchild Exp $ # # On the handling of kernel options # @@ -517,11 +517,6 @@ MALLOC_MAKE_FAILURES opt_vm.h MALLOC_PROFILE opt_vm.h PQ_NOOPT opt_vmpage.h -PQ_NORMALCACHE opt_vmpage.h -PQ_MEDIUMCACHE opt_vmpage.h -PQ_LARGECACHE opt_vmpage.h -PQ_HUGECACHE opt_vmpage.h -PQ_CACHESIZE opt_vmpage.h # The MemGuard replacement allocator used for tamper-after-free detection DEBUG_MEMGUARD opt_vm.h ==== //depot/projects/netsmp/src/sys/dev/pccbb/pccbb.c#7 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.136 2005/12/29 23:38:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.137 2005/12/31 20:04:39 imp Exp $"); #include #include @@ -485,7 +485,7 @@ */ mtx_lock(&Giant); status = cbb_get(sc, CBB_SOCKET_STATE); - DPRINTF(("Status is 0x%x %x\n", status, sc->bsh)); + DPRINTF(("Status is 0x%x\n", status)); if (!CBB_CARD_PRESENT(status)) { not_a_card = 0; /* We know card type */ cbb_removal(sc); ==== //depot/projects/netsmp/src/sys/dev/pci/pci.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.307 2005/12/30 19:36:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.308 2006/01/01 08:26:39 imp Exp $"); #include "opt_bus.h" @@ -897,12 +897,8 @@ * read back. These maps have had all f's written to them by the * BIOS in an attempt to disable the resources. */ - if (!force && (base == 0 || map == testval)) { - if (bootverbose) - printf("ignored rid %#x: base %#llx map %#x testval %#x\n", - reg, base, map, testval); + if (!force && (base == 0 || map == testval)) return (barlen); - } /* * This code theoretically does the right thing, but has ==== //depot/projects/netsmp/src/sys/i386/i386/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.151 2005/12/05 14:22:11 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.152 2005/12/31 14:39:17 netchild Exp $"); #include "opt_cpu.h" @@ -74,7 +74,13 @@ void panicifcpuunsupported(void); static void identifycyrix(void); +void setPQL2(int *const size, int *const ways); +static void setPQL2_AMD(int *const size, int *const ways); +static void setPQL2_INTEL(int *const size, int *const ways); +static void get_INTEL_TLB(u_int data, int *const size, int *const ways); static void print_AMD_info(void); +static void print_INTEL_info(void); +static void print_INTEL_TLB(u_int data); static void print_AMD_assoc(int i); static void print_transmeta_info(void); @@ -873,6 +879,8 @@ if (strcmp(cpu_vendor, "AuthenticAMD") == 0) print_AMD_info(); + else if (strcmp(cpu_vendor, "GenuineIntel") == 0) + print_INTEL_info(); else if (strcmp(cpu_vendor, "GenuineTMx86") == 0 || strcmp(cpu_vendor, "TransmetaCPU") == 0) print_transmeta_info(); @@ -1218,6 +1226,464 @@ } static void +print_INTEL_info(void) +{ + u_int regs[4]; + u_int rounds, regnum; + + do_cpuid(0x2, regs); + + rounds = (regs[0] & 0xff) - 1; + + for (regnum = 0; regnum <= 3; ++regnum) { + if ((regs[regnum] & (1<<31)) == 0) { + if (regnum != 0) + print_INTEL_TLB(regs[regnum] & 0xff); + print_INTEL_TLB((regs[regnum] >> 8) & 0xff); + print_INTEL_TLB((regs[regnum] >> 16) & 0xff); + print_INTEL_TLB((regs[regnum] >> 24) & 0xff); + } + } + + while (rounds > 0) { + do_cpuid(0x2, regs); + + for (regnum = 0; regnum <= 3; ++regnum) { + if ((regs[regnum] & (1<<31)) == 0) { + if (regnum != 0) + print_INTEL_TLB(regs[regnum] & 0xff); + print_INTEL_TLB((regs[regnum] >> 8) & 0xff); + print_INTEL_TLB((regs[regnum] >> 16) & 0xff); + print_INTEL_TLB((regs[regnum] >> 24) & 0xff); + } + } + + --rounds; + } + + if (cpu_exthigh >= 0x80000006) { + do_cpuid(0x80000006, regs); + printf("\nL2 cache: %u kbytes, %u-way associative, %u bytes/line", + regs[2] & 0xffff, (regs[2] >> 16) & 0xff, regs[2] >> 24); + } + + printf("\n"); +} + +static void +print_INTEL_TLB(u_int data) +{ + switch (data) { + case 0x0: + case 0x40: + default: + break; + case 0x1: + printf("\nInstruction TLB: 4-KBPages, 4-way set associative, 32 entries"); + break; + case 0x2: + printf("\nInstruction TLB: 4-MB Pages, fully associative, 2 entries"); + break; + case 0x3: + printf("\nData TLB: 4-KB Pages, 4-way set associative, 64 entries"); + break; + case 0x4: + printf("\nData TLB: 4-MB Pages, 4-way set associative, 8 entries"); + break; + case 0x6: + printf("\n1st-level instruction cache: 8-KB, 4-way set associative, 32-byte line size"); + break; + case 0x8: + printf("\n1st-level instruction cache: 16-KB, 4-way set associative, 32-byte line size"); + break; + case 0xa: + printf("\n1st-level data cache: 8-KB, 2-way set associative, 32-byte line size"); + break; + case 0xc: + printf("\n1st-level data cache: 16-KB, 4-way set associative, 32-byte line size"); + break; + case 0x22: + printf("\n3rd-level cache: 512 KB, 4-way set associative, sectored cache, 64-byte line size"); + break; + case 0x23: + printf("\n3rd-level cache: 1-MB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x25: + printf("\n3rd-level cache: 2-MB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x29: + printf("\n3rd-level cache: 4-MB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x2c: + printf("\n1st-level data cache: 32-KB, 8-way set associative, 64-byte line size"); + break; + case 0x30: + printf("\n1st-level instruction cache: 32-KB, 8-way set associative, 64-byte line size"); + break; + case 0x39: + printf("\n2nd-level cache: 128-KB, 4-way set associative, sectored cache, 64-byte line size"); + break; + case 0x3b: + printf("\n2nd-level cache: 128-KB, 2-way set associative, sectored cache, 64-byte line size"); + break; + case 0x3c: + printf("\n2nd-level cache: 256-KB, 4-way set associative, sectored cache, 64-byte line size"); + break; + case 0x41: + printf("\n2nd-level cache: 128-KB, 4-way set associative, 32-byte line size"); + break; + case 0x42: + printf("\n2nd-level cache: 256-KB, 4-way set associative, 32-byte line size"); + break; + case 0x43: + printf("\n2nd-level cache: 512-KB, 4-way set associative, 32 byte line size"); + break; + case 0x44: + printf("\n2nd-level cache: 1-MB, 4-way set associative, 32 byte line size"); + break; + case 0x45: + printf("\n2nd-level cache: 2-MB, 4-way set associative, 32 byte line size"); + break; + case 0x50: + printf("\nInstruction TLB: 4-KB, 2-MB or 4-MB pages, fully associative, 64 entries"); + break; + case 0x51: + printf("\nInstruction TLB: 4-KB, 2-MB or 4-MB pages, fully associative, 128 entries"); + break; + case 0x52: + printf("\nInstruction TLB: 4-KB, 2-MB or 4-MB pages, fully associative, 256 entries"); + break; + case 0x5b: + printf("\nData TLB: 4-KB or 4-MB pages, fully associative, 64 entries"); + break; + case 0x5c: + printf("\nData TLB: 4-KB or 4-MB pages, fully associative, 128 entries"); + break; + case 0x5d: + printf("\nData TLB: 4-KB or 4-MB pages, fully associative, 256 entries"); + break; + case 0x60: + printf("\n1st-level data cache: 16-KB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x66: + printf("\n1st-level data cache: 8-KB, 4-way set associative, sectored cache, 64-byte line size"); + break; + case 0x67: + printf("\n1st-level data cache: 16-KB, 4-way set associative, sectored cache, 64-byte line size"); + break; + case 0x68: + printf("\n1st-level data cache: 32-KB, 4 way set associative, sectored cache, 64-byte line size"); + break; + case 0x70: + printf("\nTrace cache: 12K-uops, 8-way set associative"); + break; + case 0x71: + printf("\nTrace cache: 16K-uops, 8-way set associative"); + break; + case 0x72: + printf("\nTrace cache: 32K-uops, 8-way set associative"); + break; + case 0x79: + printf("\n2nd-level cache: 128-KB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x7a: + printf("\n2nd-level cache: 256-KB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x7b: + printf("\n2nd-level cache: 512-KB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x7c: + printf("\n2nd-level cache: 1-MB, 8-way set associative, sectored cache, 64-byte line size"); + break; + case 0x82: + printf("\n2nd-level cache: 256-KB, 8-way set associative, 32 byte line size"); + break; + case 0x83: + printf("\n2nd-level cache: 512-KB, 8-way set associative, 32 byte line size"); + break; + case 0x84: + printf("\n2nd-level cache: 1-MB, 8-way set associative, 32 byte line size"); + break; + case 0x85: + printf("\n2nd-level cache: 2-MB, 8-way set associative, 32 byte line size"); + break; + case 0x86: + printf("\n2nd-level cache: 512-KB, 4-way set associative, 64 byte line size"); + break; + case 0x87: + printf("\n2nd-level cache: 1-MB, 8-way set associative, 64 byte line size"); + break; + case 0xb0: + printf("\nInstruction TLB: 4-KB Pages, 4-way set associative, 128 entries"); + break; + case 0xb3: + printf("\nData TLB: 4-KB Pages, 4-way set associative, 128 entries"); + break; + } +} + + +static void +setPQL2_AMD(int *const size, int *const ways) { + if (cpu_exthigh >= 0x80000006) { + u_int regs[4]; + + do_cpuid(0x80000006, regs); + *size = regs[2] >> 16; + *ways = (regs[2] >> 12) & 0x0f; + if(*ways == 255) /* fully associative */ + *ways = 1; + } +} + + +static void +setPQL2_INTEL(int *const size, int *const ways) +{ + u_int rounds, regnum; + u_int regs[4]; + + do_cpuid(0x2, regs); + rounds = (regs[0] & 0xff) - 1; + + for (regnum = 0; regnum <= 3; ++regnum) { + if ((regs[regnum] & (1<<31)) == 0) { + if (regnum != 0) + get_INTEL_TLB(regs[regnum] & 0xff, + size, ways); + get_INTEL_TLB((regs[regnum] >> 8) & 0xff, + size, ways); + get_INTEL_TLB((regs[regnum] >> 16) & 0xff, + size, ways); + get_INTEL_TLB((regs[regnum] >> 24) & 0xff, + size, ways); + } + } + + while (rounds > 0) { + do_cpuid(0x2, regs); + + for (regnum = 0; regnum <= 3; ++regnum) { + if ((regs[regnum] & (1<<31)) == 0) { + if (regnum != 0) + get_INTEL_TLB(regs[regnum] & 0xff, + size, ways); + get_INTEL_TLB((regs[regnum] >> 8) & 0xff, + size, ways); + get_INTEL_TLB((regs[regnum] >> 16) & 0xff, + size, ways); + get_INTEL_TLB((regs[regnum] >> 24) & 0xff, + size, ways); + } + } + + --rounds; + } + + if (cpu_exthigh >= 0x80000006) { + do_cpuid(0x80000006, regs); + if (*size < (regs[2] & 0xffff)) { + *size = regs[2] & 0xffff; + *ways = (regs[2] >> 16) & 0xff; + } + } +} + +static void +get_INTEL_TLB(u_int data, int *const size, int *const ways) +{ + switch (data) { + default: + break; + case 0x22: + /* 3rd-level cache: 512 KB, 4-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 512) { + *size = 512; + *ways = 4; + } + break; + case 0x23: + /* 3rd-level cache: 1-MB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 1024) { + *size = 1024; + *ways = 8; + } + break; + case 0x25: + /* 3rd-level cache: 2-MB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 2048) { + *size = 2048; + *ways = 8; + } + break; + case 0x29: + /* 3rd-level cache: 4-MB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 4096) { + *size = 4096; + *ways = 8; + } + break; + case 0x39: + /* 2nd-level cache: 128-KB, 4-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 128) { + *size = 128; + *ways = 4; + } + break; + case 0x3b: + /* 2nd-level cache: 128-KB, 2-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 128) { + *size = 128; + *ways = 2; + } + break; + case 0x3c: + /* 2nd-level cache: 256-KB, 4-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 256) { + *size = 256; + *ways = 4; + } + break; + case 0x41: + /* 2nd-level cache: 128-KB, 4-way set associative, + * 32-byte line size */ + if (*size < 128) { + *size = 128; + *ways = 4; + } + break; + case 0x42: + /* 2nd-level cache: 256-KB, 4-way set associative, + * 32-byte line size */ + if (*size < 256) { + *size = 256; + *ways = 4; + } + break; + case 0x43: + /* 2nd-level cache: 512-KB, 4-way set associative, + * 32 byte line size */ + if (*size < 512) { + *size = 512; + *ways = 4; + } + break; + case 0x44: + /* 2nd-level cache: 1-MB, 4-way set associative, + * 32 byte line size */ + if (*size < 1024) { + *size = 1024; + *ways = 4; + } + break; + case 0x45: + /* 2nd-level cache: 2-MB, 4-way set associative, + * 32 byte line size */ + if (*size < 2048) { + *size = 2048; + *ways = 4; + } + break; + case 0x79: + /* 2nd-level cache: 128-KB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 128) { + *size = 128; + *ways = 8; + } + break; + case 0x7a: + /* 2nd-level cache: 256-KB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 256) { + *size = 256; + *ways = 8; + } + break; + case 0x7b: + /* 2nd-level cache: 512-KB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 512) { + *size = 512; + *ways = 8; + } + break; + case 0x7c: + /* 2nd-level cache: 1-MB, 8-way set associative, + * sectored cache, 64-byte line size */ + if (*size < 1024) { + *size = 1024; + *ways = 8; + } + break; + case 0x82: + /* 2nd-level cache: 256-KB, 8-way set associative, + * 32 byte line size */ + if (*size < 128) { + *size = 128; + *ways = 8; + } + break; + case 0x83: + /* 2nd-level cache: 512-KB, 8-way set associative, + * 32 byte line size */ + if (*size < 512) { + *size = 512; + *ways = 8; + } + break; + case 0x84: + /* 2nd-level cache: 1-MB, 8-way set associative, + * 32 byte line size */ + if (*size < 1024) { + *size = 1024; + *ways = 8; + } + break; + case 0x85: + /* 2nd-level cache: 2-MB, 8-way set associative, + * 32 byte line size */ + if (*size < 2048) { + *size = 2048; + *ways = 8; + } + break; + case 0x86: + /* 2nd-level cache: 512-KB, 4-way set associative, + * 64 byte line size */ + if (*size < 512) { + *size = 512; + *ways = 4; + } + break; + case 0x87: + /* 2nd-level cache: 1-MB, 8-way set associative, + * 64 byte line size */ + if (*size < 1024) { + *size = 512; + *ways = 8; + } + break; + } +} + +void +setPQL2(int *const size, int *const ways) +{ + if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + setPQL2_AMD(size, ways); + else if (strcmp(cpu_vendor, "GenuineIntel") == 0) + setPQL2_INTEL(size, ways); +} + +static void print_transmeta_info() { u_int regs[4], nreg = 0; ==== //depot/projects/netsmp/src/sys/ia64/ia64/machdep.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.204 2005/12/06 11:19:37 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.205 2005/12/31 14:39:18 netchild Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -158,6 +158,14 @@ #define Mhz 1000000L #define Ghz (1000L*Mhz) +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} + static void identifycpu(void) { ==== //depot/projects/netsmp/src/sys/kern/vfs_bio.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.499 2005/12/07 03:39:07 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_bio.c,v 1.500 2005/12/31 14:39:19 netchild Exp $"); #include #include @@ -2863,9 +2863,9 @@ * page daemon? */ if ((curproc != pageproc) && - ((m->queue - m->pc) == PQ_CACHE) && + (VM_PAGE_INQUEUE1(m, PQ_CACHE)) && ((cnt.v_free_count + cnt.v_cache_count) < - (cnt.v_free_min + cnt.v_cache_min))) { + (cnt.v_free_min + cnt.v_cache_min))) { pagedaemon_wakeup(); } vm_page_wire(m); ==== //depot/projects/netsmp/src/sys/powerpc/powerpc/machdep.c#5 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.92 2005/11/08 06:48:08 grehan Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.93 2005/12/31 14:39:18 netchild Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -170,6 +170,14 @@ struct kva_md_info kmi; +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} + static void powerpc_ofw_shutdown(void *junk, int howto) { ==== //depot/projects/netsmp/src/sys/sparc64/sparc64/identcpu.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.14 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/identcpu.c,v 1.15 2005/12/31 14:39:19 netchild Exp $ */ #include #include @@ -27,6 +27,14 @@ int cpu_impl; +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} + void cpu_identify(u_long vers, u_int freq, u_int id) { ==== //depot/projects/netsmp/src/sys/sys/copyright.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (C) 1992-2005 The FreeBSD Project. All rights reserved. + * Copyright (C) 1992-2006 The FreeBSD Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/copyright.h,v 1.19 2005/01/07 02:29:23 imp Exp $ + * $FreeBSD: src/sys/sys/copyright.h,v 1.21 2005/12/31 20:00:12 imp Exp $ */ @@ -30,7 +30,7 @@ /* FreeBSD */ #define COPYRIGHT_FreeBSD \ - "Copyright (c) 1992-2005 The FreeBSD Project.\n" + "Copyright (c) 1992-2006 The FreeBSD Project.\n" /* Berkeley */ #define COPYRIGHT_UCB \ @@ -38,11 +38,11 @@ /* a port of FreeBSD to the NEC PC98, Japan */ #define COPYRIGHT_PC98 \ - "Copyright (c) 1994-2005 FreeBSD(98) porting team.\nCopyright (c) 1992 A.Kojima F.Ukai M.Ishii (KMC).\n" + "Copyright (c) 1994-2006 FreeBSD(98) porting team.\nCopyright (c) 1992 A.Kojima F.Ukai M.Ishii (KMC).\n" #if defined(PC98) -char copyright[] = COPYRIGHT_FreeBSD/**/COPYRIGHT_PC98/**/COPYRIGHT_UCB; +char copyright[] = COPYRIGHT_FreeBSD COPYRIGHT_PC98 COPYRIGHT_UCB; #else -char copyright[] = COPYRIGHT_FreeBSD/**/COPYRIGHT_UCB; +char copyright[] = COPYRIGHT_FreeBSD COPYRIGHT_UCB; #endif ==== //depot/projects/netsmp/src/sys/sys/param.h#9 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.258 2005/12/20 22:44:35 jhb Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.259 2005/12/31 11:26:54 trhodes Exp $ */ #ifndef _SYS_PARAM_H_ @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700010 /* Master, propagated to newvers */ +#define __FreeBSD_version 700011 /* Master, propagated to newvers */ #ifndef LOCORE #include ==== //depot/projects/netsmp/src/sys/vm/vm_contig.c#3 (text+ko) ==== @@ -60,7 +60,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.44 2005/08/12 18:17:40 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_contig.c,v 1.45 2005/12/31 14:39:20 netchild Exp $"); #include #include @@ -141,7 +141,7 @@ if ((m->flags & PG_MARKER) != 0) continue; - KASSERT(m->queue == queue, + KASSERT(VM_PAGE_INQUEUE2(m, queue), ("vm_contig_launder: page %p's queue is not %d", m, queue)); error = vm_contig_launder_page(m); if (error == 0) @@ -255,7 +255,7 @@ for (i = start; i < (start + size / PAGE_SIZE); i++) { vm_page_t m = &pga[i]; - if ((m->queue - m->pc) == PQ_CACHE) { + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) { if (m->hold_count != 0) { start++; goto again0; @@ -456,16 +456,15 @@ pqtype = m->queue - m->pc; if (pass != 0 && pqtype != PQ_FREE && pqtype != PQ_CACHE) { - switch (m->queue) { - case PQ_ACTIVE: - case PQ_INACTIVE: + if (m->queue == PQ_ACTIVE || + m->queue == PQ_INACTIVE) { if (vm_contig_launder_page(m) != 0) goto cleanup_freed; pqtype = m->queue - m->pc; if (pqtype == PQ_FREE || pqtype == PQ_CACHE) break; - default: + } else { cleanup_freed: vm_page_release_contigl(&pga[i + 1], start + npages - 1 - i); ==== //depot/projects/netsmp/src/sys/vm/vm_fault.c#4 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.210 2005/12/20 12:27:59 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.211 2005/12/31 14:39:20 netchild Exp $"); #include #include @@ -410,7 +410,8 @@ vm_pageq_remove_nowakeup(fs.m); - if ((queue - fs.m->pc) == PQ_CACHE && vm_page_count_severe()) { + if ((queue - fs.m->pc) == PQ_CACHE \ + && vm_page_count_severe()) { vm_page_activate(fs.m); vm_page_unlock_queues(); unlock_and_deallocate(&fs); @@ -1006,7 +1007,7 @@ (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { vm_page_lock_queues(); - if ((m->queue - m->pc) == PQ_CACHE) + if (VM_PAGE_INQUEUE1(m, PQ_CACHE)) vm_page_deactivate(m); mpte = pmap_enter_quick(pmap, addr, m, entry->protection, mpte); ==== //depot/projects/netsmp/src/sys/vm/vm_object.c#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 2 05:41:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 897F516A420; Mon, 2 Jan 2006 05:41:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40E5616A424 for ; Mon, 2 Jan 2006 05:41:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEE5E43D4C for ; Mon, 2 Jan 2006 05:41:34 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k025fYPw036730 for ; Mon, 2 Jan 2006 05:41:34 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k025fY34036727 for perforce@freebsd.org; Mon, 2 Jan 2006 05:41:34 GMT (envelope-from imp@freebsd.org) Date: Mon, 2 Jan 2006 05:41:34 GMT Message-Id: <200601020541.k025fY34036727@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2006 05:41:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=89032 Change 89032 by imp@imp_harmony on 2006/01/02 05:41:32 IFC @89031 Affected files ... .. //depot/projects/arm/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/arm/src/sys/alpha/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/arm/src/sys/amd64/include/_types.h#5 integrate .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/arm/src/sys/arm/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/conf/NOTES#10 integrate .. //depot/projects/arm/src/sys/conf/files#11 integrate .. //depot/projects/arm/src/sys/conf/options#10 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ipl.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/arm/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/arm/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/arm/src/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/arm/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/ugraphire_rdesc.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/arm/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/arm/src/sys/i386/i386/swtch.s#4 integrate .. //depot/projects/arm/src/sys/i386/include/_types.h#5 integrate .. //depot/projects/arm/src/sys/i386/include/pcb.h#3 integrate .. //depot/projects/arm/src/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/arm/src/sys/ia64/include/_types.h#3 integrate .. //depot/projects/arm/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/arm/src/sys/kern/subr_kobj.c#3 integrate .. //depot/projects/arm/src/sys/kern/subr_witness.c#6 integrate .. //depot/projects/arm/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/arm/src/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/arm/src/sys/modules/cardbus/Makefile#2 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/arm/src/sys/pc98/include/_types.h#2 integrate .. //depot/projects/arm/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/arm/src/sys/powerpc/include/profile.h#3 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/arm/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/arm/src/sys/sys/copyright.h#2 integrate .. //depot/projects/arm/src/sys/sys/malloc.h#3 integrate .. //depot/projects/arm/src/sys/sys/param.h#8 integrate .. //depot/projects/arm/src/sys/sys/systm.h#7 integrate .. //depot/projects/arm/src/sys/vm/memguard.c#2 integrate .. //depot/projects/arm/src/sys/vm/memguard.h#2 integrate .. //depot/projects/arm/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#5 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#4 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/arm/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/arm/src/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/arm/src/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __PCI_REROUTE_INTERRUPT + /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.141 2005/11/17 02:32:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.143 2006/01/01 05:35:57 netchild Exp $"); #include "opt_cpu.h" @@ -69,6 +69,8 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); +void setPQL2(int *const size, int *const ways); +static void setPQL2_AMD(int *const size, int *const ways); int cpu_class; char machine[] = "amd64"; @@ -93,6 +95,9 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +extern int pq_l2size; +extern int pq_l2nways; + void printcpuinfo(void) { @@ -526,3 +531,30 @@ print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } + +static void +setPQL2_AMD(int *const size, int *const ways) +{ + if (cpu_exthigh >= 0x80000006) { + u_int regs[4]; + + do_cpuid(0x80000006, regs); + *size = regs[2] >> 16; + *ways = (regs[2] >> 12) & 0x0f; + switch (*ways) { + case 0: /* disabled/not present */ + case 15: /* fully associative */ + default: *ways = 1; break; /* reserved configuration */ + case 4: *ways = 4; break; + case 6: *ways = 8; break; + case 8: *ways = 16; break; + } + } +} + +void +setPQL2(int *const size, int *const ways) +{ + if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + setPQL2_AMD(size, ways); +} ==== //depot/projects/arm/src/sys/amd64/include/_types.h#5 (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.9 2005/07/02 23:13:30 thompsa Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.10 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -44,6 +44,8 @@ #endif #define __NO_STRICT_ALIGNMENT +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT /* * Basic types upon which most other types are built. ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.5 2005/11/21 19:06:25 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.6 2005/12/31 14:39:18 netchild Exp $"); #include #include #include @@ -298,6 +298,15 @@ "**unknown 15**", }; +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} + + extern int ctrl; void identify_arm_cpu(void) ==== //depot/projects/arm/src/sys/arm/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.6 2005/03/02 21:33:22 joerg Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __PCI_REROUTE_INTERRUPT + /* * Basic types upon which most other types are built. */ ==== //depot/projects/arm/src/sys/conf/NOTES#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1339 2005/12/21 15:49:50 ru Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1341 2005/12/31 14:39:19 netchild Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -111,14 +111,8 @@ options BLKDEV_IOSIZE=8192 # Options for the VM subsystem -# L2 cache size (in KB) can be specified in PQ_CACHESIZE -options PQ_CACHESIZE=512 # color for 512k cache # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring -#options PQ_LARGECACHE # color for 512k cache -#options PQ_HUGECACHE # color for 1024k cache -#options PQ_MEDIUMCACHE # color for 256k cache -#options PQ_NORMALCACHE # color for 64k cache # This allows you to actually store this configuration file into # the kernel binary itself, where it may be later read by saying: @@ -409,7 +403,7 @@ # # RESTARTABLE_PANICS allows one to continue from a panic as if it were -# a call to the debugger via the Debugger() function instead. It is only +# a call to the debugger to continue from a panic as instead. It is only # useful if a kernel debugger is present. To restart from a panic, reset # the panicstr variable to NULL and continue execution. This option is # for development use only and should NOT be used in production systems @@ -435,6 +429,9 @@ # with the 'options' line, while the hwpmc device can be either compiled # in or loaded as a loadable kernel module. # +# Additional configuration options may be required on specific architectures, +# please see hwpmc(4). + device hwpmc # Driver (also a loadable module) options HWPMC_HOOKS # Other necessary kernel hooks ==== //depot/projects/arm/src/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1079 2005/12/21 15:49:50 ru Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1080 2005/12/29 01:43:46 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -489,6 +489,7 @@ dev/buslogic/bt_pci.c optional bt pci dev/cardbus/cardbus.c optional cardbus dev/cardbus/cardbus_cis.c optional cardbus +dev/cardbus/cardbus_device.c optional cardbus dev/ciss/ciss.c optional ciss dev/cm/smc90cx6.c optional cm dev/cnw/if_cnw.c optional cnw pccard ==== //depot/projects/arm/src/sys/conf/options#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.521 2005/12/12 10:15:11 ru Exp $ +# $FreeBSD: src/sys/conf/options,v 1.522 2005/12/31 14:39:19 netchild Exp $ # # On the handling of kernel options # @@ -524,11 +524,6 @@ MALLOC_MAKE_FAILURES opt_vm.h MALLOC_PROFILE opt_vm.h PQ_NOOPT opt_vmpage.h -PQ_NORMALCACHE opt_vmpage.h -PQ_MEDIUMCACHE opt_vmpage.h -PQ_LARGECACHE opt_vmpage.h -PQ_HUGECACHE opt_vmpage.h -PQ_CACHESIZE opt_vmpage.h # The MemGuard replacement allocator used for tamper-after-free detection DEBUG_MEMGUARD opt_vm.h ==== //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.47 2005/12/04 10:06:02 ru Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.48 2005/12/30 11:32:22 guido Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -34,7 +34,9 @@ #else # include #endif -#include +#if !defined(_AIX51) +# include +#endif #if defined(_KERNEL) # include # include @@ -74,6 +76,9 @@ # include #endif #if !defined(_KERNEL) && defined(__FreeBSD__) +# if (__FreeBSD_version >= 504000) +# undef _RADIX_H_ +# endif # include "radix_ipf.h" #endif #include @@ -88,7 +93,7 @@ # include #endif #include -#if !defined(__sgi) || defined(_KERNEL) +#if (!defined(__sgi) && !defined(AIX)) || defined(_KERNEL) # include # include #endif @@ -136,7 +141,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.47 2005/12/04 10:06:02 ru Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.48 2005/12/30 11:32:22 guido Exp $"; /* static const char rcsid[] = "@(#)Id: fil.c,v 2.243.2.57 2005/03/28 10:47:50 darrenr Exp"; */ #endif @@ -176,6 +181,7 @@ u_short fr_ip_id = 0; int fr_chksrc = 0; /* causes a system crash if enabled */ int fr_minttl = 4; +int fr_icmpminfragmtu = 68; u_long fr_frouteok[2] = {0, 0}; u_long fr_userifqs = 0; u_long fr_badcoalesces[2] = {0, 0}; @@ -221,6 +227,7 @@ static ipfunc_t fr_findfunc __P((ipfunc_t)); static frentry_t *fr_firewall __P((fr_info_t *, u_32_t *)); static int fr_funcinit __P((frentry_t *fr)); +static INLINE void frpr_ah __P((fr_info_t *)); static INLINE void frpr_esp __P((fr_info_t *)); static INLINE void frpr_gre __P((fr_info_t *)); static INLINE void frpr_udp __P((fr_info_t *)); @@ -229,15 +236,15 @@ static INLINE void frpr_ipv4hdr __P((fr_info_t *)); static INLINE int frpr_pullup __P((fr_info_t *, int)); static INLINE void frpr_short __P((fr_info_t *, int)); -static INLINE void frpr_tcpcommon __P((fr_info_t *)); -static INLINE void frpr_udpcommon __P((fr_info_t *)); -static INLINE int fr_updateipid __P((fr_info_t *)); +static INLINE int frpr_tcpcommon __P((fr_info_t *)); +static INLINE int frpr_udpcommon __P((fr_info_t *)); +static int fr_updateipid __P((fr_info_t *)); #ifdef IPFILTER_LOOKUP static int fr_grpmapinit __P((frentry_t *fr)); static INLINE void *fr_resolvelookup __P((u_int, u_int, lookupfunc_t *)); #endif static void frsynclist __P((frentry_t *, void *)); -static ipftuneable_t *fr_findtunebyname __P((char *)); +static ipftuneable_t *fr_findtunebyname __P((const char *)); static ipftuneable_t *fr_findtunebycookie __P((void *, void **)); @@ -280,6 +287,7 @@ { IPPROTO_AH, 0x000020 }, { IPPROTO_NONE, 0x000040 }, { IPPROTO_DSTOPTS, 0x000080 }, + { IPPROTO_MOBILITY, 0x000100 }, { 0, 0 } }; #endif @@ -331,15 +339,20 @@ * adding more code to a growing switch statement. */ #ifdef USE_INET6 +static INLINE int frpr_ah6 __P((fr_info_t *)); +static INLINE void frpr_esp6 __P((fr_info_t *)); +static INLINE void frpr_gre6 __P((fr_info_t *)); static INLINE void frpr_udp6 __P((fr_info_t *)); static INLINE void frpr_tcp6 __P((fr_info_t *)); static INLINE void frpr_icmp6 __P((fr_info_t *)); -static INLINE void frpr_ipv6hdr __P((fr_info_t *)); +static INLINE int frpr_ipv6hdr __P((fr_info_t *)); static INLINE void frpr_short6 __P((fr_info_t *, int)); static INLINE int frpr_hopopts6 __P((fr_info_t *)); +static INLINE int frpr_mobility6 __P((fr_info_t *)); static INLINE int frpr_routing6 __P((fr_info_t *)); static INLINE int frpr_dstopts6 __P((fr_info_t *)); -static INLINE int frpr_fragment6 __P((fr_info_t *)); +static INLINE void frpr_fragment6 __P((fr_info_t *)); +static INLINE int frpr_ipv6exthdr __P((fr_info_t *, int, int)); /* ------------------------------------------------------------------------ */ @@ -352,37 +365,32 @@ /* for IPv6 and marks the packet with FI_SHORT if so. See function comment */ /* for frpr_short() for more details. */ /* ------------------------------------------------------------------------ */ -static INLINE void frpr_short6(fin, min) +static INLINE void frpr_short6(fin, xmin) fr_info_t *fin; -int min; +int xmin; { - fr_ip_t *fi = &fin->fin_fi; - int off; - off = fin->fin_off; - if (off == 0) { - if (fin->fin_plen < fin->fin_hlen + min) - fi->fi_flx |= FI_SHORT; - } else if (off < min) { - fi->fi_flx |= FI_SHORT; - } + if (fin->fin_dlen < xmin) + fin->fin_flx |= FI_SHORT; } /* ------------------------------------------------------------------------ */ /* Function: frpr_ipv6hdr */ -/* Returns: void */ +/* Returns: int - 0 = IPv6 packet intact, -1 = packet lost */ /* Parameters: fin(I) - pointer to packet information */ /* */ /* IPv6 Only */ /* Copy values from the IPv6 header into the fr_info_t struct and call the */ -/* per-protocol analyzer if it exists. */ +/* per-protocol analyzer if it exists. In validating the packet, a protocol*/ +/* analyzer may pullup or free the packet itself so we need to be vigiliant */ +/* of that possibility arising. */ /* ------------------------------------------------------------------------ */ -static INLINE void frpr_ipv6hdr(fin) +static INLINE int frpr_ipv6hdr(fin) fr_info_t *fin; { - int p, go = 1, i, hdrcount, coalesced; ip6_t *ip6 = (ip6_t *)fin->fin_ip; + int p, go = 1, i, hdrcount; fr_ip_t *fi = &fin->fin_fi; fin->fin_off = 0; @@ -392,7 +400,6 @@ fi->fi_secmsk = 0; fi->fi_auth = 0; - coalesced = (fin->fin_flx & FI_COALESCE) ? 1 : 0; p = ip6->ip6_nxt; fi->fi_ttl = ip6->ip6_hlim; fi->fi_src.in6 = ip6->ip6_src; @@ -419,48 +426,35 @@ break; case IPPROTO_GRE : - frpr_gre(fin); + frpr_gre6(fin); go = 0; break; case IPPROTO_HOPOPTS : - /* - * Actually, hop by hop header is only allowed right - * after IPv6 header! - */ - if (hdrcount != 0) - fin->fin_flx |= FI_BAD; + p = frpr_hopopts6(fin); + break; - if (coalesced == 0) { - coalesced = fr_coalesce(fin); - if (coalesced != 1) - return; - } - p = frpr_hopopts6(fin); + case IPPROTO_MOBILITY : + p = frpr_mobility6(fin); break; case IPPROTO_DSTOPTS : - if (coalesced == 0) { - coalesced = fr_coalesce(fin); - if (coalesced != 1) - return; - } p = frpr_dstopts6(fin); break; case IPPROTO_ROUTING : - if (coalesced == 0) { - coalesced = fr_coalesce(fin); - if (coalesced != 1) - return; - } p = frpr_routing6(fin); break; + case IPPROTO_AH : + p = frpr_ah6(fin); + break; + case IPPROTO_ESP : - frpr_esp(fin); - /*FALLTHROUGH*/ - case IPPROTO_AH : + frpr_esp6(fin); + go = 0; + break; + case IPPROTO_IPV6 : for (i = 0; ip6exthdr[i].ol_bit != 0; i++) if (ip6exthdr[i].ol_val == p) { @@ -475,12 +469,8 @@ break; case IPPROTO_FRAGMENT : - if (coalesced == 0) { - coalesced = fr_coalesce(fin); - if (coalesced != 1) - return; - } - p = frpr_fragment6(fin); + frpr_fragment6(fin); + go = 0; break; default : @@ -494,9 +484,9 @@ * extension headers (go != 0), the entire header may not have * been pulled up when the code gets to this point. This is * only done for "go != 0" because the other header handlers - * will all pullup their complete header and the other - * indicator of an incomplete header is that this eas just an - * extension header. + * will all pullup their complete header. The other indicator + * of an incomplete packet is that this was just an extension + * header. */ if ((go != 0) && (p != IPPROTO_NONE) && (frpr_pullup(fin, 0) == -1)) { @@ -505,19 +495,32 @@ } } fi->fi_p = p; + + /* + * Some of the above functions, like frpr_esp6(), can call fr_pullup + * and destroy whatever packet was here. The caller of this function + * expects us to return -1 if there is a problem with fr_pullup. + */ + if (fin->fin_m == NULL) + return -1; + + return 0; } /* ------------------------------------------------------------------------ */ -/* Function: frpr_hopopts6 */ +/* Function: frpr_ipv6exthdr */ /* Returns: int - value of the next header or IPPROTO_NONE if error */ -/* Parameters: fin(I) - pointer to packet information */ +/* Parameters: fin(I) - pointer to packet information */ +/* multiple(I) - flag indicating yes/no if multiple occurances */ +/* of this extension header are allowed. */ +/* proto(I) - protocol number for this extension header */ /* */ /* IPv6 Only */ -/* This is function checks pending hop by hop options extension header */ /* ------------------------------------------------------------------------ */ -static INLINE int frpr_hopopts6(fin) +static INLINE int frpr_ipv6exthdr(fin, multiple, proto) fr_info_t *fin; +int multiple, proto; { struct ip6_ext *hdr; u_short shift; @@ -542,8 +545,15 @@ } for (i = 0; ip6exthdr[i].ol_bit != 0; i++) - if (ip6exthdr[i].ol_val == IPPROTO_HOPOPTS) { - fin->fin_optmsk |= ip6exthdr[i].ol_bit; + if (ip6exthdr[i].ol_val == proto) { + /* + * Most IPv6 extension headers are only allowed once. + */ + if ((multiple == 0) && + ((fin->fin_optmsk & ip6exthdr[i].ol_bit) != 0)) + fin->fin_flx |= FI_BAD; + else + fin->fin_optmsk |= ip6exthdr[i].ol_bit; break; } @@ -555,6 +565,36 @@ /* ------------------------------------------------------------------------ */ +/* Function: frpr_hopopts6 */ +/* Returns: int - value of the next header or IPPROTO_NONE if error */ +/* Parameters: fin(I) - pointer to packet information */ +/* */ +/* IPv6 Only */ +/* This is function checks pending hop by hop options extension header */ +/* ------------------------------------------------------------------------ */ +static INLINE int frpr_hopopts6(fin) +fr_info_t *fin; +{ + return frpr_ipv6exthdr(fin, 0, IPPROTO_HOPOPTS); +} + + +/* ------------------------------------------------------------------------ */ +/* Function: frpr_mobility6 */ +/* Returns: int - value of the next header or IPPROTO_NONE if error */ +/* Parameters: fin(I) - pointer to packet information */ +/* */ +/* IPv6 Only */ +/* This is function checks the IPv6 mobility extension header */ +/* ------------------------------------------------------------------------ */ +static INLINE int frpr_mobility6(fin) +fr_info_t *fin; +{ + return frpr_ipv6exthdr(fin, 0, IPPROTO_MOBILITY); +} + + +/* ------------------------------------------------------------------------ */ /* Function: frpr_routing6 */ /* Returns: int - value of the next header or IPPROTO_NONE if error */ /* Parameters: fin(I) - pointer to packet information */ @@ -566,100 +606,67 @@ fr_info_t *fin; { struct ip6_ext *hdr; - u_short shift; - int i; + int shift; - fin->fin_flx |= FI_V6EXTHDR; - - /* 8 is default length of extension hdr */ - if ((fin->fin_dlen - 8) < 0) { - fin->fin_flx |= FI_SHORT; + if (frpr_ipv6exthdr(fin, 0, IPPROTO_ROUTING) == IPPROTO_NONE) return IPPROTO_NONE; - } - if (frpr_pullup(fin, 8) == -1) - return IPPROTO_NONE; hdr = fin->fin_dp; - shift = 8 + (hdr->ip6e_len << 3); /* * Nasty extension header length? */ - if ((shift > fin->fin_dlen) || (shift < sizeof(struct ip6_hdr)) || + if ((shift < sizeof(struct ip6_hdr)) || ((shift - sizeof(struct ip6_hdr)) & 15)) { fin->fin_flx |= FI_BAD; + /* + * Compensate for the changes made in frpr_ipv6exthdr() + */ + fin->fin_dlen += shift; + fin->fin_dp = (char *)fin->fin_dp - shift; return IPPROTO_NONE; } - for (i = 0; ip6exthdr[i].ol_bit != 0; i++) - if (ip6exthdr[i].ol_val == IPPROTO_ROUTING) { - fin->fin_optmsk |= ip6exthdr[i].ol_bit; - break; - } - - fin->fin_dp = (char *)fin->fin_dp + shift; - fin->fin_dlen -= shift; - return hdr->ip6e_nxt; } /* ------------------------------------------------------------------------ */ /* Function: frpr_fragment6 */ -/* Returns: int - value of the next header or IPPROTO_NONE if error */ +/* Returns: void */ /* Parameters: fin(I) - pointer to packet information */ /* */ /* IPv6 Only */ /* Examine the IPv6 fragment header and extract fragment offset information.*/ +/* */ +/* We don't know where the transport layer header (or whatever is next is), */ +/* as it could be behind destination options (amongst others). Because */ +/* there is no fragment cache, there is no knowledge about whether or not an*/ +/* upper layer header has been seen (or where it ends) and thus we are not */ +/* able to continue processing beyond this header with any confidence. */ /* ------------------------------------------------------------------------ */ -static INLINE int frpr_fragment6(fin) +static INLINE void frpr_fragment6(fin) fr_info_t *fin; { struct ip6_frag *frag; - struct ip6_ext *hdr; - int i; - fin->fin_flx |= (FI_FRAG|FI_V6EXTHDR); + fin->fin_flx |= FI_FRAG; - /* 8 is default length of extension hdr */ - if ((fin->fin_dlen - 8) < 0) { - fin->fin_flx |= FI_SHORT; - return IPPROTO_NONE; - } - - /* - * Only one frgament header is allowed per IPv6 packet but it need - * not be the first nor last (not possible in some cases.) - */ - for (i = 0; ip6exthdr[i].ol_bit != 0; i++) - if (ip6exthdr[i].ol_val == IPPROTO_FRAGMENT) - break; - - if (fin->fin_optmsk & ip6exthdr[i].ol_bit) { - fin->fin_flx |= FI_BAD; - return IPPROTO_NONE; - } - - fin->fin_optmsk |= ip6exthdr[i].ol_bit; + if (frpr_ipv6exthdr(fin, 0, IPPROTO_FRAGMENT) == IPPROTO_NONE) + return; if (frpr_pullup(fin, sizeof(*frag)) == -1) - return IPPROTO_NONE; - hdr = fin->fin_dp; + return; + frag = fin->fin_dp; /* - * Length must be zero, i.e. it has no length. + * Fragment but no fragmentation info set? Bad packet... */ - if (hdr->ip6e_len != 0) { + if (frag->ip6f_offlg == 0) { fin->fin_flx |= FI_BAD; - return IPPROTO_NONE; - } - - if ((int)(fin->fin_dlen - sizeof(*frag)) < 0) { - fin->fin_flx |= FI_SHORT; - return IPPROTO_NONE; + return; } - frag = fin->fin_dp; fin->fin_off = frag->ip6f_offlg & IP6F_OFF_MASK; fin->fin_off <<= 3; if (fin->fin_off != 0) @@ -667,8 +674,6 @@ fin->fin_dp = (char *)fin->fin_dp + sizeof(*frag); fin->fin_dlen -= sizeof(*frag); - - return frag->ip6f_nxt; } @@ -684,34 +689,7 @@ static INLINE int frpr_dstopts6(fin) fr_info_t *fin; { - struct ip6_ext *hdr; - u_short shift; - int i; - - /* 8 is default length of extension hdr */ - if ((fin->fin_dlen - 8) < 0) { - fin->fin_flx |= FI_SHORT; - return IPPROTO_NONE; - } - - if (frpr_pullup(fin, 8) == -1) - return IPPROTO_NONE; - hdr = fin->fin_dp; - - shift = 8 + (hdr->ip6e_len << 3); - if (shift > fin->fin_dlen) { /* Nasty extension header length? */ - fin->fin_flx |= FI_BAD; - return IPPROTO_NONE; - } - - for (i = 0; ip6exthdr[i].ol_bit != 0; i++) - if (ip6exthdr[i].ol_val == IPPROTO_DSTOPTS) - break; - fin->fin_optmsk |= ip6exthdr[i].ol_bit; - fin->fin_dp = (char *)fin->fin_dp + shift; - fin->fin_dlen -= shift; - - return hdr->ip6e_nxt; + return frpr_ipv6exthdr(fin, 1, IPPROTO_DSTOPTS); } @@ -761,7 +739,7 @@ } } - frpr_short(fin, minicmpsz); + frpr_short6(fin, minicmpsz); } @@ -772,16 +750,16 @@ /* */ /* IPv6 Only */ /* Analyse the packet for IPv6/UDP properties. */ +/* Is not expected to be called for fragmented packets. */ /* ------------------------------------------------------------------------ */ static INLINE void frpr_udp6(fin) fr_info_t *fin; { - fr_checkv6sum(fin); + frpr_short6(fin, sizeof(struct udphdr)); - frpr_short(fin, sizeof(struct udphdr)); - - frpr_udpcommon(fin); + if (frpr_udpcommon(fin) == 0) + fr_checkv6sum(fin); } @@ -792,16 +770,86 @@ /* */ /* IPv6 Only */ /* Analyse the packet for IPv6/TCP properties. */ +/* Is not expected to be called for fragmented packets. */ /* ------------------------------------------------------------------------ */ static INLINE void frpr_tcp6(fin) fr_info_t *fin; { - fr_checkv6sum(fin); + frpr_short6(fin, sizeof(struct tcphdr)); + + if (frpr_tcpcommon(fin) == 0) + fr_checkv6sum(fin); +} + + +/* ------------------------------------------------------------------------ */ +/* Function: frpr_esp6 */ +/* Returns: void */ +/* Parameters: fin(I) - pointer to packet information */ +/* */ +/* IPv6 Only */ +/* Analyse the packet for ESP properties. */ +/* The minimum length is taken to be the SPI (32bits) plus a tail (32bits) */ +/* even though the newer ESP packets must also have a sequence number that */ +/* is 32bits as well, it is not possible(?) to determine the version from a */ +/* simple packet header. */ +/* ------------------------------------------------------------------------ */ +static INLINE void frpr_esp6(fin) +fr_info_t *fin; +{ + + frpr_short6(fin, sizeof(grehdr_t)); + + (void) frpr_pullup(fin, 8); +} + + +/* ------------------------------------------------------------------------ */ +/* Function: frpr_ah6 */ +/* Returns: void */ +/* Parameters: fin(I) - pointer to packet information */ +/* */ +/* IPv6 Only */ +/* Analyse the packet for AH properties. */ +/* The minimum length is taken to be the combination of all fields in the */ +/* header being present and no authentication data (null algorithm used.) */ +/* ------------------------------------------------------------------------ */ +static INLINE int frpr_ah6(fin) +fr_info_t *fin; +{ + authhdr_t *ah; + + frpr_short6(fin, 12); + + if (frpr_pullup(fin, sizeof(*ah)) == -1) + return IPPROTO_NONE; + + ah = (authhdr_t *)fin->fin_dp; + return ah->ah_next; +} + + +/* ------------------------------------------------------------------------ */ +/* Function: frpr_gre6 */ +/* Returns: void */ +/* Parameters: fin(I) - pointer to packet information */ +/* */ +/* Analyse the packet for GRE properties. */ +/* ------------------------------------------------------------------------ */ +static INLINE void frpr_gre6(fin) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 2 08:23:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECA9016A423; Mon, 2 Jan 2006 08:23:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF3D216A41F for ; Mon, 2 Jan 2006 08:23:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64FBF43D6D for ; Mon, 2 Jan 2006 08:23:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k028ND4A042605 for ; Mon, 2 Jan 2006 08:23:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k028NDDb042602 for perforce@freebsd.org; Mon, 2 Jan 2006 08:23:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Jan 2006 08:23:13 GMT Message-Id: <200601020823.k028NDDb042602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2006 08:23:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=89037 Change 89037 by rwatson@rwatson_sesame on 2006/01/02 08:23:08 Normalize. Affected files ... .. //depot/projects/netsmp/src/sys/net/if_var.h#14 edit Differences ... ==== //depot/projects/netsmp/src/sys/net/if_var.h#14 (text+ko) ==== @@ -358,7 +358,7 @@ } \ } \ if (err) \ - (ifq)->ifq_drops++; \ + _IF_DROP(ifq); \ IF_UNLOCK(ifq); \ } while (0) From owner-p4-projects@FreeBSD.ORG Mon Jan 2 10:42:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD4EC16A422; Mon, 2 Jan 2006 10:42:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEEDA16A41F for ; Mon, 2 Jan 2006 10:42:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C28143D46 for ; Mon, 2 Jan 2006 10:42:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k02AgKdo055600 for ; Mon, 2 Jan 2006 10:42:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k02AgJJu055597 for perforce@freebsd.org; Mon, 2 Jan 2006 10:42:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Jan 2006 10:42:19 GMT Message-Id: <200601021042.k02AgJJu055597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2006 10:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=89043 Change 89043 by rwatson@rwatson_sesame on 2006/01/02 10:42:13 Clean up sosend_dgram() return handling. Affected files ... .. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#23 edit Differences ... ==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#23 (text+ko) ==== @@ -716,7 +716,6 @@ } #define SBLOCKWAIT(f) (((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK) -#define snderr(errno) { error = (errno); goto release; } int sosend_dgram(so, addr, uio, top, control, flags, td) @@ -763,11 +762,15 @@ clen = control->m_len; SOCKBUF_LOCK(&so->so_snd); - if (so->so_snd.sb_state & SBS_CANTSENDMORE) - snderr(EPIPE); + if (so->so_snd.sb_state & SBS_CANTSENDMORE) { + SOCKBUF_UNLOCK(&so->so_snd); + error = EPIPE; + goto out; + } if (so->so_error) { error = so->so_error; so->so_error = 0; + SOCKBUF_UNLOCK(&so->so_snd); goto out; } if ((so->so_state & SS_ISCONNECTED) == 0) { @@ -780,11 +783,19 @@ if ((so->so_proto->pr_flags & PR_CONNREQUIRED) && (so->so_proto->pr_flags & PR_IMPLOPCL) == 0) { if ((so->so_state & SS_ISCONFIRMING) == 0 && - !(resid == 0 && clen != 0)) - snderr(ENOTCONN); - } else if (addr == NULL) - snderr(so->so_proto->pr_flags & PR_CONNREQUIRED ? - ENOTCONN : EDESTADDRREQ); + !(resid == 0 && clen != 0)) { + SOCKBUF_UNLOCK(&so->so_snd); + error = ENOTCONN; + goto out; + } + } else if (addr == NULL) { + if (so->so_proto->pr_flags & PR_CONNREQUIRED) + error = ENOTCONN; + else + error = EDESTADDRREQ; + SOCKBUF_UNLOCK(&so->so_snd); + goto out; + } } /* @@ -795,8 +806,10 @@ if (flags & MSG_OOB) space += 1024; space -= clen; - if (resid > space) - snderr(EMSGSIZE); + if (resid > space) { + error = EMSGSIZE; + goto out; + } SOCKBUF_UNLOCK(&so->so_snd); if (uio == NULL) { resid = 0; @@ -874,7 +887,7 @@ * must check for short counts if EINTR/ERESTART are returned. * Data and control buffers are freed on return. */ - +#define snderr(errno) { error = (errno); goto release; } int sosend(so, addr, uio, top, control, flags, td) struct socket *so; @@ -1036,6 +1049,7 @@ m_freem(control); return (error); } +#undef snderr /* * The part of soreceive() that implements reading non-inline out-of-band From owner-p4-projects@FreeBSD.ORG Mon Jan 2 16:14:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD5EF16A422; Mon, 2 Jan 2006 16:14:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9524D16A41F for ; Mon, 2 Jan 2006 16:14:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1777D43D5C for ; Mon, 2 Jan 2006 16:14:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k02GE6eD076976 for ; Mon, 2 Jan 2006 16: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 k02GE5Gh076970 for perforce@freebsd.org; Mon, 2 Jan 2006 16:14:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Jan 2006 16:14:05 GMT Message-Id: <200601021614.k02GE5Gh076970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89047 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2006 16:14:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=89047 Change 89047 by rwatson@rwatson_sesame on 2006/01/02 16:14:01 Style and logic fixes: - White space - Sort includes - Use EX_* exit return values - Staticize globals - Fix buffer sizing for strftime() - Fix command line argument ordering/handling Submitted by: Wojciech A. Koszek Affected files ... .. //depot/projects/trustedbsd/openbsm/README#6 edit .. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#6 (text+ko) ==== @@ -57,6 +57,7 @@ Robert Watson Wayne Salamon Tom Rhodes + Wojciech Koszek Contributions @@ -68,5 +69,3 @@ Information on OpenBSM may be found on the OpenBSM home page: - http://www.OpenBSM.org/ - http://www.TrustedBSD.org/ ==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#5 (text+ko) ==== @@ -41,11 +41,12 @@ #include #include -#include +#include +#include +#include #include #include -#include -#include +#include #include "auditreduce.h" @@ -53,30 +54,31 @@ extern char *optarg; extern int optind, optopt, opterr,optreset; -au_mask_t maskp; /* Used while selecting based on class */ -time_t p_atime;/* select records created after this time */ -time_t p_btime;/* select records created before this time */ -uint16_t p_evtype; /* The event that we are searching for */ -int p_auid; /* audit id */ -int p_euid; /* effective user id */ -int p_egid; /* effective group id */ -int p_rgid; /* real group id */ -int p_ruid; /* real user id */ -int p_subid; /* subject id */ +static au_mask_t maskp; /* Used while selecting based on class */ +static time_t p_atime;/* select records created after this time */ +static time_t p_btime;/* select records created before this time */ +static uint16_t p_evtype; /* The event that we are searching for */ +static int p_auid; /* audit id */ +static int p_euid; /* effective user id */ +static int p_egid; /* effective group id */ +static int p_rgid; /* real group id */ +static int p_ruid; /* real user id */ +static int p_subid; /* subject id */ /* Following are the objects (-o option) that we can select upon */ -char *p_fileobj = NULL; -char *p_msgqobj = NULL; -char *p_pidobj = NULL; -char *p_semobj = NULL; -char *p_shmobj = NULL; -char *p_sockobj = NULL; +static char *p_fileobj = NULL; +static char *p_msgqobj = NULL; +static char *p_pidobj = NULL; +static char *p_semobj = NULL; +static char *p_shmobj = NULL; +static char *p_sockobj = NULL; -uint32_t opttochk = 0; +static uint32_t opttochk = 0; -static void usage(const char *msg) +static void +usage(const char *msg) { fprintf(stderr, "%s\n", msg); fprintf(stderr, "Usage: auditreduce [options] audit-trail-file [....] \n"); @@ -99,7 +101,7 @@ fprintf(stderr, "\t\t shmid=\n"); fprintf(stderr, "\t-r : real user\n"); fprintf(stderr, "\t-u : audit user\n"); - exit(1); + exit(EX_USAGE); } /* @@ -531,172 +533,179 @@ } -int main(int argc, char **argv) +int +main(int argc, char **argv) { - char ch; - int i; - FILE *fp; - char *objval; + struct group *grp; + struct passwd *pw; struct tm tm; au_event_t *n; - struct passwd *pw; - struct group *grp; + FILE *fp; + int i; + char *objval, *converr; + char ch; + char timestr[128]; - char *converr = NULL; - char timestr[100]; + converr = NULL; - while((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:")) != -1) { - + while ((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:")) != -1) { switch(ch) { + case 'A': + SETOPT(opttochk, OPT_A); + break; + case 'a': + if (ISOPTSET(opttochk, OPT_a)) { + usage("d is exclusive with a and b"); + } + SETOPT(opttochk, OPT_a); + strptime(optarg, "%Y%m%d%H%M%S", &tm); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_atime = mktime(&tm); + break; + case 'b': + if (ISOPTSET(opttochk, OPT_b)) { + usage("d is exclusive with a and b"); + } + SETOPT(opttochk, OPT_b); + strptime(optarg, "%Y%m%d%H%M%S", &tm); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_btime = mktime(&tm); + break; + case 'c': + if(0 != getauditflagsbin(optarg, &maskp)) { + /* Incorrect class */ + usage("Incorrect class"); + } + SETOPT(opttochk, OPT_c); + break; - case 'A': SETOPT(opttochk, OPT_A); - break; + case 'd': + if (ISOPTSET(opttochk, OPT_b) || ISOPTSET(opttochk, OPT_a)) { + usage("'d' is exclusive with 'a' and 'b'"); + } + SETOPT(opttochk, OPT_d); + strptime(optarg, "%Y%m%d", &tm); + strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_atime = mktime(&tm); + tm.tm_hour = 23; + tm.tm_min = 59; + tm.tm_sec = 59; + strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_btime = mktime(&tm); + break; - case 'a': if(ISOPTSET(opttochk, OPT_a)) { - usage("d is exclusive with a and b"); - } - SETOPT(opttochk, OPT_a); - strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, 99, "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_atime = mktime(&tm); - break; - - case 'b': if(ISOPTSET(opttochk, OPT_b)) { - usage("d is exclusive with a and b"); - } - SETOPT(opttochk, OPT_b); - strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, 99, "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_btime = mktime(&tm); - break; - - case 'c': if(0 != getauditflagsbin(optarg, &maskp)) { - /* Incorrect class */ - usage("Incorrect class"); - } - SETOPT(opttochk, OPT_c); + case 'e': + p_euid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + /* Try the actual name */ + if ((pw = getpwnam(optarg)) == NULL) { break; + } + p_euid = pw->pw_uid; + } + SETOPT(opttochk, OPT_e); + break; - case 'd': if(ISOPTSET(opttochk, OPT_b) || ISOPTSET(opttochk, OPT_a)) { - usage("d is exclusive with a and b"); - } - SETOPT(opttochk, OPT_d); - strptime(optarg, "%Y%m%d", &tm); - strftime(timestr, 99, "%Y%m%d", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_atime = mktime(&tm); - - tm.tm_hour = 23; tm.tm_min = 59; tm.tm_sec = 59; - strftime(timestr, 99, "%Y%m%d", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_btime = mktime(&tm); + case 'f': + p_egid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + /* try actual group name */ + if ((grp = getgrnam(optarg)) == NULL) { break; + } + p_egid = grp->gr_gid; + } + SETOPT(opttochk, OPT_f); + break; - case 'e': p_euid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - /* Try the actual name */ - if((pw = getpwnam(optarg)) == NULL) { - break; - } - p_euid = pw->pw_uid; - } - SETOPT(opttochk, OPT_e); + case 'g': + p_rgid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + /* try actual group name */ + if ((grp = getgrnam(optarg)) == NULL) { break; + } + p_rgid = grp->gr_gid; + } + SETOPT(opttochk, OPT_g); + break; - case 'f': p_egid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - /* try actual group name */ - if((grp = getgrnam(optarg)) == NULL) { - break; - } - p_egid = grp->gr_gid; - } - SETOPT(opttochk, OPT_f); - break; + case 'j': + p_subid = strtol(optarg, (char **)NULL, 10); + SETOPT(opttochk, OPT_j); + break; - case 'g': p_rgid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - /* try actual group name */ - if((grp = getgrnam(optarg)) == NULL) { - break; - } - p_rgid = grp->gr_gid; - } - SETOPT(opttochk, OPT_g); - break; + case 'm': + p_evtype = strtol(optarg, (char **)NULL, 10); + if (p_evtype == 0) { + /* Could be the string representation */ + n = getauevnonam(optarg); + if(n == NULL) { + usage("Incorrect event name"); + } + p_evtype = *n; + free(n); + } + SETOPT(opttochk, OPT_m); + break; - case 'j': p_subid = strtol(optarg, (char **)NULL, 10); - SETOPT(opttochk, OPT_j); - break; + case 'o': + objval = strchr(optarg, '='); + if (objval != NULL) { + *objval = '\0'; + objval += 1; + parse_object_type(optarg, objval); + } + break; - case 'm': p_evtype = strtol(optarg, (char **)NULL, 10); - if(p_evtype == 0) { - /* Could be the string representation */ - n = getauevnonam(optarg); - if(n == NULL) { - usage("Incorrect event name"); - } - p_evtype = *n; - free(n); - } - SETOPT(opttochk, OPT_m); + case 'r': + p_ruid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + if ((pw = getpwnam(optarg)) == NULL) { break; + } + p_ruid = pw->pw_uid; + } + SETOPT(opttochk, OPT_r); + break; - case 'o': objval = strchr(optarg, '='); - if(objval != NULL) { - *objval = '\0'; - objval += 1; - parse_object_type(optarg, objval); - } + case 'u': + p_auid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + if ((pw = getpwnam(optarg)) == NULL) { break; - - case 'r': p_ruid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - if((pw = getpwnam(optarg)) == NULL) { - break; - } - p_ruid = pw->pw_uid; - } - SETOPT(opttochk, OPT_r); - break; - - case 'u': p_auid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - if((pw = getpwnam(optarg)) == NULL) { - break; - } - p_auid = pw->pw_uid; - } - SETOPT(opttochk, OPT_u); - break; - - case '?': - default : - usage("Unknown option"); + } + p_auid = pw->pw_uid; + } + SETOPT(opttochk, OPT_u); + break; + case '?': + default : + usage("Unknown option"); } } + argv += optind; + argc -= optind; - if (optind + 2 != argc) - usage("Unknown option"); + if (argc == 0) + usage("Filename needed"); - /* For each of the files passed as arguments dump the contents */ - if(optind == argc) { - // XXX should look in the default directory for audit trail files - return -1; - } - - // XXX we should actually be merging records here - for (i = optind; i < argc; i++) { - fp = fopen(argv[i], "r"); - if((fp == NULL) || (-1 == select_records(fp))) { - perror(argv[i]); + /* + * XXX: We should actually be merging records here + */ + for (i = 0;i < argc; i++) { + fp = fopen(*argv, "r"); + if (fp == NULL) + errx(EXIT_FAILURE, "Couldn't open %s", *argv); + if (select_records(fp) == -1) { + errx(EXIT_FAILURE, "Couldn't select records %s", *argv); } - if(fp != NULL) - fclose(fp); + fclose(fp); } - - return 1; + exit(EXIT_SUCCESS); } From owner-p4-projects@FreeBSD.ORG Mon Jan 2 17:30:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2EB616A423; Mon, 2 Jan 2006 17:30:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9713C16A422 for ; Mon, 2 Jan 2006 17:30:10 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A41C843D91 for ; Mon, 2 Jan 2006 17:29:52 +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 k02HTqtr087222 for ; Mon, 2 Jan 2006 17:29:52 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 k02HTqit087219 for perforce@freebsd.org; Mon, 2 Jan 2006 17:29:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Jan 2006 17:29:52 GMT Message-Id: <200601021729.k02HTqit087219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2006 17:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=89053 Change 89053 by rwatson@rwatson_sesame on 2006/01/02 17:29:46 Integrate recent changes in projects/trustedbsd/audit3/contrib/openbsm from projects/trustedbsd/openbsm: - README, TODO updates. - auditreduce cleanup and bug fixes. - locking fixes and restructuring for bsm_class, bsm_control, bsm_event. - annotate some remaining problems using libbsm with threaded applications. - fix various parsing bugs in databases. - audump debugging tool for various audit databases. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/audump.c#1 branch Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#2 (text+ko) ==== @@ -57,6 +57,7 @@ Robert Watson Wayne Salamon Tom Rhodes + Wojciech Koszek Contributions @@ -68,5 +69,3 @@ Information on OpenBSM may be found on the OpenBSM home page: - http://www.OpenBSM.org/ - http://www.TrustedBSD.org/ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/TODO#2 (text+ko) ==== @@ -5,3 +5,4 @@ type and then compares the results with known good data. Make sure to test that things work properly with respect to endianness of the local platform. +- Document contents of libbsm "public" data structures in libbsm man pages. ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bin/auditreduce/auditreduce.c#3 (text+ko) ==== @@ -41,11 +41,12 @@ #include #include -#include +#include +#include +#include #include #include -#include -#include +#include #include "auditreduce.h" @@ -53,30 +54,31 @@ extern char *optarg; extern int optind, optopt, opterr,optreset; -au_mask_t maskp; /* Used while selecting based on class */ -time_t p_atime;/* select records created after this time */ -time_t p_btime;/* select records created before this time */ -uint16_t p_evtype; /* The event that we are searching for */ -int p_auid; /* audit id */ -int p_euid; /* effective user id */ -int p_egid; /* effective group id */ -int p_rgid; /* real group id */ -int p_ruid; /* real user id */ -int p_subid; /* subject id */ +static au_mask_t maskp; /* Used while selecting based on class */ +static time_t p_atime;/* select records created after this time */ +static time_t p_btime;/* select records created before this time */ +static uint16_t p_evtype; /* The event that we are searching for */ +static int p_auid; /* audit id */ +static int p_euid; /* effective user id */ +static int p_egid; /* effective group id */ +static int p_rgid; /* real group id */ +static int p_ruid; /* real user id */ +static int p_subid; /* subject id */ /* Following are the objects (-o option) that we can select upon */ -char *p_fileobj = NULL; -char *p_msgqobj = NULL; -char *p_pidobj = NULL; -char *p_semobj = NULL; -char *p_shmobj = NULL; -char *p_sockobj = NULL; +static char *p_fileobj = NULL; +static char *p_msgqobj = NULL; +static char *p_pidobj = NULL; +static char *p_semobj = NULL; +static char *p_shmobj = NULL; +static char *p_sockobj = NULL; -uint32_t opttochk = 0; +static uint32_t opttochk = 0; -static void usage(const char *msg) +static void +usage(const char *msg) { fprintf(stderr, "%s\n", msg); fprintf(stderr, "Usage: auditreduce [options] audit-trail-file [....] \n"); @@ -99,7 +101,7 @@ fprintf(stderr, "\t\t shmid=\n"); fprintf(stderr, "\t-r : real user\n"); fprintf(stderr, "\t-u : audit user\n"); - exit(1); + exit(EX_USAGE); } /* @@ -531,172 +533,179 @@ } -int main(int argc, char **argv) +int +main(int argc, char **argv) { - char ch; - int i; - FILE *fp; - char *objval; + struct group *grp; + struct passwd *pw; struct tm tm; au_event_t *n; - struct passwd *pw; - struct group *grp; + FILE *fp; + int i; + char *objval, *converr; + char ch; + char timestr[128]; - char *converr = NULL; - char timestr[100]; + converr = NULL; - while((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:")) != -1) { - + while ((ch = getopt(argc, argv, "Aa:b:c:d:e:f:g:j:m:o:r:u:")) != -1) { switch(ch) { + case 'A': + SETOPT(opttochk, OPT_A); + break; + case 'a': + if (ISOPTSET(opttochk, OPT_a)) { + usage("d is exclusive with a and b"); + } + SETOPT(opttochk, OPT_a); + strptime(optarg, "%Y%m%d%H%M%S", &tm); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_atime = mktime(&tm); + break; + case 'b': + if (ISOPTSET(opttochk, OPT_b)) { + usage("d is exclusive with a and b"); + } + SETOPT(opttochk, OPT_b); + strptime(optarg, "%Y%m%d%H%M%S", &tm); + strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_btime = mktime(&tm); + break; + case 'c': + if(0 != getauditflagsbin(optarg, &maskp)) { + /* Incorrect class */ + usage("Incorrect class"); + } + SETOPT(opttochk, OPT_c); + break; - case 'A': SETOPT(opttochk, OPT_A); - break; + case 'd': + if (ISOPTSET(opttochk, OPT_b) || ISOPTSET(opttochk, OPT_a)) { + usage("'d' is exclusive with 'a' and 'b'"); + } + SETOPT(opttochk, OPT_d); + strptime(optarg, "%Y%m%d", &tm); + strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_atime = mktime(&tm); + tm.tm_hour = 23; + tm.tm_min = 59; + tm.tm_sec = 59; + strftime(timestr, sizeof(timestr), "%Y%m%d", &tm); + //fprintf(stderr, "Time converted = %s\n", timestr); + p_btime = mktime(&tm); + break; - case 'a': if(ISOPTSET(opttochk, OPT_a)) { - usage("d is exclusive with a and b"); - } - SETOPT(opttochk, OPT_a); - strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, 99, "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_atime = mktime(&tm); - break; - - case 'b': if(ISOPTSET(opttochk, OPT_b)) { - usage("d is exclusive with a and b"); - } - SETOPT(opttochk, OPT_b); - strptime(optarg, "%Y%m%d%H%M%S", &tm); - strftime(timestr, 99, "%Y%m%d%H%M%S", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_btime = mktime(&tm); - break; - - case 'c': if(0 != getauditflagsbin(optarg, &maskp)) { - /* Incorrect class */ - usage("Incorrect class"); - } - SETOPT(opttochk, OPT_c); + case 'e': + p_euid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + /* Try the actual name */ + if ((pw = getpwnam(optarg)) == NULL) { break; + } + p_euid = pw->pw_uid; + } + SETOPT(opttochk, OPT_e); + break; - case 'd': if(ISOPTSET(opttochk, OPT_b) || ISOPTSET(opttochk, OPT_a)) { - usage("d is exclusive with a and b"); - } - SETOPT(opttochk, OPT_d); - strptime(optarg, "%Y%m%d", &tm); - strftime(timestr, 99, "%Y%m%d", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_atime = mktime(&tm); - - tm.tm_hour = 23; tm.tm_min = 59; tm.tm_sec = 59; - strftime(timestr, 99, "%Y%m%d", &tm); - //fprintf(stderr, "Time converted = %s\n", timestr); - p_btime = mktime(&tm); + case 'f': + p_egid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + /* try actual group name */ + if ((grp = getgrnam(optarg)) == NULL) { break; + } + p_egid = grp->gr_gid; + } + SETOPT(opttochk, OPT_f); + break; - case 'e': p_euid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - /* Try the actual name */ - if((pw = getpwnam(optarg)) == NULL) { - break; - } - p_euid = pw->pw_uid; - } - SETOPT(opttochk, OPT_e); + case 'g': + p_rgid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + /* try actual group name */ + if ((grp = getgrnam(optarg)) == NULL) { break; + } + p_rgid = grp->gr_gid; + } + SETOPT(opttochk, OPT_g); + break; - case 'f': p_egid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - /* try actual group name */ - if((grp = getgrnam(optarg)) == NULL) { - break; - } - p_egid = grp->gr_gid; - } - SETOPT(opttochk, OPT_f); - break; + case 'j': + p_subid = strtol(optarg, (char **)NULL, 10); + SETOPT(opttochk, OPT_j); + break; - case 'g': p_rgid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - /* try actual group name */ - if((grp = getgrnam(optarg)) == NULL) { - break; - } - p_rgid = grp->gr_gid; - } - SETOPT(opttochk, OPT_g); - break; + case 'm': + p_evtype = strtol(optarg, (char **)NULL, 10); + if (p_evtype == 0) { + /* Could be the string representation */ + n = getauevnonam(optarg); + if(n == NULL) { + usage("Incorrect event name"); + } + p_evtype = *n; + free(n); + } + SETOPT(opttochk, OPT_m); + break; - case 'j': p_subid = strtol(optarg, (char **)NULL, 10); - SETOPT(opttochk, OPT_j); - break; + case 'o': + objval = strchr(optarg, '='); + if (objval != NULL) { + *objval = '\0'; + objval += 1; + parse_object_type(optarg, objval); + } + break; - case 'm': p_evtype = strtol(optarg, (char **)NULL, 10); - if(p_evtype == 0) { - /* Could be the string representation */ - n = getauevnonam(optarg); - if(n == NULL) { - usage("Incorrect event name"); - } - p_evtype = *n; - free(n); - } - SETOPT(opttochk, OPT_m); + case 'r': + p_ruid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + if ((pw = getpwnam(optarg)) == NULL) { break; + } + p_ruid = pw->pw_uid; + } + SETOPT(opttochk, OPT_r); + break; - case 'o': objval = strchr(optarg, '='); - if(objval != NULL) { - *objval = '\0'; - objval += 1; - parse_object_type(optarg, objval); - } + case 'u': + p_auid = strtol(optarg, &converr, 10); + if (*converr != '\0') { + if ((pw = getpwnam(optarg)) == NULL) { break; - - case 'r': p_ruid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - if((pw = getpwnam(optarg)) == NULL) { - break; - } - p_ruid = pw->pw_uid; - } - SETOPT(opttochk, OPT_r); - break; - - case 'u': p_auid = strtol(optarg, &converr, 10); - if(*converr != '\0') { - if((pw = getpwnam(optarg)) == NULL) { - break; - } - p_auid = pw->pw_uid; - } - SETOPT(opttochk, OPT_u); - break; - - case '?': - default : - usage("Unknown option"); + } + p_auid = pw->pw_uid; + } + SETOPT(opttochk, OPT_u); + break; + case '?': + default : + usage("Unknown option"); } } + argv += optind; + argc -= optind; - if (optind + 2 != argc) - usage("Unknown option"); + if (argc == 0) + usage("Filename needed"); - /* For each of the files passed as arguments dump the contents */ - if(optind == argc) { - // XXX should look in the default directory for audit trail files - return -1; - } - - // XXX we should actually be merging records here - for (i = optind; i < argc; i++) { - fp = fopen(argv[i], "r"); - if((fp == NULL) || (-1 == select_records(fp))) { - perror(argv[i]); + /* + * XXX: We should actually be merging records here + */ + for (i = 0;i < argc; i++) { + fp = fopen(*argv, "r"); + if (fp == NULL) + errx(EXIT_FAILURE, "Couldn't open %s", *argv); + if (select_records(fp) == -1) { + errx(EXIT_FAILURE, "Couldn't select records %s", *argv); } - if(fp != NULL) - fclose(fp); + fclose(fp); } - - return 1; + exit(EXIT_SUCCESS); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_class.c#4 (text+ko) ==== @@ -46,7 +46,8 @@ /* * XXX The reentrant versions of the following functions is TBD * XXX struct au_class_ent *getclassent_r(au_class_ent_t *class_int); - * XXX struct au_class_ent *getclassnam_r(au_class_ent_t *class_int, const char *name); + * XXX struct au_class_ent *getclassnam_r(au_class_ent_t *class_int, const + * char *name); */ /* @@ -132,28 +133,24 @@ /* * Return the next au_class_ent structure from the file setauclass should be * called before invoking this function for the first time. + * + * Must be called with mutex held. */ -struct au_class_ent * -getauclassent(void) +static struct au_class_ent * +getauclassent_locked(void) { struct au_class_ent *c; char *tokptr, *nl; - pthread_mutex_lock(&mutex); - - if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - pthread_mutex_unlock(&mutex); + if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) return (NULL); - } /* * Read until next non-comment line is found, or EOF. */ while (1) { - if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { - pthread_mutex_unlock(&mutex); + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) return (NULL); - } if (linestr[0] != '#') break; } @@ -165,26 +162,55 @@ tokptr = linestr; c = get_class_area(); /* allocate */ - if (c == NULL) { - pthread_mutex_unlock(&mutex); + if (c == NULL) return (NULL); - } /* Parse tokptr to au_class_ent components. */ if (classfromstr(tokptr, delim, c) == NULL) { free_au_class_ent(c); - pthread_mutex_unlock(&mutex); return (NULL); } + return (c); +} + +struct au_class_ent * +getauclassent(void) +{ + struct au_class_ent *c; + + pthread_mutex_lock(&mutex); + c = getauclassent_locked(); pthread_mutex_unlock(&mutex); return (c); } /* + * Rewind to the beginning of the enumeration. + * + * Must be called with mutex held. + */ +static void +setauclass_locked(void) +{ + + if (fp != NULL) + fseek(fp, 0, SEEK_SET); +} + +void +setauclass(void) +{ + + pthread_mutex_lock(&mutex); + setauclass_locked(); + pthread_mutex_unlock(&mutex); +} + +/* * Return the next au_class_entry having the given class name. */ -struct au_class_ent * +au_class_ent_t * getauclassnam(const char *name) { struct au_class_ent *c; @@ -192,22 +218,8 @@ if (name == NULL) return (NULL); - /* Rewind to beginning of file. */ - setauclass(); - pthread_mutex_lock(&mutex); - - if ((fp == NULL) && ((fp = fopen(AUDIT_CLASS_FILE, "r")) == NULL)) { - pthread_mutex_unlock(&mutex); - return (NULL); - } - - c = get_class_area(); /* allocate */ - if (c == NULL) { - pthread_mutex_unlock(&mutex); - return (NULL); - } - + setauclass_locked(); while ((c = getauclassent()) != NULL) { if (strcmp(name, c->ac_name) == 0) { pthread_mutex_unlock(&mutex); @@ -215,22 +227,29 @@ } free_au_class_ent(c); } - pthread_mutex_unlock(&mutex); return (NULL); } /* - * Rewind to the beginning of the enumeration. + * Return the next au_class_entry having the given class number. + * + * OpenBSM extension. */ -void -setauclass(void) +au_class_ent_t * +getauclassnum(au_class_t class_number) { + au_class_ent_t *c; pthread_mutex_lock(&mutex); - if (fp != NULL) - fseek(fp, 0, SEEK_SET); + setauclass_locked(); + while ((c = getauclassent()) != NULL) { + if (class_number == c->ac_class) + return (c); + free_au_class_ent(c); + } pthread_mutex_unlock(&mutex); + return (NULL); } /* ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_control.c#3 (text+ko) ==== @@ -50,9 +50,11 @@ /* * Returns the string value corresponding to the given label from the * configuration file. + * + * Must be called with mutex held. */ static int -getstrfromtype(char *name, char **str) +getstrfromtype_locked(char *name, char **str) { char *type, *nl; char *tokptr; @@ -60,34 +62,38 @@ *str = NULL; - pthread_mutex_lock(&mutex); + if ((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == NULL)) + return (-1); /* Error */ + + while (1) { + if (fgets(linestr, AU_LINE_MAX, fp) == NULL) { + if (ferror(fp)) + return (-1); + return (0); /* EOF */ + } + + if (linestr[0] == '#') + continue; - if ((fp == NULL) && ((fp = fopen(AUDIT_CONTROL_FILE, "r")) == - NULL)) { - pthread_mutex_unlock(&mutex); - return (0); /* Error */ - } - /* Search for the line beginning with the given name. */ - while (fgets(linestr, AU_LINE_MAX, fp) != NULL) { /* Remove trailing new line character. */ if ((nl = strrchr(linestr, '\n')) != NULL) *nl = '\0'; tokptr = linestr; if ((type = strtok_r(tokptr, delim, &last)) != NULL) { - if (!strcmp(name, type)) { + if (strcmp(name, type) == 0) { /* Found matching name. */ *str = strtok_r(NULL, delim, &last); - pthread_mutex_unlock(&mutex); - if (*str == NULL) - return (1); /* Parse error in file */ + if (*str == NULL) { + errno = EINVAL; + return (-1); /* Parse error in file */ + } return (0); /* Success */ } } } - pthread_mutex_unlock(&mutex); return (0); /* EOF */ } @@ -148,11 +154,14 @@ ret = 2; } + + if (getstrfromtype_locked(DIR_CONTROL_ENTRY, &dir) < 0) { + pthread_mutex_unlock(&mutex); + return (-2); + } + pthread_mutex_unlock(&mutex); - if (getstrfromtype(DIR_CONTROL_ENTRY, &dir) == 1) - return (-3); - if (dir == NULL) return (-1); @@ -179,8 +188,14 @@ return (-2); } - if (getstrfromtype(MINFREE_CONTROL_ENTRY, &min) == 1) - return (-3); + pthread_mutex_lock(&mutex); + + if (getstrfromtype_locked(MINFREE_CONTROL_ENTRY, &min) < 0) { + pthread_mutex_unlock(&mutex); + return (-2); + } + + pthread_mutex_unlock(&mutex); if (min == NULL) return (1); @@ -205,8 +220,14 @@ return (-2); } - if (getstrfromtype(FLAGS_CONTROL_ENTRY, &str) == 1) - return (-3); + pthread_mutex_lock(&mutex); + + if (getstrfromtype_locked(FLAGS_CONTROL_ENTRY, &str) < 0) { + pthread_mutex_unlock(&mutex); + return (-2); + } + + pthread_mutex_unlock(&mutex); if (str == NULL) return (1); @@ -234,8 +255,13 @@ return (-2); } - if (getstrfromtype(NA_CONTROL_ENTRY, &str) == 1) - return (-3); + pthread_mutex_lock(&mutex); + + if (getstrfromtype_locked(NA_CONTROL_ENTRY, &str) < 0) { + pthread_mutex_unlock(&mutex); + return (-2); + } + pthread_mutex_unlock(&mutex); if (str == NULL) return (1); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#3 (text+ko) ==== @@ -135,13 +135,20 @@ /* * Rewind the audit_event file. */ +static void +setauevent_locked(void) +{ + + if (fp != NULL) + fseek(fp, 0, SEEK_SET); +} + void setauevent(void) { pthread_mutex_lock(&mutex); - if (fp != NULL) - fseek(fp, 0, SEEK_SET); + setauevent_locked(); pthread_mutex_unlock(&mutex); } @@ -213,11 +220,11 @@ if (name == NULL) return (NULL); + pthread_mutex_lock(&mutex); + /* Rewind to beginning of the file. */ - setauevent(); + setauevent_locked(); - pthread_mutex_lock(&mutex); - if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); return (NULL); @@ -242,8 +249,10 @@ } } + pthread_mutex_unlock(&mutex); + free_au_event_ent(e); - pthread_mutex_unlock(&mutex); + return (NULL); } @@ -255,11 +264,11 @@ struct au_event_ent *e; char *nl; + pthread_mutex_lock(&mutex); + /* Rewind to beginning of the file. */ - setauevent(); + setauevent_locked(); - pthread_mutex_lock(&mutex); - if ((fp == NULL) && ((fp = fopen(AUDIT_EVENT_FILE, "r")) == NULL)) { pthread_mutex_unlock(&mutex); return (NULL); @@ -284,8 +293,8 @@ } } + pthread_mutex_unlock(&mutex); free_au_event_ent(e); - pthread_mutex_unlock(&mutex); return (NULL); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_flags.c#4 (text+ko) ==== @@ -97,6 +97,11 @@ * * XXXRW: If bits are specified that are not matched by any class, they are * omitted rather than rejected with EINVAL. + * + * XXXRW: This is not thread-safe as it relies on atomicity between + * setauclass() and sequential calls to getauclassent(). This could be + * fixed by iterating through the bitmask fields rather than iterating + * through the classes. */ int getauditflagschar(char *auditstr, au_mask_t *masks, int verbose) ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_mask.c#3 (text+ko) ==== @@ -42,11 +42,14 @@ * XXX ev_cache, once created, sticks around until the calling program exits. * This may or may not be a problem as far as absolute memory usage goes, but * at least there don't appear to be any leaks in using the cache. + * + * XXXRW: Note that despite (mutex), load_event_table() could race with + * other consumers of the getauevents() API. */ static LIST_HEAD(, audit_event_map) ev_cache; static int -load_event_table(VOID) +load_event_table(void) { struct au_event_ent *ev; struct audit_event_map *elem; @@ -64,7 +67,7 @@ /* Enumerate the events. */ while ((ev = getauevent()) != NULL) { - elem = malloc (sizeof (struct audit_event_map)); + elem = malloc(sizeof(struct audit_event_map)); if (elem == NULL) { free_au_event_ent(ev); pthread_mutex_unlock(&mutex); @@ -126,7 +129,7 @@ LIST_FOREACH(elem, &ev_cache, ev_list) { if (elem->ev->ae_number == event) { pthread_mutex_unlock(&mutex); - return elem->ev; + return (elem->ev); } } pthread_mutex_unlock(&mutex); From owner-p4-projects@FreeBSD.ORG Tue Jan 3 07:28:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E505C16A424; Tue, 3 Jan 2006 07:28:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B2D616A420 for ; Tue, 3 Jan 2006 07:28:08 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 177D943D5A for ; Tue, 3 Jan 2006 07:28:00 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k037RxF1049026 for ; Tue, 3 Jan 2006 07:27:59 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k037Rx9l049014 for perforce@freebsd.org; Tue, 3 Jan 2006 07:27:59 GMT (envelope-from scottl@freebsd.org) Date: Tue, 3 Jan 2006 07:27:59 GMT Message-Id: <200601030727.k037Rx9l049014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 89078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 07:28:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=89078 Change 89078 by scottl@scottl-junior on 2006/01/03 07:26:31 Start the tree for Xen 3 work. Affected files ... .. //depot/projects/xen3/src/sys/Makefile#1 branch .. //depot/projects/xen3/src/sys/alpha/Makefile#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/api_up1000.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/atomic.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/autoconf.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/busdma_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/busspace.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/clock.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/clock_if.m#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/cpuconf.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/db_disasm.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/db_instruction.h#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/db_interface.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/db_trace.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_1000a.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_2100_a50.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_2100_a500.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_3000_300.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_3000_500.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_axppci_33.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_eb164.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_eb64plus.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_kn20aa.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_kn300.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_kn8ae.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_st550.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dec_st6600.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/divrem.m4#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/elf_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/exception.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/fp_emulate.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/gdb_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/genassym.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/ieee_float.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/ieee_float.h#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/in_cksum.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/interrupt.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/locore.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/mem.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/mp_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/pal.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/pmap.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/prom.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/prom_disp.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/promcons.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/sgmap.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/support.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/swtch.s#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/sys_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/trap.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/uio_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/uma_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/alpha/vm_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/compile/.cvsignore#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/.cvsignore#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/DEFAULTS#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/GENERIC#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/GENERIC.hints#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/MAC#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/Makefile#1 branch .. //depot/projects/xen3/src/sys/alpha/conf/NOTES#1 branch .. //depot/projects/xen3/src/sys/alpha/include/_bus.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/_limits.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/_types.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/alpha_cpu.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/asm.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/atomic.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/bootinfo.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/bus.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/bus_dma.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/bwx.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/chipset.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/clock.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/clockvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/cpu.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/cpuconf.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/cpufunc.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/db_machdep.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/elf.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/endian.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/exec.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/float.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/floatingpoint.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/fpu.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/frame.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/gdb_machdep.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ieee.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ieeefp.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/in_cksum.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/inst.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/intr.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/intrcnt.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ioctl_bt848.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ioctl_meteor.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/kdb.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/limits.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/md_var.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/memdev.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/mutex.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pal.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/param.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pc/bios.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pc/display.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pc/vesa.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pcb.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pmap.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pmc_mdep.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ppireg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/proc.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/profile.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/prom.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/pte.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ptrace.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/reg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/reloc.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/resource.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/rpb.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/runq.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/setjmp.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/sf_buf.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/sgmap.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/sigframe.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/signal.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/smp.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/stdarg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/swiz.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/sysarch.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/timerreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/ucontext.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/varargs.h#1 branch .. //depot/projects/xen3/src/sys/alpha/include/vmparam.h#1 branch .. //depot/projects/xen3/src/sys/alpha/isa/isa.c#1 branch .. //depot/projects/xen3/src/sys/alpha/isa/isa_dma.c#1 branch .. //depot/projects/xen3/src/sys/alpha/isa/isavar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/isa/mcclock_isa.c#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/Makefile#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux.h#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_dummy.c#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_genassym.c#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_ipc64.h#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_locore.s#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_machdep.c#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_proto.h#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_syscall.h#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_sysent.c#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/linux_sysvec.c#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/syscalls.conf#1 branch .. //depot/projects/xen3/src/sys/alpha/linux/syscalls.master#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcbus.c#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcbusreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcbusvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcmem.c#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcpcia.c#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcpciareg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/mcbus/mcpciavar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/Makefile#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/README.mach-traps#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/exec_ecoff.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/imgact_osf1.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_ioctl.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_misc.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_mount.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_proto.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_signal.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_signal.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_syscall.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_sysent.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_sysvec.c#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/osf1_util.h#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/syscalls.conf#1 branch .. //depot/projects/xen3/src/sys/alpha/osf1/syscalls.master#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/alphapci_if.m#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/apecs.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/apecs_pci.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/apecsreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/apecsvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/bwx.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/cia.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/cia_pci.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/ciareg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/ciavar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/irongate.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/irongate_pci.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/irongatereg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/irongatevar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/lca.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/lca_pci.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/lcareg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/lcavar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/pci_eb164_intr.s#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/pci_eb64plus_intr.s#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/pcibus.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/pcibus.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/swiz.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/t2.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/t2_pci.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/t2reg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/t2var.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/tsunami.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/tsunami_pci.c#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/tsunamireg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/pci/tsunamivar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/dwlpx.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/dwlpxreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/dwlpxvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/gbus.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/gbusreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/gbusvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/kftxx.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/kftxxreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/kftxxvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/mcclock_tlsb.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/tlsb.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/tlsbcpu.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/tlsbmem.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/tlsbreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/tlsbvar.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/zs_tlsb.c#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/zsreg.h#1 branch .. //depot/projects/xen3/src/sys/alpha/tlsb/zsvar.h#1 branch .. //depot/projects/xen3/src/sys/amd64/Makefile#1 branch .. //depot/projects/xen3/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/xen3/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/xen3/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/xen3/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/xen3/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/xen3/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/xen3/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/xen3/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/xen3/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/xen3/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/float.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/param.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/xen3/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/xen3/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/xen3/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/xen3/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/xen3/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/xen3/src/sys/arm/arm/support.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/xen3/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/xen3/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/xen3/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/xen3/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/xen3/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/xen3/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/_types.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/asm.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/bus.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/clock.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/elf.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/endian.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/exec.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/float.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/fp.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/frame.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/intr.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/limits.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/param.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/proc.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/profile.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/psl.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/pte.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/reg.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/resource.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/runq.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/signal.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/smp.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/swi.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/trap.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/xen3/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/xen3/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/xen3/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/xen3/src/sys/boot/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/README#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/boot1/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/boot1/boot1.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/cdboot/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/cdboot/version#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/common/Makefile.common#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/common/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/common/help.alpha#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/common/ldscript#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/common/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/OSFpal.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/alpha_copy.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/alpha_module.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/bbinfo.h#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/bootinfo.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/common.h#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/delay.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/devicename.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/elf_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/getsecs.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/libalpha.h#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/pal.S#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/prom.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/prom_disp.S#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/prom_swpal.S#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/reboot.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/srmdisk.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/srmnet.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/start.S#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/libalpha/time.c#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/loader/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/loader/version#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/netboot/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/alpha/netboot/version#1 branch .. //depot/projects/xen3/src/sys/boot/arc/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/arc/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/arc/include/arcfuncs.h#1 branch .. //depot/projects/xen3/src/sys/boot/arc/include/arctypes.h#1 branch .. //depot/projects/xen3/src/sys/boot/arc/include/libarc.h#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/abort.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/arcconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/arcdisk.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/arch/alpha/copy.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/arch/alpha/rpb.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/arch/alpha/setjmp.S#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/arch/alpha/start.S#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/bootinfo.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/delay.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/devicename.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/elf_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/module.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/prom.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/setjmperr.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/lib/time.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/loader/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/arc/loader/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/loader/help.alpha#1 branch .. //depot/projects/xen3/src/sys/boot/arc/loader/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/arc/loader/version#1 branch .. //depot/projects/xen3/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/boot.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/xen3/src/sys/boot/common/commands.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/console.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/xen3/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/help.common#1 branch .. //depot/projects/xen3/src/sys/boot/common/interp.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/xen3/src/sys/boot/common/load.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/loader.8#1 branch .. //depot/projects/xen3/src/sys/boot/common/ls.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/xen3/src/sys/boot/common/misc.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/module.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/xen3/src/sys/boot/common/panic.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/pnpdata#1 branch .. //depot/projects/xen3/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/xen3/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/README#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/bootinfo.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/copy.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/devicename.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/efiboot.h#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/elf_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/module.c#1 branch .. //depot/projects/xen3/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/alpha/sysdep.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/alpha/sysdep.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/xen3/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/xen3/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/xen3/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/xen3/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/xen3/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/xen3/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/xen3/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/xen3/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/xen3/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/xen3/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/xen3/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/xen3/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/xen3/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/xen3/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/gatea20.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/xen3/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/xen3/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/xen3/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/xen3/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/xen3/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/bootinfo.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/copy.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/devicename.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/elf_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/xen3/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/xen3/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/gatea20.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/xen3/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/xen3/src/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/xen3/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/xen3/src/sys/bsm/audit.h#1 branch .. //depot/projects/xen3/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam.c#1 branch .. //depot/projects/xen3/src/sys/cam/cam.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_ccb.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_debug.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_periph.c#1 branch .. //depot/projects/xen3/src/sys/cam/cam_periph.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_queue.c#1 branch .. //depot/projects/xen3/src/sys/cam/cam_queue.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_sim.c#1 branch .. //depot/projects/xen3/src/sys/cam/cam_sim.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_xpt.c#1 branch .. //depot/projects/xen3/src/sys/cam/cam_xpt.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/xen3/src/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/xen3/src/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/xen3/src/sys/coda/00READ#1 branch .. //depot/projects/xen3/src/sys/coda/README#1 branch .. //depot/projects/xen3/src/sys/coda/TODO#1 branch .. //depot/projects/xen3/src/sys/coda/cnode.h#1 branch .. //depot/projects/xen3/src/sys/coda/coda.h#1 branch .. //depot/projects/xen3/src/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/xen3/src/sys/coda/coda_io.h#1 branch .. //depot/projects/xen3/src/sys/coda/coda_kernel.h#1 branch .. //depot/projects/xen3/src/sys/coda/coda_namecache.c#1 branch .. //depot/projects/xen3/src/sys/coda/coda_namecache.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 3 08:08:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A89C16A422; Tue, 3 Jan 2006 08:08:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFD3416A41F for ; Tue, 3 Jan 2006 08:08:49 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7662543D46 for ; Tue, 3 Jan 2006 08:08:49 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0388n6o050658 for ; Tue, 3 Jan 2006 08:08:49 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0388nx2050655 for perforce@freebsd.org; Tue, 3 Jan 2006 08:08:49 GMT (envelope-from scottl@freebsd.org) Date: Tue, 3 Jan 2006 08:08:49 GMT Message-Id: <200601030808.k0388nx2050655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 89079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 08:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=89079 Change 89079 by scottl@scottl-junior on 2006/01/03 08:08:13 Import the Xen3 code as of Jan 2, 2006 Affected files ... .. //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#1 add .. //depot/projects/xen3/src/sys/conf/files#2 edit .. //depot/projects/xen3/src/sys/conf/files.i386-xen#1 add .. //depot/projects/xen3/src/sys/conf/ldscript.i386-xen#1 add .. //depot/projects/xen3/src/sys/conf/options.i386-xen#1 add .. //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/blkfront/block.h#1 add .. //depot/projects/xen3/src/sys/dev/xen/console/console.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/console/xencons_ring.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/console/xencons_ring.h#1 add .. //depot/projects/xen3/src/sys/dev/xen/evtchn/evtchn_dev.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/init.txt#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_client.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_comms.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_comms.h#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_dev.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_probe.c#1 add .. //depot/projects/xen3/src/sys/dev/xen/xenbus/xenbus_xs.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/conf/XENCONF#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/evtchn.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/gnttab.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/hypervisor.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_bus.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/xen_machdep.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/_bus.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/_inttypes.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/_limits.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/_stdint.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/_types.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/acpica_machdep.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/apicreg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/apicvar.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/apm_bios.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/apm_segments.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/asm.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/asmacros.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/atomic.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/bootinfo.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/bus.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/bus_dma.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/clock.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/cpu.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/cpufunc.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/cputypes.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/cserial.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/db_machdep.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/elan_mmcr.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/elf.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/endian.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/evtchn.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/exec.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/float.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/floatingpoint.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/frame.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/gdb_machdep.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/gnttab.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/hypercall.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/hypervisor-ifs.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/hypervisor.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/i4b_cause.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/i4b_debug.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/i4b_ioctl.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/i4b_rbch_ioctl.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/i4b_tel_ioctl.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/i4b_trace.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/ieeefp.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/if_wl_wavelan.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/in_cksum.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/intr_machdep.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/ioctl_bt848.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/ioctl_meteor.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/iodev.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/kdb.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/legacyvar.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/limits.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/macros.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/md_var.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/memdev.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/metadata.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/mp_watchdog.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/mptable.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/multicall.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/mutex.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/npx.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/param.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pcaudioio.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pcb.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pcb_ext.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pci_cfgreg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pcpu.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pcvt_ioctl.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pecoff_machdep.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/perfmon.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pmap.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pmc_mdep.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/ppireg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/privatespace.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/proc.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/profile.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/psl.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/ptrace.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/reg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/reloc.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/resource.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/runq.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/segments.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/setjmp.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/sf_buf.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/sigframe.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/signal.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/smapi.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/smp.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/smptests.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/speaker.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/specialreg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/stdarg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/synch_bitops.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/sysarch.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/timerreg.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/trap.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/tss.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/ucontext.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/varargs.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/vm86.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/vmparam.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xbox.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-os.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/COPYING#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/acm.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/acm_ops.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-ia64.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_32.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/arch-x86_64.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/dom0_ops.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/event_channel.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/grant_table.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/blkif.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/console.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/ioreq.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/netif.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/ring.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/tpmif.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/xenbus.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/io/xs_wire.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/memory.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/physdev.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/sched.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/sched_ctl.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/trace.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/vcpu.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/version.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/vmx_assist.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen-public/xen.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xen_intr.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xenbus.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xenfunc.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xenpmap.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xenstored.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#1 add .. //depot/projects/xen3/src/sys/i386/i386/genassym.c#2 edit .. //depot/projects/xen3/src/sys/i386/i386/i686_mem.c#2 edit .. //depot/projects/xen3/src/sys/i386/i386/initcpu.c#2 edit .. //depot/projects/xen3/src/sys/i386/i386/locore.s#2 edit .. //depot/projects/xen3/src/sys/i386/i386/support.s#2 edit .. //depot/projects/xen3/src/sys/i386/i386/swtch.s#2 edit .. //depot/projects/xen3/src/sys/i386/i386/sys_machdep.c#2 edit .. //depot/projects/xen3/src/sys/i386/i386/trap.c#2 edit .. //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#2 edit .. //depot/projects/xen3/src/sys/i386/include/asmacros.h#2 edit .. //depot/projects/xen3/src/sys/i386/include/pcpu.h#2 edit .. //depot/projects/xen3/src/sys/i386/include/pmap.h#2 edit .. //depot/projects/xen3/src/sys/i386/include/segments.h#2 edit .. //depot/projects/xen3/src/sys/i386/include/trap.h#2 edit .. //depot/projects/xen3/src/sys/i386/isa/npx.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/conf/files#2 (text+ko) ==== @@ -1399,6 +1399,7 @@ libkern/strncpy.c standard libkern/strsep.c standard libkern/strspn.c standard +libkern/strcspn.c standard libkern/strtol.c standard libkern/strtoq.c standard libkern/strtoul.c standard ==== //depot/projects/xen3/src/sys/i386/i386/genassym.c#2 (text+ko) ==== @@ -199,6 +199,7 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, pc_curpmap)); ASSYM(PC_PRIVATE_TSS, offsetof(struct pcpu, pc_private_tss)); + #ifdef DEV_APIC ASSYM(LA_VER, offsetof(struct LAPIC, version)); ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); @@ -226,3 +227,8 @@ ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); #endif + +#ifdef XEN +ASSYM(PC_CR3, offsetof(struct pcpu, pc_cr3)); +ASSYM(HYPERVISOR_STACK_SWITCH, __HYPERVISOR_stack_switch); +#endif ==== //depot/projects/xen3/src/sys/i386/i386/i686_mem.c#2 (text+ko) ==== @@ -609,12 +609,16 @@ i686_mem_drvinit(void *unused) { /* Try for i686 MTRRs */ +#ifndef XEN if (!mtrrs_disabled && (cpu_feature & CPUID_MTRR) && ((cpu_id & 0xf00) == 0x600 || (cpu_id & 0xf00) == 0xf00) && ((strcmp(cpu_vendor, "GenuineIntel") == 0) || (strcmp(cpu_vendor, "AuthenticAMD") == 0))) { mem_range_softc.mr_op = &i686_mrops; } +#else + i686_mrops.init = NULL; /* XXX make "defined but not used" warning go away */ +#endif } SYSINIT(i686memdev,SI_SUB_DRIVERS,SI_ORDER_FIRST,i686_mem_drvinit,NULL) ==== //depot/projects/xen3/src/sys/i386/i386/initcpu.c#2 (text+ko) ==== @@ -545,6 +545,9 @@ initializecpu(void) { +#ifdef XEN + return; +#endif switch (cpu) { #ifdef I486_CPU case CPU_BLUE: ==== //depot/projects/xen3/src/sys/i386/i386/locore.s#2 (text+ko) ==== @@ -42,6 +42,7 @@ #include "opt_bootp.h" #include "opt_compat.h" #include "opt_nfsroot.h" +#include "opt_global.h" #include "opt_pmap.h" #include @@ -55,6 +56,11 @@ #include "assym.s" +#ifdef XEN +.section __xen_guest + .asciz "LOADER=generic,GUEST_OS=freebsd,GUEST_VER=7.0,XEN_VER=xen-3.0,BSD_SYMTAB" +#endif + /* * XXX * @@ -152,9 +158,15 @@ * Some handy macros * */ - +#ifdef XEN +/* + * We're already in protected mode + */ +#define R(foo) (foo) +#else #define R(foo) ((foo)-KERNBASE) - +#endif + #define ALLOCPAGES(foo) \ movl R(physfree), %esi ; \ movl $((foo)*PAGE_SIZE), %eax ; \ @@ -202,8 +214,7 @@ * This is where the bootblocks start us, set the ball rolling... * */ -NON_GPROF_ENTRY(btext) - +NON_GPROF_ENTRY(btext) #ifdef PC98 /* save SYSTEM PARAMETER for resume (NS/T or other) */ movl $0xa1400,%esi @@ -212,6 +223,19 @@ cld rep movsb +#elif defined(XEN) + pushl %esi + call initvalues + popl %esi + call identify_cpu + movl proc0kstack,%eax + leal (KSTACK_PAGES*PAGE_SIZE-PCB_SIZE)(%eax),%esp + xorl %ebp,%ebp /* mark end of frames */ + movl IdlePTD,%esi + movl %esi,(KSTACK_PAGES*PAGE_SIZE-PCB_SIZE+PCB_CR3)(%eax) + call init386 + call mi_startup + int $3 #else /* IBM-PC */ /* Tell the bios to warmboot next time */ movw $0x1234,0x472 ==== //depot/projects/xen3/src/sys/i386/i386/support.s#2 (text+ko) ==== @@ -1426,10 +1426,11 @@ */ /* void lgdt(struct region_descriptor *rdp); */ ENTRY(lgdt) +#ifndef XEN /* reload the descriptor table */ movl 4(%esp),%eax lgdt (%eax) - +#endif /* flush the prefetch q */ jmp 1f nop ==== //depot/projects/xen3/src/sys/i386/i386/swtch.s#2 (text+ko) ==== @@ -33,11 +33,11 @@ */ #include "opt_npx.h" - +#include "opt_global.h" #include #include "assym.s" - + /*****************************************************************************/ /* Scheduling */ /*****************************************************************************/ @@ -71,7 +71,7 @@ movl 8(%esp),%ecx /* New thread */ movl TD_PCB(%ecx),%edx movl PCB_CR3(%edx),%eax - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* set bit in new pm_active */ movl TD_PROC(%ecx),%eax movl P_VMSPACE(%eax), %ebx @@ -112,7 +112,7 @@ movl %esi,PCB_ESI(%edx) movl %edi,PCB_EDI(%edx) movl %gs,PCB_GS(%edx) - pushfl /* PSL */ + pushfl /* XXX */ /* PSL */ popl PCB_PSL(%edx) /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%edx) @@ -162,10 +162,10 @@ cmpl %eax,IdlePTD /* Kernel address space? */ #endif je sw1 - movl %cr3,%ebx /* The same address space? */ + READ_CR3(%ebx) cmpl %ebx,%eax je sw1 - movl %eax,%cr3 /* new address space */ + LOAD_CR3(%eax) /* new address space */ /* Release bit from old pmap->pm_active */ movl PCPU(CURPMAP), %ebx @@ -185,6 +185,8 @@ btsl %esi, PM_ACTIVE(%ebx) /* set new */ sw1: + /* only one task selector under Xen */ +#ifndef XEN /* * At this point, we've switched address spaces and are ready * to load up the rest of the next context. @@ -220,8 +222,23 @@ movl %esi, 4(%ebx) movl $GPROC0_SEL*8, %esi /* GSEL(GPROC0_SEL, SEL_KPL) */ ltr %si +#else + /* notify Xen of task switch */ + pushl %edx /* &pcb is the new stack base */ + pushl $KDSEL + pushl $HYPERVISOR_STACK_SWITCH + call ni_queue_multicall2 + addl $12,%esp + /* XXX handle DOM0 IOPL case here (KMM) */ + /* we currently don't support running FreeBSD */ + /* in DOM0 so we can skip for now */ + + call ni_execute_multicall_list + +#endif /* XEN */ 3: +#ifndef XEN /* XXX skip updating selectors for the moment */ /* Copy the %fs and %gs selectors into this pcpu gdt */ leal PCB_FSD(%edx), %esi movl PCPU(FSGS_GDT), %edi @@ -233,7 +250,7 @@ movl 12(%esi), %ebx movl %eax, 8(%edi) movl %ebx, 12(%edi) - +#endif /* Restore context. */ movl PCB_EBX(%edx),%ebx movl PCB_ESP(%edx),%esp @@ -243,11 +260,9 @@ movl PCB_EIP(%edx),%eax movl %eax,(%esp) pushl PCB_PSL(%edx) - popfl - + popfl /* XXX */ movl %edx, PCPU(CURPCB) movl %ecx, PCPU(CURTHREAD) /* into next thread */ - /* * Determine the LDT to use and load it if is the default one and * that is not the current one. @@ -258,7 +273,7 @@ movl _default_ldt,%eax cmpl PCPU(CURRENTLDT),%eax je 2f - lldt _default_ldt + LLDT(_default_ldt) movl %eax,PCPU(CURRENTLDT) jmp 2f 1: @@ -335,7 +350,7 @@ movl (%esp),%eax movl %eax,PCB_EIP(%ecx) - movl %cr3,%eax + READ_CR3(%eax) movl %eax,PCB_CR3(%ecx) movl %ebx,PCB_EBX(%ecx) @@ -344,7 +359,7 @@ movl %esi,PCB_ESI(%ecx) movl %edi,PCB_EDI(%ecx) movl %gs,PCB_GS(%ecx) - pushfl + pushfl /* XXX */ popl PCB_PSL(%ecx) #ifdef DEV_NPX @@ -360,8 +375,8 @@ * have to handle h/w bugs for reloading. We used to lose the * parent's npx state for forks by forgetting to reload. */ - pushfl - cli + pushfl /* XXX */ + CLI movl PCPU(FPCURTHREAD),%eax testl %eax,%eax je 1f @@ -383,7 +398,7 @@ call bcopy addl $12,%esp 1: - popfl + popfl /* XXX */ #endif /* DEV_NPX */ ret ==== //depot/projects/xen3/src/sys/i386/i386/sys_machdep.c#2 (text+ko) ==== @@ -55,6 +55,13 @@ #include #include #include +#ifdef XEN +#include +void i386_reset_ldt(struct proc_ldt *pldt); +#else +#define i386_reset_ldt(x) + +#endif #include /* for kernel_map */ @@ -163,7 +170,11 @@ */ sd.sd_lobase = base & 0xffffff; sd.sd_hibase = (base >> 24) & 0xff; +#ifndef XEN sd.sd_lolimit = 0xffff; /* 4GB limit, wraps around */ +#else + sd.sd_lolimit = 0x0; /* 4GB limit, wraps around */ +#endif sd.sd_hilimit = 0xf; sd.sd_type = SDT_MEMRWA; sd.sd_dpl = SEL_UPL; @@ -173,7 +184,11 @@ sd.sd_gran = 1; critical_enter(); td->td_pcb->pcb_fsd = sd; +#ifndef XEN PCPU_GET(fsgs_gdt)[0] = sd; +#else + HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), *(uint64_t *)&sd); +#endif critical_exit(); td->td_frame->tf_fs = GSEL(GUFS_SEL, SEL_UPL); } @@ -193,7 +208,11 @@ */ sd.sd_lobase = base & 0xffffff; sd.sd_hibase = (base >> 24) & 0xff; +#ifndef XEN sd.sd_lolimit = 0xffff; /* 4GB limit, wraps around */ +#else + sd.sd_lolimit = 0x0; /* 4GB limit, wraps around */ +#endif sd.sd_hilimit = 0xf; sd.sd_type = SDT_MEMRWA; sd.sd_dpl = SEL_UPL; @@ -203,7 +222,11 @@ sd.sd_gran = 1; critical_enter(); td->td_pcb->pcb_gsd = sd; +#ifndef XEN PCPU_GET(fsgs_gdt)[1] = sd; +#else + HYPERVISOR_update_descriptor(vtomach(&PCPU_GET(fsgs_gdt)[1]), *(uint64_t *)&sd); +#endif critical_exit(); load_gs(GSEL(GUGS_SEL, SEL_UPL)); } @@ -364,6 +387,7 @@ struct proc_ldt *pldt; pldt = mdp->md_ldt; +#ifndef XEN #ifdef SMP gdt[PCPU_GET(cpuid) * NGDT + GUSERLDT_SEL].sd = pldt->ldt_sd; #else @@ -371,6 +395,11 @@ #endif lldt(GSEL(GUSERLDT_SEL, SEL_KPL)); PCPU_SET(currentldt, GSEL(GUSERLDT_SEL, SEL_KPL)); + +#else + i386_reset_ldt(pldt); + PCPU_SET(currentldt, (int)pldt); +#endif } #ifdef SMP @@ -385,6 +414,7 @@ } #endif +#ifdef XEN /* * Must be called with either sched_lock free or held but not recursed. * If it does not return NULL, it will return with it owned. @@ -402,6 +432,48 @@ new_ldt->ldt_len = len = NEW_MAX_LD(len); new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map, + round_page(len * sizeof(union descriptor))); + if (new_ldt->ldt_base == NULL) { + FREE(new_ldt, M_SUBPROC); + return NULL; + } + new_ldt->ldt_refcnt = 1; + new_ldt->ldt_active = 0; + + mtx_lock_spin(&sched_lock); + + if ((pldt = mdp->md_ldt)) { + if (len > pldt->ldt_len) + len = pldt->ldt_len; + bcopy(pldt->ldt_base, new_ldt->ldt_base, + len * sizeof(union descriptor)); + } else { + bcopy(ldt, new_ldt->ldt_base, PAGE_SIZE); + } + pmap_map_readonly(kernel_pmap, (vm_offset_t)new_ldt->ldt_base, + new_ldt->ldt_len*sizeof(union descriptor)); + return new_ldt; +} +void +i386_reset_ldt(struct proc_ldt *pldt) +{ + xen_set_ldt((vm_offset_t)pldt->ldt_base, pldt->ldt_len); +} + +#else +struct proc_ldt * +user_ldt_alloc(struct mdproc *mdp, int len) +{ + struct proc_ldt *pldt, *new_ldt; + + if (mtx_owned(&sched_lock)) + mtx_unlock_spin(&sched_lock); + mtx_assert(&sched_lock, MA_NOTOWNED); + MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), + M_SUBPROC, M_WAITOK); + + new_ldt->ldt_len = len = NEW_MAX_LD(len); + new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map, len * sizeof(union descriptor)); if (new_ldt->ldt_base == NULL) { FREE(new_ldt, M_SUBPROC); @@ -426,6 +498,8 @@ return new_ldt; } +#endif + /* * Must be called either with sched_lock free or held but not recursed. * If md_ldt is not NULL, it will return with sched_lock released. @@ -443,13 +517,18 @@ mtx_lock_spin(&sched_lock); mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); if (td == PCPU_GET(curthread)) { +#ifndef XEN lldt(_default_ldt); +#endif PCPU_SET(currentldt, _default_ldt); + i386_reset_ldt((struct proc_ldt *)_default_ldt); } mdp->md_ldt = NULL; if (--pldt->ldt_refcnt == 0) { mtx_unlock_spin(&sched_lock); + pmap_map_readwrite(kernel_pmap, (vm_offset_t)pldt->ldt_base, + pldt->ldt_len*sizeof(union descriptor)); kmem_free(kernel_map, (vm_offset_t)pldt->ldt_base, pldt->ldt_len * sizeof(union descriptor)); FREE(pldt, M_SUBPROC); @@ -629,6 +708,9 @@ /* Allocate a free slot */ pldt = mdp->md_ldt; if (pldt == NULL) { +#ifdef XEN + load_gs(0); /* XXX check if we really still need this */ +#endif error = i386_ldt_grow(td, NLDT + 1); if (error) return (error); @@ -677,13 +759,23 @@ { struct mdproc *mdp = &td->td_proc->p_md; struct proc_ldt *pldt = mdp->md_ldt; - +#ifdef XEN + int i, error; +#endif mtx_assert(&sched_lock, MA_OWNED); - +#ifndef XEN /* Fill in range */ bcopy(descs, &((union descriptor *)(pldt->ldt_base))[start], num * sizeof(union descriptor)); +#else + for (i = 0; i < num; i++) { + error = HYPERVISOR_update_descriptor(vtomach(&((union descriptor *)(pldt->ldt_base))[start + i]), + *(uint64_t *)(descs + i)); + if (error) + panic("failed to update ldt: %d", error); + } +#endif return (0); } @@ -719,6 +811,9 @@ pldt->ldt_base = new_ldt->ldt_base; pldt->ldt_len = new_ldt->ldt_len; mtx_unlock_spin(&sched_lock); + pmap_map_readwrite(kernel_pmap, + (vm_offset_t)old_ldt_base, + old_ldt_len*sizeof(union descriptor)); kmem_free(kernel_map, (vm_offset_t)old_ldt_base, old_ldt_len * sizeof(union descriptor)); FREE(new_ldt, M_SUBPROC); @@ -729,6 +824,9 @@ * do nothing. */ mtx_unlock_spin(&sched_lock); + pmap_map_readwrite(kernel_pmap, + (vm_offset_t)new_ldt->ldt_base, + new_ldt->ldt_len*sizeof(union descriptor)); kmem_free(kernel_map, (vm_offset_t)new_ldt->ldt_base, new_ldt->ldt_len * sizeof(union descriptor)); ==== //depot/projects/xen3/src/sys/i386/i386/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.285 2005/11/18 19:26:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/trap.c,v 1.284 2005/11/05 10:42:40 phk Exp $"); /* * 386 Trap and System call handling @@ -101,6 +101,13 @@ #include #endif +#ifdef XEN +#include +#include +#include +#include +#endif + extern void trap(struct trapframe frame); extern void syscall(struct trapframe frame); @@ -129,7 +136,7 @@ "alignment fault", /* 14 T_ALIGNFLT */ "", /* 15 unused */ "", /* 16 unused */ - "", /* 17 unused */ + "hypervisor callback", /* 17 T_HYPCALLBACK */ "integer divide fault", /* 18 T_DIVIDE */ "non-maskable interrupt trap", /* 19 T_NMI */ "overflow trap", /* 20 T_OFLOW */ @@ -217,7 +224,7 @@ TRAPF_USERMODE(&frame))) goto out; #endif - +#ifndef XEN if ((frame.tf_eflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -248,9 +255,18 @@ enable_intr(); } } - +#endif eva = 0; code = frame.tf_err; +#ifdef XEN + if (type == T_HYPCALLBACK) { + evtchn_do_upcall(&frame); + if (ISPL(frame.tf_cs) == SEL_KPL) + goto out; + goto userout; + } else if (type == 0) + panic("invalid trap type/code %d/%d\n",type, code); +#endif if (type == T_PAGEFLT) { /* * For some Cyrix CPUs, %cr2 is clobbered by @@ -788,8 +804,9 @@ code = frame->tf_err; type = frame->tf_trapno; +#ifndef XEN sdtossd(&gdt[IDXSEL(frame->tf_cs & 0xffff)].sd, &softseg); - +#endif if (type <= MAX_TRAP_MSG) msg = trap_msg[type]; else ==== //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.267 2005/11/14 00:43:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.266 2005/11/09 12:22:26 nyan Exp $"); #include "opt_isa.h" #include "opt_npx.h" @@ -102,7 +102,9 @@ #ifndef NSFBUFS #define NSFBUFS (512 + maxusers * 16) #endif - +#ifdef XEN +#include +#endif static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -728,8 +730,11 @@ */ ptep = vtopte(sf->kva); opte = *ptep; +#ifndef XEN *ptep = VM_PAGE_TO_PHYS(m) | pgeflag | PG_RW | PG_V; - +#else + PT_SET_VA(ptep, VM_PAGE_TO_PHYS(m) | pgeflag | PG_RW | PG_V, TRUE); +#endif /* * Avoid unnecessary TLB invalidations: If the sf_buf's old * virtual-to-physical mapping was not used, then any processor @@ -780,6 +785,11 @@ if (sf->ref_count == 0) { TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry); nsfbufsused--; +#ifdef XEN + pmap_qremove(sf->kva, 1); + sf->m = NULL; + LIST_REMOVE(sf, list_entry); +#endif if (sf_buf_alloc_want > 0) wakeup_one(&sf_buf_freelist); } ==== //depot/projects/xen3/src/sys/i386/include/asmacros.h#2 (text+ko) ==== @@ -172,6 +172,36 @@ movl $KPSEL, %eax ; /* reload with per-CPU data segment */ \ movl %eax, %fs +#ifdef XEN +#define LOAD_CR3(reg) \ + movl reg,PCPU(CR3); \ + pushl %ecx ; \ + pushl %edx ; \ + pushl %esi ; \ + pushl reg ; \ + call xen_load_cr3 ; \ + addl $4,%esp ; \ + popl %esi ; \ + popl %edx ; \ + popl %ecx ; \ + +#define READ_CR3(reg) movl PCPU(CR3),reg; +#define LLDT(arg) \ + pushl %edx ; \ + pushl %eax ; \ + xorl %eax,%eax ; \ + movl %eax,%gs ; \ + call i386_reset_ldt ; \ + popl %eax ; \ + popl %edx +#define CLI call ni_cli +#else +#define LOAD_CR3(reg) movl reg,%cr3; +#define READ_CR3(reg) movl %cr3,reg; +#define LLDT(arg) lldt arg; +#define CLI cli +#endif + #endif /* LOCORE */ #endif /* !_MACHINE_ASMACROS_H_ */ ==== //depot/projects/xen3/src/sys/i386/include/pcpu.h#2 (text+ko) ==== @@ -45,6 +45,7 @@ * to each CPU's data can be set up for things like "check curproc on all * other processors" */ +#ifndef XEN #define PCPU_MD_FIELDS \ struct pcpu *pc_prvspace; /* Self-reference */ \ struct pmap *pc_curpmap; \ @@ -57,6 +58,25 @@ u_int pc_apic_id; \ int pc_private_tss /* flag indicating private tss */ + +#else +#define PCPU_MD_FIELDS \ + struct pcpu *pc_prvspace; /* Self-reference */ \ + struct pmap *pc_curpmap; \ + struct i386tss pc_common_tss; \ + struct segment_descriptor pc_common_tssd; \ + struct segment_descriptor *pc_tss_gdt; \ + struct segment_descriptor *pc_fsgs_gdt; \ + int pc_currentldt; \ + u_int pc_acpi_id; \ + u_int pc_apic_id; \ + int pc_private_tss; /* flag indicating private tss */ \ + u_int pc_cr3; \ + u_int pc_pdir; \ + u_int pc_lazypmap; \ + u_int pc_rendezvous; \ + u_int pc_cpuast; +#endif #if defined(lint) extern struct pcpu *pcpup; ==== //depot/projects/xen3/src/sys/i386/include/pmap.h#2 (text+ko) ==== @@ -368,6 +368,8 @@ #endif /* _KERNEL */ +static __inline void pmap_map_readonly(pmap_t pmap, vm_offset_t va, int len) {} +static __inline void pmap_map_readwrite(pmap_t pmap, vm_offset_t va, int len) {} #endif /* !LOCORE */ #endif /* !_MACHINE_PMAP_H_ */ ==== //depot/projects/xen3/src/sys/i386/include/segments.h#2 (text+ko) ==== @@ -47,7 +47,11 @@ */ #define ISPL(s) ((s)&3) /* what is the priority level of a selector */ +#ifdef XEN +#define SEL_KPL 1 /* kernel priority level */ +#else #define SEL_KPL 0 /* kernel priority level */ +#endif #define SEL_UPL 3 /* user priority level */ #define ISLDT(s) ((s)&SEL_LDT) /* is it local or global */ #define SEL_LDT 4 /* local descriptor table */ @@ -206,8 +210,13 @@ #define GPRIV_SEL 1 /* SMP Per-Processor Private Data */ #define GUFS_SEL 2 /* User %fs Descriptor (order critical: 1) */ #define GUGS_SEL 3 /* User %gs Descriptor (order critical: 2) */ +#ifdef XEN +#define GCODE_SEL (__KERNEL_CS >> 3) /* Kernel Code Descriptor (order critical: 1) */ +#define GDATA_SEL (__KERNEL_DS >> 3) /* Kernel Data Descriptor (order critical: 2) */ +#else #define GCODE_SEL 4 /* Kernel Code Descriptor (order critical: 1) */ #define GDATA_SEL 5 /* Kernel Data Descriptor (order critical: 2) */ +#endif #define GUCODE_SEL 6 /* User Code Descriptor (order critical: 3) */ #define GUDATA_SEL 7 /* User Data Descriptor (order critical: 4) */ #define GBIOSLOWMEM_SEL 8 /* BIOS low memory access (must be entry 8) */ @@ -222,8 +231,11 @@ #define GBIOSARGS_SEL 17 /* BIOS interface (Arguments) */ #define GNDIS_SEL 18 /* For the NDIS layer */ +#ifdef XEN +#define NGDT 8 +#else #define NGDT 19 - +#endif /* * Entries in the Local Descriptor Table (LDT) */ @@ -240,10 +252,15 @@ #ifdef _KERNEL extern int _default_ldt; +#ifdef XEN +extern union descriptor *gdt; +extern union descriptor *ldt; +#else extern union descriptor gdt[]; +extern union descriptor ldt[NLDT]; +#endif extern struct soft_segment_descriptor gdt_segs[]; extern struct gate_descriptor *idt; -extern union descriptor ldt[NLDT]; extern struct region_descriptor r_gdt, r_idt; void lgdt(struct region_descriptor *rdp); ==== //depot/projects/xen3/src/sys/i386/include/trap.h#2 (text+ko) ==== @@ -49,6 +49,7 @@ #define T_PAGEFLT 12 /* page fault */ #define T_ALIGNFLT 14 /* alignment fault */ +#define T_HYPCALLBACK 17 /* hypervisor callback */ #define T_DIVIDE 18 /* integer divide fault */ #define T_NMI 19 /* non-maskable trap */ #define T_OFLOW 20 /* overflow trap */ ==== //depot/projects/xen3/src/sys/i386/isa/npx.c#2 (text+ko) ==== @@ -101,9 +101,14 @@ #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 3 08:15:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEDF216A422; Tue, 3 Jan 2006 08:14:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6732F16A41F for ; Tue, 3 Jan 2006 08:14:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AB3043D5F for ; Tue, 3 Jan 2006 08:14:59 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k038Ew6q050897 for ; Tue, 3 Jan 2006 08:14:58 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k038EwWp050894 for perforce@freebsd.org; Tue, 3 Jan 2006 08:14:58 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Jan 2006 08:14:58 GMT Message-Id: <200601030814.k038EwWp050894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 08:15:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=89080 Change 89080 by imp@imp_hammer on 2006/01/03 08:14:00 Commit boilerplate for new Atmel EMAC driver. ate because EMAC is too generic (ppc has something called EMAC with different api) and ATEMC is too long imho. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#4 edit .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#1 add .. //depot/projects/arm/src/sys/arm/conf/KB920X#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#4 (text+ko) ==== @@ -6,3 +6,4 @@ arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart +arm/at91/if_ate.c optional ate ==== //depot/projects/arm/src/sys/arm/conf/KB920X#10 (text+ko) ==== @@ -68,6 +68,7 @@ device ether device nexus device uart +device ate # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking From owner-p4-projects@FreeBSD.ORG Tue Jan 3 08:43:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BE6416A423; Tue, 3 Jan 2006 08:43:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 16DD816A420 for ; Tue, 3 Jan 2006 08:43:35 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66CAE43D55 for ; Tue, 3 Jan 2006 08:43:34 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k038hYaB052001 for ; Tue, 3 Jan 2006 08:43:34 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k038hYBd051998 for perforce@freebsd.org; Tue, 3 Jan 2006 08:43:34 GMT (envelope-from scottl@freebsd.org) Date: Tue, 3 Jan 2006 08:43:34 GMT Message-Id: <200601030843.k038hYBd051998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 89081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 08:43:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=89081 Change 89081 by scottl@scottl-junior on 2006/01/03 08:42:55 Add in second round of Xen 3 files. Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/exception.s#1 add .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/genassym.c#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pc/bios.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pc/display.h#1 add .. //depot/projects/xen3/src/sys/i386-xen/include/pc/vesa.h#1 add .. //depot/projects/xen3/src/sys/libkern/strcspn.c#1 add .. //depot/projects/xen3/src/sys/sys/libkern.h#2 edit Differences ... ==== //depot/projects/xen3/src/sys/sys/libkern.h#2 (text+ko) ==== @@ -108,6 +108,7 @@ char *strncpy(char * __restrict, const char * __restrict, size_t); char *strsep(char **, const char *delim); size_t strspn(const char *, const char *); +size_t strcspn(const char *, const char *); int strvalid(const char *, size_t); extern uint32_t crc32_tab[]; From owner-p4-projects@FreeBSD.ORG Tue Jan 3 22:14:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52DF516A422; Tue, 3 Jan 2006 22:14:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1018016A41F for ; Tue, 3 Jan 2006 22:14:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C52C43D72 for ; Tue, 3 Jan 2006 22:14:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k03ME80q032664 for ; Tue, 3 Jan 2006 22:14:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k03ME8OQ032661 for perforce@freebsd.org; Tue, 3 Jan 2006 22:14:08 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Jan 2006 22:14:08 GMT Message-Id: <200601032214.k03ME8OQ032661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 22:14:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=89110 Change 89110 by imp@imp_Speedy on 2006/01/03 22:13:09 Compile after latest changs to trapframes. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#4 (text+ko) ==== @@ -36,8 +36,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -109,12 +111,14 @@ } static void -clock_intr(void *frame) +clock_intr(void *arg) { + struct trapframe *fp = arg; + /* The interrupt is shared, so we have to make sure it's for us. */ if (bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, TIMER_SR) & 1) { - hardclock(frame); + hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); } } From owner-p4-projects@FreeBSD.ORG Tue Jan 3 22:37:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4556C16A422; Tue, 3 Jan 2006 22:37:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02C3F16A41F for ; Tue, 3 Jan 2006 22:37:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2168543D6D for ; Tue, 3 Jan 2006 22:37:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k03Mbb5O033506 for ; Tue, 3 Jan 2006 22:37:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k03MbaYJ033503 for perforce@freebsd.org; Tue, 3 Jan 2006 22:37:36 GMT (envelope-from imp@freebsd.org) Date: Tue, 3 Jan 2006 22:37:36 GMT Message-Id: <200601032237.k03MbaYJ033503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jan 2006 22:37:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=89111 Change 89111 by imp@imp_Speedy on 2006/01/03 22:37:30 compile Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#2 (text+ko) ==== @@ -29,8 +29,11 @@ #include #include #include +#include #include #include +#include +#include #include #include @@ -53,6 +56,15 @@ { struct ifnet *ifp; struct mtx sc_mtx; + device_t dev; + void *intrhand; + struct resource *irq_res; + int irq_rid; + struct resource *port_res; + int port_rid; + + // XXX bogus + int intr; }; #define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) @@ -82,6 +94,7 @@ static int ate_probe(device_t dev); static int ate_attach(device_t dev); static int ate_detach(device_t dev); +static void ate_intr(void *); /* helper routines */ static int ate_activate(device_t dev); @@ -104,9 +117,11 @@ ate_attach(device_t dev) { struct ate_softc *sc = device_get_softc(dev); - struct ifnet *ifp; + struct ifnet *ifp = NULL; int err; + u_char eaddr[6]; + sc->dev = dev; err = ate_activate(dev); if (err) goto out; @@ -114,7 +129,7 @@ /* calling atestop before ifp is set is OK */ atestop(sc); ATE_LOCK_INIT(sc); - ifp = sc->ifp = if_alloc(IFT_ETHER); + sc->ifp = ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; @@ -134,14 +149,14 @@ /* * Activate the interrupt */ - err = bus_seutp_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, ate_intr, sc, &sc->intrhand); if (err) - ether_detach(ifp); + ether_ifdetach(ifp); ATE_LOCK_DESTROY(sc); out:; if (err) - ate_deactive(dev); + ate_deactivate(dev); if (err && ifp) if_free(ifp); return (err); @@ -150,6 +165,7 @@ static int ate_detach(device_t dev) { + return EBUSY; /* XXX */ } static int @@ -164,29 +180,38 @@ return EINVAL; /* XXX */ } +static void +ate_intr(void *xsc) +{ + struct ate_softc *sc = xsc; + + sc->intr++; +} + /* * Reset and initialize the chip */ static void -ateinit_locked(void *) +ateinit_locked(void *xsc) { - struct sn_softc *sc = xsc; - struct ifnet *ifp = sc->ifp; + struct ate_softc *sc = xsc; +// struct ifnet *ifp = sc->ifp; ATE_ASSERT_LOCKED(sc); /* Insert code here */ + sc->intr++; } /* * dequeu packets and transmit */ static void -atestart_locked(struct ifnet *) +atestart_locked(struct ifnet *ifp) { - struct sn_softc *sc = ifp->if_softc; + struct ate_softc *sc = ifp->if_softc; - SN_ASSERT_LOCKED(sc); + ATE_ASSERT_LOCKED(sc); if (sc->ifp->if_drv_flags & IFF_DRV_OACTIVE) return; /* XXX deque packets and transmit */ @@ -215,18 +240,18 @@ * so be careful. */ static void -atestop(struct ate_softc *) +atestop(struct ate_softc *sc) { } static void -atewatchdog(struct ifnet *) +atewatchdog(struct ifnet *ifp) { /* timeout, not sure what to do */ } static int -ateioctl(struct ifnet * ifp, u_long, caddr_t) +ateioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ate_softc *sc = ifp->if_softc; int error = 0; From owner-p4-projects@FreeBSD.ORG Wed Jan 4 00:30:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4163016A422; Wed, 4 Jan 2006 00:30:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 183C216A41F for ; Wed, 4 Jan 2006 00:30:56 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF8A643D46 for ; Wed, 4 Jan 2006 00:30:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k040Utdd037972 for ; Wed, 4 Jan 2006 00:30:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k040Ut2b037969 for perforce@freebsd.org; Wed, 4 Jan 2006 00:30:55 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 00:30:55 GMT Message-Id: <200601040030.k040Ut2b037969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 00:30:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=89115 Change 89115 by imp@imp_Speedy on 2006/01/04 00:30:51 #defines for all the IRQs _MAC_ -> _EMAC_ to match doc for the internal chip Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#9 (text+ko) ==== @@ -251,6 +251,33 @@ * 30: AIC * 31: AIC */ + +#define AT91RM92_IRQ_SYSTEM 1 +#define AT91RM92_IRQ_PIOA 2 +#define AT91RM92_IRQ_PIOB 3 +#define AT91RM92_IRQ_PIOC 4 +#define AT91RM92_IRQ_PIOD 5 +#define AT91RM92_IRQ_USART0 6 +#define AT91RM92_IRQ_USART1 7 +#define AT91RM92_IRQ_USART2 8 +#define AT91RM92_IRQ_USART3 9 +#define AT91RM92_IRQ_MCI 10 +#define AT91RM92_IRQ_UDP 11 +#define AT91RM92_IRQ_TWI 12 +#define AT91RM92_IRQ_SPI 13 +#define AT91RM92_IRQ_SSC0 14 +#define AT91RM92_IRQ_SSC1 15 +#define AT91RM92_IRQ_SSC2 16 +#define AT91RM92_IRQ_TC0 17 +#define AT91RM92_IRQ_TC1 18 +#define AT91RM92_IRQ_TC2 19 +#define AT91RM92_IRQ_TC3 20 +#define AT91RM92_IRQ_TC4 21 +#define AT91RM92_IRQ_TC5 22 +#define AT91RM92_IRQ_UHP 23 +#define AT91RM92_IRQ_EMAC 24 +#define AT91RM92_IRQ_AIC_BASE 25 + /* Timer */ #define AT91RM92_TIMER_BASE 0xffffd00 @@ -282,8 +309,8 @@ #define AT91RM92_SSC_SIZE 0x4000 -#define AT91RM92_MAC_BASE 0xffbc000 -#define AT91RM92_MAC_SIZE 0x4000 +#define AT91RM92_EMAC_BASE 0xffbc000 +#define AT91RM92_EMAC_SIZE 0x4000 #define AT91RM92_TWI_BASE 0xffb8000 #define AT91RM92_TWI_SIZE 0x4000 From owner-p4-projects@FreeBSD.ORG Wed Jan 4 00:35:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2C4916A422; Wed, 4 Jan 2006 00:35:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8019E16A41F for ; Wed, 4 Jan 2006 00:35:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C9A343D49 for ; Wed, 4 Jan 2006 00:35:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k040Z1wA038104 for ; Wed, 4 Jan 2006 00:35:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k040Z00n038101 for perforce@freebsd.org; Wed, 4 Jan 2006 00:35:00 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 00:35:00 GMT Message-Id: <200601040035.k040Z00n038101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89116 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 00:35:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=89116 Change 89116 by imp@imp_Speedy on 2006/01/04 00:34:44 Add the built-in devices to the devices that are probed. Most of these do not yet have drivers, but adding them shouldn't hurt anything. This likely should be handled by hints, but I'm too lazy right now to make hints work. Also, use #defines for IRQ numbers rather than hard coding them. This add drivers for everything but the PIOs, PMC, ST, RTC, TC and MC devices since I'm not yet sure the best way to export those devices yet. It does add UDP (usb device port), MCI (MMC reader), TWI (two wire interface), SSCn (Serial Synchronous Controller) and the SPI (Serial Peripheral Interface). Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#8 (text+ko) ==== @@ -256,16 +256,32 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_ICCR, 0xffffffff); at91rm92_add_child(dev, 0, "at91rm92_timer", 0, 0, 0, 1); - at91rm92_add_child(dev, 10, "uart", 0, AT91RM92_BASE + - AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, 1); // DBGU - at91rm92_add_child(dev, 10, "uart", 1, AT91RM92_BASE + - AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, 6); // USART0 - at91rm92_add_child(dev, 10, "uart", 2, AT91RM92_BASE + - AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, 7); // USART1 - at91rm92_add_child(dev, 10, "uart", 3, AT91RM92_BASE + - AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, 8); // USART2 - at91rm92_add_child(dev, 10, "uart", 4, AT91RM92_BASE + - AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, 9); // USART3 + at91rm92_add_child(dev, 10, "atudp", 0, AT91RM92_BASE + // UDP + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); + at91rm92_add_child(dev, 10, "mci", 0, AT91RM92_BASE + // MCI + AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI); + at91rm92_add_child(dev, 10, "twi", 0, AT91RM92_BASE + // TWI + AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, AT91RM92_IRQ_TWI); + at91rm92_add_child(dev, 10, "ate", 0, AT91RM92_BASE + // EMAC + AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC); + at91rm92_add_child(dev, 10, "uart", 0, AT91RM92_BASE + // DBGU + AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, AT91RM92_IRQ_SYSTEM); + at91rm92_add_child(dev, 10, "uart", 1, AT91RM92_BASE + // USART0 + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART0); + at91rm92_add_child(dev, 10, "uart", 2, AT91RM92_BASE + // USART1 + AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART1); + at91rm92_add_child(dev, 10, "uart", 3, AT91RM92_BASE + // USART2 + AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART2); + at91rm92_add_child(dev, 10, "uart", 4, AT91RM92_BASE + // USART3 + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3); + at91rm92_add_child(dev, 10, "ssc", 0, AT91RM92_BASE + // SSC0 + AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC0); + at91rm92_add_child(dev, 10, "ssc", 1, AT91RM92_BASE + // SSC1 + AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC1); + at91rm92_add_child(dev, 10, "ssc", 2, AT91RM92_BASE + // SSC2 + AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); + at91rm92_add_child(dev, 10, "spi", 0, AT91RM92_BASE + // SPI + AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); bus_generic_probe(dev); bus_generic_attach(dev); enable_interrupts(I32_bit | F32_bit); From owner-p4-projects@FreeBSD.ORG Wed Jan 4 00:41:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BFFB16A422; Wed, 4 Jan 2006 00:41:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6243516A41F for ; Wed, 4 Jan 2006 00:41:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B1FF43D4C for ; Wed, 4 Jan 2006 00:41:09 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k040f9S1038441 for ; Wed, 4 Jan 2006 00:41:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k040f8s1038438 for perforce@freebsd.org; Wed, 4 Jan 2006 00:41:08 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 00:41:08 GMT Message-Id: <200601040041.k040f8s1038438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 00:41:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=89117 Change 89117 by imp@imp_Speedy on 2006/01/04 00:40:41 Add USB host controller (it is a ohci). Not entirely sure it belongs on this bus or not, but what the heck.. We can move it later. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#9 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#9 (text+ko) ==== @@ -282,6 +282,9 @@ AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); at91rm92_add_child(dev, 10, "spi", 0, AT91RM92_BASE + // SPI AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); + // Not sure that the following belongs on this bus. + at91rm92_add_child(dev, 10, "ohci", 0, AT91RM92_BASE + // UHP + AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP); bus_generic_probe(dev); bus_generic_attach(dev); enable_interrupts(I32_bit | F32_bit); ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#10 (text+ko) ==== @@ -334,6 +334,9 @@ #define AT91RM92_TC1C1_BASE 0xffa4040 #define AT91RM92_TC1C2_BASE 0xffa4080 +#define AT91RM92_OHCI_BASE 0x00300000 +#define AT91RM92_OHCI_SIZE 0x00100000 + /* Pio definitions */ #define AT91RM92_PIO_PA0 (1 << 0) #define AT91RM92_PA0_MISO (AT91RM92_PIO_PA0) /* SPI Master In Slave */ From owner-p4-projects@FreeBSD.ORG Wed Jan 4 04:12:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA4D916A422; Wed, 4 Jan 2006 04:12:38 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9822616A41F for ; Wed, 4 Jan 2006 04:12:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09D3443D5D for ; Wed, 4 Jan 2006 04:12:38 +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 k044Cbx9053525 for ; Wed, 4 Jan 2006 04:12:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k044CbZs053522 for perforce@freebsd.org; Wed, 4 Jan 2006 04:12:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 Jan 2006 04:12:37 GMT Message-Id: <200601040412.k044CbZs053522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 89123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 04:12:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=89123 Change 89123 by rwatson@rwatson_sesame on 2006/01/04 04:12:19 Indulge in some gratuitous file renaming in order to increase the consistency of file names, as well as consistency with other security components in the kernel. We may want to do a little more renaming yet, and break out audit.c a bit more. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_klib.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#51 delete .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#33 delete .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#19 delete .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#14 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 4 05:53:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A3AD16A422; Wed, 4 Jan 2006 05:53:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4051D16A41F for ; Wed, 4 Jan 2006 05:53:41 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C1FC343D55 for ; Wed, 4 Jan 2006 05:53:40 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k045refr065893 for ; Wed, 4 Jan 2006 05:53:40 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k045rei6065890 for perforce@freebsd.org; Wed, 4 Jan 2006 05:53:40 GMT (envelope-from scottl@freebsd.org) Date: Wed, 4 Jan 2006 05:53:40 GMT Message-Id: <200601040553.k045rei6065890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 89125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 05:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=89125 Change 89125 by scottl@scottl-junior on 2006/01/04 05:52:43 Use the modern disk API for the xen blockfront device. Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#2 edit .. //depot/projects/xen3/src/sys/dev/xen/blkfront/block.h#2 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#2 (text+ko) ==== @@ -150,28 +150,30 @@ info->sc = sc; memset(&sc->xb_disk, 0, sizeof(sc->xb_disk)); - sc->xb_disk.d_unit = unit; - sc->xb_disk.d_open = blkif_open; - sc->xb_disk.d_close = blkif_close; - sc->xb_disk.d_ioctl = blkif_ioctl; - sc->xb_disk.d_strategy = xb_strategy; - sc->xb_disk.d_name = "xbd"; - sc->xb_disk.d_drv1 = sc; - sc->xb_disk.d_sectorsize = sector_size; + sc->xb_disk = disk_alloc(); + sc->xb_disk->d_unit = unit; + sc->xb_disk->d_open = blkif_open; + sc->xb_disk->d_close = blkif_close; + sc->xb_disk->d_ioctl = blkif_ioctl; + sc->xb_disk->d_strategy = xb_strategy; + sc->xb_disk->d_name = "xbd"; + sc->xb_disk->d_drv1 = sc; + sc->xb_disk->d_sectorsize = sector_size; /* XXX */ - sc->xb_disk.d_mediasize = capacity << XBD_SECTOR_SHFT; + sc->xb_disk->d_mediasize = capacity << XBD_SECTOR_SHFT; #if 0 - sc->xb_disk.d_maxsize = DFLTPHYS; + sc->xb_disk->d_maxsize = DFLTPHYS; #else /* XXX: xen can't handle large single i/o requests */ - sc->xb_disk.d_maxsize = 4096; + sc->xb_disk->d_maxsize = 4096; #endif #ifdef notyet XENPRINTF("attaching device 0x%x unit %d capacity %llu\n", xb_diskinfo[sc->xb_unit].device, sc->xb_unit, - sc->xb_disk.d_mediasize); + sc->xb_disk->d_mediasize); #endif - disk_create(&sc->xb_disk, DISK_VERSION_00); + sc->xb_disk->d_flags = 0; + disk_create(sc->xb_disk, DISK_VERSION_00); bioq_init(&sc->xb_bioq); return error; @@ -180,7 +182,10 @@ void xlvbd_del(struct blkfront_info *info) { - ; + struct xb_softc *sc; + + sc = info->sc; + disk_destroy(sc->xb_disk); } /************************ end VBD support *****************/ @@ -707,7 +712,7 @@ BLKIF_OP_WRITE; ring_req->sector_number= (blkif_sector_t)bp->bio_pblkno; - ring_req->handle = (unsigned long)&sc->xb_disk; + ring_req->handle = (blkif_vdev_t)(uintptr_t)sc->xb_disk; ring_req->nr_segments = 0; /* XXX not doing scatter/gather since buffer * chaining is not supported. ==== //depot/projects/xen3/src/sys/dev/xen/blkfront/block.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ struct xb_softc { device_t xb_dev; - struct disk xb_disk; /* disk params */ + struct disk *xb_disk; /* disk params */ struct bio_queue_head xb_bioq; /* sort queue */ int xb_unit; int xb_flags; From owner-p4-projects@FreeBSD.ORG Wed Jan 4 05:58:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA76E16A42C; Wed, 4 Jan 2006 05:58:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99A7916A42F for ; Wed, 4 Jan 2006 05:58:47 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6342143D4C for ; Wed, 4 Jan 2006 05:58:47 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k045wlHc066218 for ; Wed, 4 Jan 2006 05:58:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k045wlFT066213 for perforce@freebsd.org; Wed, 4 Jan 2006 05:58:47 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 4 Jan 2006 05:58:47 GMT Message-Id: <200601040558.k045wlFT066213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 05:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=89126 Change 89126 by kmacy@kmacy:freebsd7_xen3 on 2006/01/04 05:58:44 fix shutdown, we now shutdown and reboot cleanly Affected files ... .. //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#3 edit .. //depot/projects/xen3/src/sys/kern/kern_shutdown.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386/i386/vm_machdep.c#3 (text+ko) ==== @@ -551,6 +551,11 @@ } #endif +#ifdef XEN + HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_reboot); +#endif + + #ifdef SMP u_int cnt, map; ==== //depot/projects/xen3/src/sys/kern/kern_shutdown.c#2 (text+ko) ==== @@ -418,6 +418,9 @@ printf("Please press any key to reboot.\n\n"); switch (cngetc()) { case -1: /* No console, just die */ +#ifdef XEN + case 0: /* No valid input */ +#endif cpu_halt(); /* NOTREACHED */ default: From owner-p4-projects@FreeBSD.ORG Wed Jan 4 06:27:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1677C16A423; Wed, 4 Jan 2006 06:27:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0D4316A420 for ; Wed, 4 Jan 2006 06:27:22 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FA6943D58 for ; Wed, 4 Jan 2006 06:27:22 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k046RMtB067392 for ; Wed, 4 Jan 2006 06:27:22 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k046RMUp067389 for perforce@freebsd.org; Wed, 4 Jan 2006 06:27:22 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 4 Jan 2006 06:27:22 GMT Message-Id: <200601040627.k046RMUp067389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 06:27:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=89128 Change 89128 by kmacy@kmacy:freebsd7_xen3 on 2006/01/04 06:26:54 fix clock driver, VM time now correctly tracks wall clock and sleeps sleep for the right amount of time Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#2 (text+ko) ==== @@ -319,20 +319,9 @@ ticks += (delta / NS_PER_TICK); delta = (delta % NS_PER_TICK); processed_system_time += ticks*NS_PER_TICK; + per_cpu(processed_system_time, cpu) += ticks*NS_PER_TICK; } hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); - /* Local CPU jiffy work. */ - while (delta_cpu >= NS_PER_TICK) { - delta_cpu -= NS_PER_TICK; - per_cpu(processed_system_time, cpu) += NS_PER_TICK; -#if 0 - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); -#endif - } - - if (cpu != 0) - return; /* * Take synchronised time from Xen once a minute if we're not * synchronised ourselves, and we haven't chosen to keep an independent @@ -597,8 +586,7 @@ static uint32_t xen_get_timecount(struct timecounter *tc) { - __get_time_values_from_xen(); - return per_cpu(shadow_time, 0).tsc_timestamp; + return processed_system_time; } /* From owner-p4-projects@FreeBSD.ORG Wed Jan 4 19:51:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 049F716A423; Wed, 4 Jan 2006 19:51:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFC4C16A41F for ; Wed, 4 Jan 2006 19:51:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41ABB43D5D for ; Wed, 4 Jan 2006 19:51:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04JpmJt022432 for ; Wed, 4 Jan 2006 19:51:48 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04Jpliu022429 for perforce@freebsd.org; Wed, 4 Jan 2006 19:51:47 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 19:51:47 GMT Message-Id: <200601041951.k04Jpliu022429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 19:51:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=89169 Change 89169 by imp@imp_hammer on 2006/01/04 19:50:47 First pass at defining EMAC register values. More might be needed for the receive buffer structure. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 4 19:51:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BC4516A442; Wed, 4 Jan 2006 19:51:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4A1E16A420 for ; Wed, 4 Jan 2006 19:51:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9008643D5F for ; Wed, 4 Jan 2006 19:51:48 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04JpmfO022438 for ; Wed, 4 Jan 2006 19:51:48 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04JpmA9022435 for perforce@freebsd.org; Wed, 4 Jan 2006 19:51:48 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 19:51:48 GMT Message-Id: <200601041951.k04JpmA9022435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 19:51:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=89170 Change 89170 by imp@imp_hammer on 2006/01/04 19:51:43 Frame out the MIIBUS support. Still needs the actual registers accesses added, however. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#3 (text+ko) ==== @@ -52,21 +52,37 @@ #include #include +#include +#include + +#include "miibus_if.h" + struct ate_softc { struct ifnet *ifp; struct mtx sc_mtx; device_t dev; + device_t miibus; void *intrhand; struct resource *irq_res; - int irq_rid; - struct resource *port_res; - int port_rid; + struct resource *mem_res; // XXX bogus int intr; }; +static inline uint32_t +RD4(struct ate_softc *sc, bus_offset_t off) +{ + return bus_read_4(sc->mem_res, off); +} + +static inline void +WR4(struct ate_softc *sc, bus_offset_t off, uint32_t val) +{ + bus_write_4(sc->mem_res, off, val); +} + #define ATE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx) #define ATE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define ATE_LOCK_INIT(_sc) \ @@ -98,7 +114,7 @@ /* helper routines */ static int ate_activate(device_t dev); -static int ate_deactivate(device_t dev); +static void ate_deactivate(device_t dev); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -171,13 +187,44 @@ static int ate_activate(device_t dev) { - return EINVAL; /* XXX */ + struct ate_softc *sc; + int rid; + + sc = device_get_softc(dev); + rid = 0; + sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) + goto errout; + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE); + if (sc->mem_res == NULL) + goto errout; + return (0); +errout:; + ate_deactivate(dev); + return (ENOMEM); } -static int +static void ate_deactivate(device_t dev) { - return EINVAL; /* XXX */ + struct ate_softc *sc; + + sc = device_get_softc(dev); + if (sc->intrhand) + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = 0; + if (sc->mem_res) + bus_release_resource(dev, SYS_RES_IOPORT, sc->port_rid, + sc->mem_res); + sc->mem_res = 0; + if (sc->irq_res) + bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, + sc->irq_res); + sc->irq_res = 0; + return; } static void @@ -199,6 +246,7 @@ ATE_ASSERT_LOCKED(sc); +// XXX don't forget RMII vs MII /* Insert code here */ sc->intr++; } @@ -299,12 +347,51 @@ return (error); } +static void +ate_child_detached(device_t dev, device_t child) +{ + struct ate_softc *sc; + + sc = device_get_softc(dev); + if (child == sc->miibus) + sc->miibus = NULL; +} + +/* + * MII bus support routines. + */ +static int +ate_miibus_readreg(device_t dev, int phy, int reg) +{ + struct ate_softc *sc; + + sc = device_get_softc(dev); + + + return (0); +} + +static void +ate_miibus_writereg(device_t dev, int phy, int reg, int data) +{ + struct ate_softc *sc; + + sc = device_get_softc(dev); +} + static device_method_t ate_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ate_probe), DEVMETHOD(device_attach, ate_attach), DEVMETHOD(device_detach, ate_detach), + /* Bus interface */ + DEVMETHOD(bus_child_detached, ate_child_detached), + + /* MII interface */ + DEVMETHOD(miibus_readreg, ate_miibus_readreg), + DEVMETHOD(miibus_writereg, ate_miibus_writereg), + { 0, 0 } }; @@ -315,4 +402,6 @@ }; DRIVER_MODULE(ate, atemelarm, ate_driver, ate_devclass, 0, 0); +DRIVER_MODULE(miibus, ate, miibus_driver, miibus_devclass, 0, 0); +MODULE_DEPEND(ate, miibus, 1, 1, 1); MODULE_DEPEND(ate, ether, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Wed Jan 4 21:33:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7DE016A425; Wed, 4 Jan 2006 21:33:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F8B916A423 for ; Wed, 4 Jan 2006 21:33:10 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B1AF43D8A for ; Wed, 4 Jan 2006 21:31:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04LVIDR033915 for ; Wed, 4 Jan 2006 21:31:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04LVIBx033912 for perforce@freebsd.org; Wed, 4 Jan 2006 21:31:18 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 21:31:18 GMT Message-Id: <200601042131.k04LVIBx033912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 21:33:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=89181 Change 89181 by imp@imp_plunger on 2006/01/04 21:30:54 More Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#4 (text+ko) ==== @@ -32,15 +32,18 @@ #include #include #include +#include #include #include +#include #include #include #include #include +#include +#include #include -#include #ifdef INET #include @@ -72,13 +75,13 @@ }; static inline uint32_t -RD4(struct ate_softc *sc, bus_offset_t off) +RD4(struct ate_softc *sc, bus_size_t off) { return bus_read_4(sc->mem_res, off); } static inline void -WR4(struct ate_softc *sc, bus_offset_t off, uint32_t val) +WR4(struct ate_softc *sc, bus_size_t off, uint32_t val) { bus_write_4(sc->mem_res, off, val); } @@ -217,12 +220,12 @@ bus_teardown_intr(dev, sc->irq_res, sc->intrhand); sc->intrhand = 0; if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, sc->port_rid, - sc->mem_res); + bus_release_resource(dev, SYS_RES_IOPORT, + rman_get_rid(sc->mem_res), sc->mem_res); sc->mem_res = 0; if (sc->irq_res) - bus_release_resource(dev, SYS_RES_IRQ, sc->irq_rid, - sc->irq_res); + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); sc->irq_res = 0; return; } From owner-p4-projects@FreeBSD.ORG Wed Jan 4 21:33:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 925E916A420; Wed, 4 Jan 2006 21:33:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5163516A422 for ; Wed, 4 Jan 2006 21:33:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B2E943D8C for ; Wed, 4 Jan 2006 21:31:23 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04LVJf5033921 for ; Wed, 4 Jan 2006 21:31:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04LVIvc033918 for perforce@freebsd.org; Wed, 4 Jan 2006 21:31:18 GMT (envelope-from imp@freebsd.org) Date: Wed, 4 Jan 2006 21:31:18 GMT Message-Id: <200601042131.k04LVIvc033918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89182 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 21:33:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=89182 Change 89182 by imp@imp_plunger on 2006/01/04 21:31:13 Bring in the miibus. Affected files ... .. //depot/projects/arm/src/sys/arm/conf/KB920X#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/conf/KB920X#11 (text+ko) ==== @@ -69,6 +69,7 @@ device nexus device uart device ate +device miibus # Debugging for use in -current #options INVARIANTS #Enable calls of extra sanity checking From owner-p4-projects@FreeBSD.ORG Wed Jan 4 22:16:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F03B16A423; Wed, 4 Jan 2006 22:16:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAE9616A41F for ; Wed, 4 Jan 2006 22:16:23 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D564343D5A for ; Wed, 4 Jan 2006 22:16:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k04MGE5V035766 for ; Wed, 4 Jan 2006 22:16:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k04MGE5G035763 for perforce@freebsd.org; Wed, 4 Jan 2006 22:16:14 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 4 Jan 2006 22:16:14 GMT Message-Id: <200601042216.k04MGE5G035763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89185 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 22:16:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=89185 Change 89185 by kmacy@kmacy:freebsd7_xen3 on 2006/01/04 22:15:54 fix the network rx path, mbufs were not being set by allocated id Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#2 (text+ko) ==== @@ -284,11 +284,11 @@ }; #endif #define IPRINTK(fmt, args...) \ - printk("[XEN] " fmt, ##args) + printf("[XEN] " fmt, ##args) #define WPRINTK(fmt, args...) \ - printk("[XEN] " fmt, ##args) + printf("[XEN] " fmt, ##args) #define DPRINTK(fmt, args...) \ - printk("[XEN] " fmt, ##args) + printf("[XEN] " fmt, ##args) static __inline struct mbuf* makembuf (struct mbuf *buf) @@ -619,7 +619,7 @@ * ourself and for other kernel subsystems. */ batch_target = sc->rx_target - (req_prod - sc->rx.rsp_cons); - for ( i = sc->xn_rx_batchlen; i < batch_target; i++, sc->xn_rx_batchlen++) { + for (i = sc->xn_rx_batchlen; i < batch_target; i++, sc->xn_rx_batchlen++) { MGETHDR(m_new, M_DONTWAIT, MT_DATA); if (m_new == NULL) break; @@ -654,10 +654,10 @@ id = GET_ID_FROM_FREELIST(sc->xn_rx_free_idxs); KASSERT(id != 0, ("alloc_rx_buffers: found free receive index of 0\n")); - sc->xn_cdata.xn_rx_chain[i] = m_new; + sc->xn_cdata.xn_rx_chain[id] = m_new; - RING_GET_REQUEST(&sc->rx, req_prod + i)->id = id; + RING_GET_REQUEST(&sc->rx, req_prod + i)->id = id; ref = gnttab_claim_grant_reference(&sc->gref_rx_head); PANIC_IF((signed short)ref < 0); sc->grant_rx_ref[id] = ref; @@ -888,6 +888,7 @@ id = RING_GET_RESPONSE(&np->tx, i)->id; m = np->xn_cdata.xn_tx_chain[id]; + ifp->if_opackets++; KASSERT(m != NULL, ("mbuf not found in xn_tx_chain")); M_ASSERTVALID(m); if (unlikely(gnttab_query_foreign_access( From owner-p4-projects@FreeBSD.ORG Thu Jan 5 01:54:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B776C16A422; Thu, 5 Jan 2006 01:54:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 822EE16A41F for ; Thu, 5 Jan 2006 01:54:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1849843D60 for ; Thu, 5 Jan 2006 01:54:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k051scsg052962 for ; Thu, 5 Jan 2006 01:54:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k051scKP052959 for perforce@freebsd.org; Thu, 5 Jan 2006 01:54:38 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Jan 2006 01:54:38 GMT Message-Id: <200601050154.k051scKP052959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 01:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=89190 Change 89190 by imp@imp_Speedy on 2006/01/05 01:54:31 Write a stop routine. Start an init routine. Write a tick routine. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#5 (text+ko) ==== @@ -57,21 +57,25 @@ #include #include +#include #include "miibus_if.h" struct ate_softc { - struct ifnet *ifp; - struct mtx sc_mtx; - device_t dev; - device_t miibus; - void *intrhand; - struct resource *irq_res; - struct resource *mem_res; + struct ifnet *ifp; /* ifnet pointer */ + struct mtx sc_mtx; /* basically a perimeter lock */ + device_t dev; /* Myself */ + device_t miibus; /* My child miibus */ + void *intrhand; /* Interrupt handle */ + struct resource *irq_res; /* IRQ resource */ + struct resource *mem_res; /* Memory resource */ + struct callout tick_ch; /* Tick callout */ // XXX bogus int intr; + + struct ifmib_iso_8802_3 mibdata; /* stuff for network mgmt */ }; static inline uint32_t @@ -148,6 +152,8 @@ /* calling atestop before ifp is set is OK */ atestop(sc); ATE_LOCK_INIT(sc); + callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); + sc->ifp = ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -162,6 +168,9 @@ ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; IFQ_SET_READY(&ifp->if_snd); ifp->if_timer = 0; + ifp->if_linkmib = &sc->mibdata; + ifp->if_linkmiblen = sizeof(sc->mibdata); + sc->mibdata.dot3Compliance = DOT3COMPLIANCE_COLLS; ether_ifattach(ifp, eaddr); @@ -219,6 +228,9 @@ if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); sc->intrhand = 0; + bus_generic_detach(sc->dev); + if (sc->miibus) + device_delete_child(sc->dev, sc->miibus); if (sc->mem_res) bus_release_resource(dev, SYS_RES_IOPORT, rman_get_rid(sc->mem_res), sc->mem_res); @@ -231,6 +243,42 @@ } static void +ate_tick(void *xsc) +{ + struct ate_softc *sc = xsc; + struct mii_data *mii; + int active; + + ATE_ASSERT_LOCKED(sc); + if (sc->miibus != NULL) { + mii = device_get_softc(sc->miibus); + active = mii->mii_media_active; + mii_tick(mii); + if (mii->mii_media_status & IFM_ACTIVE && + active != mii->mii_media_active) { + /* + * The speed and full/half-duplex state needs + * to be reflected in the ETH_CFG register, it + * seems. + */ + if (IFM_SUBTYPE(mii->mii_media_active) == IFM_10_T) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & + ~ETH_CFG_SPD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | + ETH_CFG_SPD); + if (mii->mii_media_active & IFM_FDX) + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | + ETH_CFG_FD); + else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & + ~ETH_CFG_FD); + } + } +} + + +static void ate_intr(void *xsc) { struct ate_softc *sc = xsc; @@ -245,13 +293,45 @@ ateinit_locked(void *xsc) { struct ate_softc *sc = xsc; -// struct ifnet *ifp = sc->ifp; + struct ifnet *ifp = sc->ifp; ATE_ASSERT_LOCKED(sc); -// XXX don't forget RMII vs MII - /* Insert code here */ - sc->intr++; + /* + * XXX we need to turn on the EMAC clock in the pmc. With the + * default boot loader, this is already turned on. However, we + * need to think about how best to turn it on/off as the interface + * is brought up/down, as well as dealing with the mii bus... + * + * We also need to multiplex the pins correctly. + */ + + /* + * There are two different ways that the mii bus is connected + * to this chip. Select the right one based on a compile-time + * option. + */ +#ifdef ATE_USE_RMII + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) | ETH_CFG_RMII); +#else + WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); +#endif + + /* XXX need to setup multicast filters */ + /* XXX need to setup rx buffers and assoc structures */ + /* XXX need to enable appropriate interrupt masks */ + /* XXX need to program station address, or is that + * XXX added by upper layers? */ + + /* + * Set 'running' flag, and clear output active flag + * and attempt to start the output + */ + ifp->if_drv_flags |= IFF_DRV_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + atestart_locked(ifp); + + callout_reset(&sc->tick_ch, hz, ate_tick, sc); } /* @@ -293,6 +373,39 @@ static void atestop(struct ate_softc *sc) { + callout_stop(&sc->tick_ch); + + /* + * Enable some parts of the MAC that are needed always (like the + * MII bus. This turns off the RE and TE bits, which will remain + * off until atestart() is called to turn them on. + */ + WR4(sc, ETH_CTL, ETH_CTL_MPE); + + /* + * Turn off all the configured options and revert to defaults. + */ + WR4(sc, ETH_CFG, ETH_CFG_CLK_32); + + /* + * Turn off all the interrupts, and ack any pending ones by reading + * the ISR. + */ + WR4(sc, ETH_IDR, 0xffffffff); + RD4(sc, ETH_ISR); + + /* + * Clear out the Transmit and Receiver Status registers of any + * errors they may be reporting + */ + WR4(sc, ETH_TSR, 0xffffffff); + WR4(sc, ETH_RSR, 0xffffffff); + + /* + * XXX we should power down the EMAC if it isn't in use, after + * putting it into loopback mode. This saves about 400uA according + * to the datasheet. + */ } static void From owner-p4-projects@FreeBSD.ORG Thu Jan 5 04:01:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D1B316A422; Thu, 5 Jan 2006 04:01:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2EA116A41F for ; Thu, 5 Jan 2006 04:01:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD60C43D53 for ; Thu, 5 Jan 2006 04:01:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0541BgY060243 for ; Thu, 5 Jan 2006 04:01:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0541BuF060240 for perforce@freebsd.org; Thu, 5 Jan 2006 04:01:11 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Jan 2006 04:01:11 GMT Message-Id: <200601050401.k0541BuF060240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 04:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=89193 Change 89193 by imp@imp_Speedy on 2006/01/05 04:00:20 MII READ and WRITE REG registers frobbing PHY found on miibus Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#6 edit .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#6 (text+ko) ==== @@ -480,11 +480,20 @@ ate_miibus_readreg(device_t dev, int phy, int reg) { struct ate_softc *sc; + int val; + /* + * XXX if we implement agressive power savings, then we need + * XXX to make sure that the clock to the emac is on here + */ + sc = device_get_softc(dev); + WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg)); + while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) + continue; + val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE; - - return (0); + return (val); } static void @@ -492,7 +501,16 @@ { struct ate_softc *sc; + /* + * XXX if we implement agressive power savings, then we need + * XXX to make sure that the clock to the emac is on here + */ + sc = device_get_softc(dev); + WR4(sc, ETH_MAN, ETH_MAN_REG_WR(phy, reg, data)); + while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) + continue; + return; } static device_method_t ate_methods[] = { ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#2 (text+ko) ==== @@ -147,9 +147,10 @@ #define ETH_MAN_WRITE (1U << 28) #define ETH_MAN_PHYA_BIT 23 #define ETH_MAN_REGA_BIT 18 +#define ETH_MAN_VALUE 0xffffU #define ETH_MAN_REG_WR(phy, reg, val) \ (ETH_MAN_BITS | ETH_MAN_WRITE | ((phy) << ETH_MAN_PHYA_BIT) | \ - ((reg) << ETH_MAN_REGA_BIT) | val) + ((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE)) #define ETH_MAN_REG_RD(phy, reg) \ (ETH_MAN_BITS | ETH_MAN_READ | ((phy) << ETH_MAN_PHYA_BIT) | \ ((reg) << ETH_MAN_REGA_BIT)) From owner-p4-projects@FreeBSD.ORG Thu Jan 5 06:42:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D00516A422; Thu, 5 Jan 2006 06:42:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD5B616A41F for ; Thu, 5 Jan 2006 06:42:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64ECA43D4C for ; Thu, 5 Jan 2006 06:42:26 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k056gQ2S073565 for ; Thu, 5 Jan 2006 06:42:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k056gQEL073562 for perforce@freebsd.org; Thu, 5 Jan 2006 06:42:26 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Jan 2006 06:42:26 GMT Message-Id: <200601050642.k056gQEL073562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 06:42:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=89196 Change 89196 by kmacy@kmacy:freebsd7_xen3 on 2006/01/05 06:41:54 set wallclock time so that domain time corresponds to dom0 time change get_timecount so that time doesn't increase in a bursty fashion Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#3 (text+ko) ==== @@ -129,7 +129,10 @@ static unsigned long fast_gettimeoffset_quotient; /* These are peridically updated in shared_info, and then copied here. */ -static struct timeval shadow_tv; +static struct timespec shadow_tv; + +uint32_t shadow_tv_version; + #define do_div(n,base) ({ \ unsigned long __upper, __low, __high, __mod, __base; \ @@ -239,6 +242,21 @@ return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift); } +static void update_wallclock(void) +{ + shared_info_t *s = HYPERVISOR_shared_info; + + do { + shadow_tv_version = s->wc_version; + rmb(); + shadow_tv.tv_sec = s->wc_sec; + shadow_tv.tv_nsec = s->wc_nsec; + rmb(); + } + while ((s->wc_version & 1) | (shadow_tv_version ^ s->wc_version)); + +} + /* * Reads a consistent set of time-base values from Xen, into a shadow data * area. Must be called with the xtime_lock held for writing. @@ -288,47 +306,49 @@ 0 /* quality */ }; - static void clkintr(struct trapframe *frame) { - int64_t delta_cpu, delta; - int cpu = smp_processor_id(); - struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu); - long ticks = 0; - TRACE_ENTER; + int64_t delta_cpu, delta; + int cpu = smp_processor_id(); + struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu); + long lticks = 0; + + do { + __get_time_values_from_xen(); + + delta = delta_cpu = + shadow->system_timestamp + get_nsec_offset(shadow); + + delta -= processed_system_time; + delta_cpu -= per_cpu(processed_system_time, cpu); - do { - __get_time_values_from_xen(); - - delta = delta_cpu = - shadow->system_timestamp + get_nsec_offset(shadow); - - delta -= processed_system_time; - delta_cpu -= per_cpu(processed_system_time, cpu); - - } while (!time_values_up_to_date(cpu)); - - if (unlikely(delta < (int64_t)-1000000) || unlikely(delta_cpu < 0)) { - printf("Timer ISR: Time went backwards: %lld\n", delta); - return; - } - - /* Process elapsed ticks since last call. */ - if (delta > NS_PER_TICK) { - ticks += (delta / NS_PER_TICK); - delta = (delta % NS_PER_TICK); - processed_system_time += ticks*NS_PER_TICK; - per_cpu(processed_system_time, cpu) += ticks*NS_PER_TICK; - } + } while (!time_values_up_to_date(cpu)); + + if (unlikely(delta < (int64_t)-1000000) || unlikely(delta_cpu < 0)) { + printf("Timer ISR: Time went backwards: %lld\n", delta); + return; + } + + /* Process elapsed ticks since last call. */ + if (delta >= NS_PER_TICK) { + lticks = (delta / NS_PER_TICK); + processed_system_time += lticks*NS_PER_TICK; + per_cpu(processed_system_time, cpu) += lticks*NS_PER_TICK; + } hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); - /* - * Take synchronised time from Xen once a minute if we're not - * synchronised ourselves, and we haven't chosen to keep an independent - * time base. - */ - - /* XXX TODO */ + /* + * Take synchronised time from Xen once a minute if we're not + * synchronised ourselves, and we haven't chosen to keep an independent + * time base. + */ + + if (shadow_tv_version != HYPERVISOR_shared_info->wc_version) { + update_wallclock(); + tc_setclock(&shadow_tv); + } + + /* XXX TODO */ } #include "opt_ddb.h" @@ -336,7 +356,7 @@ getit(void) { __get_time_values_from_xen(); - return per_cpu(shadow_time, 0).tsc_timestamp; + return per_cpu(shadow_time, smp_processor_id()).system_timestamp; } /* @@ -507,6 +527,8 @@ int s, y; struct timespec ts; + update_wallclock(); + s = splclock(); if (base) { ts.tv_sec = base; @@ -517,9 +539,7 @@ y = time_second - shadow_tv.tv_sec; if (y <= -2 || y >= 2) { /* badly off, adjust it */ - ts.tv_sec = shadow_tv.tv_sec; - ts.tv_nsec = shadow_tv.tv_usec * 1000; - tc_setclock(&ts); + tc_setclock(&shadow_tv); } splx(s); } @@ -582,11 +602,18 @@ printf("cpu_stopprofclock: profiling clock is not supported\n"); } +#define NSEC_PER_USEC 1000 static uint32_t xen_get_timecount(struct timecounter *tc) -{ - return processed_system_time; +{ + struct shadow_time_info *shadow; + shadow = &per_cpu(shadow_time, smp_processor_id()); + + return (uint32_t)get_nsec_offset(shadow); + + + } /* From owner-p4-projects@FreeBSD.ORG Thu Jan 5 07:02:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3253916A423; Thu, 5 Jan 2006 07:02:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 06DA716A41F for ; Thu, 5 Jan 2006 07:02:56 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1008243D6D for ; Thu, 5 Jan 2006 07:02:51 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0572ph2074489 for ; Thu, 5 Jan 2006 07:02:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0572pVv074486 for perforce@freebsd.org; Thu, 5 Jan 2006 07:02:51 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Jan 2006 07:02:51 GMT Message-Id: <200601050702.k0572pVv074486@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 07:02:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=89197 Change 89197 by kmacy@kmacy:freebsd7_xen3 on 2006/01/05 07:02:44 try to avoid premature wrapping of the counter Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#4 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#4 (text+ko) ==== @@ -610,10 +610,10 @@ struct shadow_time_info *shadow; shadow = &per_cpu(shadow_time, smp_processor_id()); - return (uint32_t)get_nsec_offset(shadow); - + __get_time_values_from_xen(); + + return (uint32_t)(processed_system_time + shadow->system_timestamp + get_nsec_offset(shadow)); - } /* From owner-p4-projects@FreeBSD.ORG Thu Jan 5 08:04:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C0AB16A422; Thu, 5 Jan 2006 08:04:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 25F3F16A41F for ; Thu, 5 Jan 2006 08:04:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBFE043D46 for ; Thu, 5 Jan 2006 08:04:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0584RgF076925 for ; Thu, 5 Jan 2006 08:04:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0584RWX076922 for perforce@freebsd.org; Thu, 5 Jan 2006 08:04:27 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Jan 2006 08:04:27 GMT Message-Id: <200601050804.k0584RWX076922@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 08:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=89199 Change 89199 by imp@imp_Speedy on 2006/01/05 08:03:26 Put it on the right bus... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#7 (text+ko) ==== @@ -535,7 +535,7 @@ sizeof(struct ate_softc), }; -DRIVER_MODULE(ate, atemelarm, ate_driver, ate_devclass, 0, 0); +DRIVER_MODULE(ate, atmelarm, ate_driver, ate_devclass, 0, 0); DRIVER_MODULE(miibus, ate, miibus_driver, miibus_devclass, 0, 0); MODULE_DEPEND(ate, miibus, 1, 1, 1); MODULE_DEPEND(ate, ether, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Thu Jan 5 08:25:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBB9416A422; Thu, 5 Jan 2006 08:25:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7796B16A41F for ; Thu, 5 Jan 2006 08:25:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A0F743D5C for ; Thu, 5 Jan 2006 08:25:54 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k058PrYh079983 for ; Thu, 5 Jan 2006 08:25:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k058Prcb079980 for perforce@freebsd.org; Thu, 5 Jan 2006 08:25:53 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Jan 2006 08:25:53 GMT Message-Id: <200601050825.k058Prcb079980@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89200 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 08:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=89200 Change 89200 by kmacy@kmacy:freebsd7_xen3 on 2006/01/05 08:25:00 update processed_system_time in idle_block to make sure that we don't block too long Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#5 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#5 (text+ko) ==== @@ -654,6 +654,9 @@ void idle_block(void) { + + __get_time_values_from_xen(); + processed_system_time = per_cpu(processed_system_time, smp_processor_id()); PANIC_IF(HYPERVISOR_set_timer_op(processed_system_time + NS_PER_TICK) != 0); HYPERVISOR_sched_op(SCHEDOP_block, 0); } From owner-p4-projects@FreeBSD.ORG Thu Jan 5 08:33:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FEB916A423; Thu, 5 Jan 2006 08:33:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA4ED16A420 for ; Thu, 5 Jan 2006 08:33:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 667B343D4C for ; Thu, 5 Jan 2006 08:33:03 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k058X3hU080244 for ; Thu, 5 Jan 2006 08:33:03 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k058X3oG080241 for perforce@freebsd.org; Thu, 5 Jan 2006 08:33:03 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Jan 2006 08:33:03 GMT Message-Id: <200601050833.k058X3oG080241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89201 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 08:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=89201 Change 89201 by imp@imp_hammer on 2006/01/05 08:32:59 More MII support goo. Also, update the stats while I'm not hammered with other things, lest I forget later. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#8 (text+ko) ==== @@ -122,6 +122,8 @@ /* helper routines */ static int ate_activate(device_t dev); static void ate_deactivate(device_t dev); +static int ate_ifmedia_upd(struct ifnet *ifp); +static void ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); /* * The AT91 family of products has the ethernet called EMAC. However, @@ -154,6 +156,12 @@ ATE_LOCK_INIT(sc); callout_init_mtx(&sc->tick_ch, &sc->sc_mtx, 0); + if (mii_phy_probe(dev, &sc->miibus, ate_ifmedia_upd, ate_ifmedia_sts)) { + device_printf(dev, "Cannot find my PHY.\n"); + err = ENXIO; + goto out; + } + sc->ifp = ifp = if_alloc(IFT_ETHER); ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); @@ -242,6 +250,39 @@ return; } +/* + * Change media according to request. + */ +static int +ate_ifmedia_upd(struct ifnet *ifp) +{ + struct ate_softc *sc = ifp->if_softc; + struct mii_data *mii; + + mii = device_get_softc(sc->miibus); + ATE_LOCK(sc); + mii_mediachg(mii); + ATE_UNLOCK(sc); + return (0); +} + +/* + * Notify the world which media we're using. + */ +static void +ate_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +{ + struct ate_softc *sc = ifp->if_softc; + struct mii_data *mii; + + mii = device_get_softc(sc->miibus); + ATE_LOCK(sc); + mii_pollstat(mii); + ifmr->ifm_active = mii->mii_media_active; + ifmr->ifm_status = mii->mii_media_status; + ATE_UNLOCK(sc); +} + static void ate_tick(void *xsc) { @@ -275,6 +316,35 @@ ~ETH_CFG_FD); } } + + /* + * Update the stats as best we can. When we're done, clear + * the status counters and start over. We're supposed to read these + * registers often enough that they won't overflow. Hopefully + * once a second is often enough. Some don't map well to + * the dot3Stats mib, so for those we just count them as general + * errors. Stats for iframes, ibutes, oframes and obytes are + * collected elsewhere. + */ + sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); + sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); + sc->mibdata.dot3StatsSingleColliionsFrames += RD4(sc, ETH_SCOL); + sc->mibdata.dot3StatsMultipleColliionsFrames += RD4(sc, ETH_MCOL); + sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SEQEE); + sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); + sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); + sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); + sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); + sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_EJR); + sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); + /* + * not sure where to lump these, so count them against the errors + * for the interface. + */ + sc->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); + sc->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + + RD4(sc, ETH_USF); + WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_CSR); } From owner-p4-projects@FreeBSD.ORG Thu Jan 5 08:40:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD67816A423; Thu, 5 Jan 2006 08:40:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9AD1C16A41F for ; Thu, 5 Jan 2006 08:40:13 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E90743D66 for ; Thu, 5 Jan 2006 08:40:13 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k058eCgK080666 for ; Thu, 5 Jan 2006 08:40:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k058eCtl080663 for perforce@freebsd.org; Thu, 5 Jan 2006 08:40:12 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Jan 2006 08:40:12 GMT Message-Id: <200601050840.k058eCtl080663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89202 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 08:40:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=89202 Change 89202 by imp@imp_plunger on 2006/01/05 08:39:31 compile Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#9 (text+ko) ==== @@ -328,22 +328,27 @@ */ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); - sc->mibdata.dot3StatsSingleColliionsFrames += RD4(sc, ETH_SCOL); - sc->mibdata.dot3StatsMultipleColliionsFrames += RD4(sc, ETH_MCOL); - sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SEQEE); + sc->mibdata.dot3StatsSingleCollisionFrames += RD4(sc, ETH_SCOL); + sc->mibdata.dot3StatsMultipleCollisionFrames += RD4(sc, ETH_MCOL); + sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); sc->mibdata.dot3StatsLateCollisions += RD4(sc, ETH_LCOL); sc->mibdata.dot3StatsExcessiveCollisions += RD4(sc, ETH_ECOL); sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); - sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_EJR); + sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); /* * not sure where to lump these, so count them against the errors * for the interface. */ - sc->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); - sc->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + + sc->ifp->if_oerrors += RD4(sc, ETH_CSE) + RD4(sc, ETH_TUE); + sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF); + + /* + * Note: I think there's a race btn the use of the stats above and + * clearing them here. The datasheet is a bit vague on the topic. + */ WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_CSR); } From owner-p4-projects@FreeBSD.ORG Thu Jan 5 08:52:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D260616A422; Thu, 5 Jan 2006 08:52:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2C1B16A41F for ; Thu, 5 Jan 2006 08:52:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 644FA43D58 for ; Thu, 5 Jan 2006 08:52:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k058qUi0088692 for ; Thu, 5 Jan 2006 08:52:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k058qUS1088689 for perforce@freebsd.org; Thu, 5 Jan 2006 08:52:30 GMT (envelope-from imp@freebsd.org) Date: Thu, 5 Jan 2006 08:52:30 GMT Message-Id: <200601050852.k058qUS1088689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 08:52:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=89203 Change 89203 by imp@imp_plunger on 2006/01/05 08:51:29 Make sure we reschedule the next tick. In stop, make sure we turn off the running and active flags as well as stopping the timer. Add notes about needing to worry about busdma resources. Write a watchdog. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#10 (text+ko) ==== @@ -350,6 +350,11 @@ * clearing them here. The datasheet is a bit vague on the topic. */ WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_CSR); + + /* + * Schedule another timeout one second from now. + */ + callout_reset(&sc->tick_ch, hz, ate_tick, sc); } @@ -448,12 +453,20 @@ static void atestop(struct ate_softc *sc) { + struct ifnet *ifp = sc->ifp; + + if (ifp) { + ifp->if_timer = 0; + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + } + callout_stop(&sc->tick_ch); /* * Enable some parts of the MAC that are needed always (like the * MII bus. This turns off the RE and TE bits, which will remain - * off until atestart() is called to turn them on. + * off until atestart() is called to turn them on. With RE and TE + * turned off, there's no DMA to worry about after this write. */ WR4(sc, ETH_CTL, ETH_CTL_MPE); @@ -477,6 +490,12 @@ WR4(sc, ETH_RSR, 0xffffffff); /* + * XXX need to worry about the busdma resources? Yes, I think we need + * to sync and unload them. We may also need to release the mbufs + * that are assocaited with RX and TX operations. + */ + + /* * XXX we should power down the EMAC if it isn't in use, after * putting it into loopback mode. This saves about 400uA according * to the datasheet. @@ -486,7 +505,13 @@ static void atewatchdog(struct ifnet *ifp) { - /* timeout, not sure what to do */ + struct ate_softc *sc = ifp->if_softc; + + ATE_LOCK(sc); + device_printf(sc->dev, "Device timeout\n"); + ifp->if_oerrors++; + ateinit_locked(sc); + ATE_UNLOCK(sc); } static int From owner-p4-projects@FreeBSD.ORG Thu Jan 5 19:54:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B25516A423; Thu, 5 Jan 2006 19:54:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4611516A420 for ; Thu, 5 Jan 2006 19:54:10 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 018BB43D91 for ; Thu, 5 Jan 2006 19:54:00 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k05Js03e033196 for ; Thu, 5 Jan 2006 19:54:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k05Js0VL033187 for perforce@freebsd.org; Thu, 5 Jan 2006 19:54:00 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Jan 2006 19:54:00 GMT Message-Id: <200601051954.k05Js0VL033187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 19:54:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=89228 Change 89228 by kmacy@kmacy:freebsd7_xen3 on 2006/01/05 19:53:06 fix networking performance problems: xn_start needs to be called from xn_intr rx.sring->rsp_event needs to be reset or we won't get interrupts on receive Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#3 (text+ko) ==== @@ -521,10 +521,7 @@ info->irq = bind_evtchn_to_irqhandler( info->evtchn, "xn", xn_intr, info, INTR_TYPE_NET | INTR_MPSAFE); -#if 0 - /* XXX need this for re-location to work well */ - (void)send_fake_arp(netdev); -#endif + show_device(info); return 0; @@ -676,6 +673,7 @@ rx_mcl[i].args[0] = (unsigned long)mtod(m_new,vm_offset_t); rx_mcl[i].args[1] = 0; rx_mcl[i].args[2] = 0; + rx_mcl[i].args[2] = 0; } @@ -750,7 +748,7 @@ rx = RING_GET_RESPONSE(&np->rx, i); KASSERT(rx->id != 0, ("xn_rxeof: found free receive index of 0\n")); - /* + /* * This definitely indicates a bug, either in this driver or * in the backend driver. In future this should flag the bad * situation to the system controller to reboot the backed. @@ -862,6 +860,8 @@ network_alloc_rx_buffers(np); + np->rx.sring->rsp_event = i + 1; + } static void @@ -943,27 +943,24 @@ { struct netfront_info *np = xsc; struct ifnet *ifp = np->xn_ifp; - TRACE_ENTER; - /* XXX this seems like a recipe for poor performance if not livelock */ - XN_RX_LOCK(np); - - /* sometimes we seem to lose packets. stay in the interrupt handler while - * there is stuff to process: continually recheck the response producer. - */ - do { - if (np->rx.rsp_cons != np->rx.sring->rsp_prod && - np->user_state == UST_OPEN) - xn_rxeof(np); - - } while (np->rx.rsp_cons != np->rx.sring->rsp_prod && - np->user_state == UST_OPEN); - - XN_RX_UNLOCK(np); - - if (ifp->if_drv_flags & IFF_DRV_RUNNING) - xn_start(ifp); + while (np->rx.rsp_cons != np->rx.sring->rsp_prod && + np->user_state == UST_OPEN && + ifp->if_drv_flags & IFF_DRV_RUNNING) { + + XN_RX_LOCK(np); + xn_rxeof(np); + XN_RX_UNLOCK(np); + if (np->tx.rsp_cons != np->tx.sring->rsp_prod) { + XN_TX_LOCK(np); + xn_txeof(np); + XN_TX_UNLOCK(np); + } + if (ifp->if_drv_flags & IFF_DRV_RUNNING && + !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) + xn_start(ifp); + } return; } @@ -1057,6 +1054,7 @@ RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&sc->tx, notify); if (notify) notify_remote_via_irq(sc->irq); + xn_txeof(sc); if (RING_FULL(&sc->tx)) { From owner-p4-projects@FreeBSD.ORG Thu Jan 5 21:16:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C586816A423; Thu, 5 Jan 2006 21:16:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9B5DE16A420 for ; Thu, 5 Jan 2006 21:16:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 500BF43D5E for ; Thu, 5 Jan 2006 21:16:43 +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 k05LGhVT045702 for ; Thu, 5 Jan 2006 21:16:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k05LGgp5045699 for perforce@freebsd.org; Thu, 5 Jan 2006 21:16:42 GMT (envelope-from jhb@freebsd.org) Date: Thu, 5 Jan 2006 21:16:42 GMT Message-Id: <200601052116.k05LGgp5045699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 89233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 21:16:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=89233 Change 89233 by jhb@jhb_slimer on 2006/01/05 21:16:19 Add a note about a panic I just ran into on alpha. Affected files ... .. //depot/projects/smpng/sys/kern/kern_proc.c#81 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_proc.c#81 (text+ko) ==== @@ -907,6 +907,12 @@ error = SYSCTL_OUT(req, (caddr_t)&kinfo_proc, sizeof(kinfo_proc)); } else { + /* + * XXX: Can't call copyout() here on alpha with sched_lock + * held since we can get a pmap_emulate_reference() fault + * when we write to the page. Need to ask alc@ about how + * best to handle this. + */ mtx_lock_spin(&sched_lock); if (FIRST_THREAD_IN_PROC(p) != NULL) FOREACH_THREAD_IN_PROC(p, td) { From owner-p4-projects@FreeBSD.ORG Thu Jan 5 22:01:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0037F16A422; Thu, 5 Jan 2006 22:01:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C91FC16A41F for ; Thu, 5 Jan 2006 22:01:20 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8EA443DAF for ; Thu, 5 Jan 2006 22:00:42 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k05M0cDM047613 for ; Thu, 5 Jan 2006 22:00:38 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k05M0bpx047610 for perforce@freebsd.org; Thu, 5 Jan 2006 22:00:37 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Jan 2006 22:00:37 GMT Message-Id: <200601052200.k05M0bpx047610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 22:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=89237 Change 89237 by kmacy@kmacy:freebsd7_xen3 on 2006/01/05 22:00:05 a (I hope) temporary workaround for vforked processes segfaulting Affected files ... .. //depot/projects/xen3/src/sys/kern/kern_fork.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/kern/kern_fork.c#2 (text+ko) ==== @@ -112,8 +112,11 @@ { int error; struct proc *p2; - +#ifndef XEN error = fork1(td, RFFDG | RFPROC | RFPPWAIT | RFMEM, 0, &p2); +#else + error = fork1(td, RFFDG | RFPROC, 0, &p2); +#endif if (error == 0) { td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; From owner-p4-projects@FreeBSD.ORG Thu Jan 5 23:20:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F13B16A422; Thu, 5 Jan 2006 23:20:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3F0B16A41F for ; Thu, 5 Jan 2006 23:20:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A440943D55 for ; Thu, 5 Jan 2006 23:20:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k05NKENP050852 for ; Thu, 5 Jan 2006 23:20:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k05NKEdo050849 for perforce@freebsd.org; Thu, 5 Jan 2006 23:20:14 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 5 Jan 2006 23:20:14 GMT Message-Id: <200601052320.k05NKEdo050849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 23:20:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=89239 Change 89239 by kmacy@kmacy:freebsd7_xen3 on 2006/01/05 23:19:48 remove some dead code and don't disksort when not needed Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/blkfront/blkfront.c#3 (text+ko) ==== @@ -128,7 +128,6 @@ #define XBD_SECTOR_SHFT 9 static struct mtx blkif_io_lock; -static struct mtx bioq_lock; static unsigned long pfn_to_mfn(unsigned long pfn) @@ -189,8 +188,6 @@ } /************************ end VBD support *****************/ -#define USELOCK 0 - /* * Read/write routine for a buffer. Finds the proper unit, place it on * the sortq and kick the controller. @@ -209,20 +206,13 @@ } DPRINTK(""); -#if USELOCK - mtx_lock_irqsave(&bioq_lock, flags); -#else + flags = splbio(); -#endif /* * Place it in the queue of disk activities for this disk */ bioq_disksort(&sc->xb_bioq, bp); -#if USELOCK - mtx_unlock_irqrestore(&bioq_lock, flags); -#else splx(flags); -#endif xb_startio(sc); return; @@ -773,34 +763,21 @@ int flags, queued = 0; struct blkfront_info *info = sc->xb_info; DPRINTK(""); -#if USELOCK - mtx_lock_irqsave(&bioq_lock, flags); -#else + flags = splbio(); -#endif + while ((bp = bioq_takefirst(&sc->xb_bioq)) != NULL) { if (RING_FULL(&info->ring)) goto wait; -#if USELOCK - mtx_unlock_irqrestore(&bioq_lock, flags); -#else splx(flags); -#endif + if (blkif_queue_request(bp)) { -#if USELOCK - mtx_lock_irqsave(&bioq_lock, flags); -#else flags = splbio(); -#endif wait: - bioq_disksort(&sc->xb_bioq, bp); -#if USELOCK - mtx_unlock_irqrestore(&bioq_lock, flags); -#else + bioq_insert_head(&sc->xb_bioq, bp); splx(flags); -#endif break; } queued++; @@ -1018,7 +995,6 @@ } MTX_SYSINIT(ioreq, &blkif_io_lock, "BIO LOCK", MTX_SPIN | MTX_NOWITNESS); /* XXX how does one enroll a lock? */ -MTX_SYSINIT(bio, &bioq_lock, "BIOQ LOCK", MTX_SPIN | MTX_NOWITNESS); /* XXX how does one enroll a lock? */ MTX_SYSINIT(ioreq_block, &blkif_io_block_lock, "BIO BLOCK LOCK", MTX_SPIN | MTX_NOWITNESS); SYSINIT(xbdev, SI_SUB_PSEUDO, SI_ORDER_ANY, xenbus_init, NULL); From owner-p4-projects@FreeBSD.ORG Fri Jan 6 01:11:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B10B16A422; Fri, 6 Jan 2006 01:11:29 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D9B8516A41F for ; Fri, 6 Jan 2006 01:11:28 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8179543D45 for ; Fri, 6 Jan 2006 01:11:28 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k061BSPQ062650 for ; Fri, 6 Jan 2006 01:11:28 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k061BSRL062647 for perforce@freebsd.org; Fri, 6 Jan 2006 01:11:28 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 01:11:28 GMT Message-Id: <200601060111.k061BSRL062647@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89240 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 01:11:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=89240 Change 89240 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 01:10:39 notify xen that we have crashed so that we are either preserved, reaped, or core-dumped depending on settings Affected files ... .. //depot/projects/xen3/src/sys/kern/kern_shutdown.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/kern/kern_shutdown.c#3 (text+ko) ==== @@ -439,6 +439,10 @@ { int loop; +#ifdef XEN + HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_crash); +#endif + if (howto & RB_DUMP) { if (PANIC_REBOOT_WAIT_TIME != 0) { if (PANIC_REBOOT_WAIT_TIME != -1) { From owner-p4-projects@FreeBSD.ORG Fri Jan 6 01:32:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4685616A422; Fri, 6 Jan 2006 01:32:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEBA516A41F for ; Fri, 6 Jan 2006 01:32:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B664243D46 for ; Fri, 6 Jan 2006 01:32:54 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k061WskT063456 for ; Fri, 6 Jan 2006 01:32:54 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k061WsbV063453 for perforce@freebsd.org; Fri, 6 Jan 2006 01:32:54 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 01:32:54 GMT Message-Id: <200601060132.k061WsbV063453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 01:32:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=89241 Change 89241 by imp@imp_Speedy on 2006/01/06 01:31:57 Nits Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#11 (text+ko) ==== @@ -469,6 +469,7 @@ * turned off, there's no DMA to worry about after this write. */ WR4(sc, ETH_CTL, ETH_CTL_MPE); + printf("Writing MPE: Readback is %#x\n", RD4(sc, ETH_CTL)); /* * Turn off all the configured options and revert to defaults. @@ -581,7 +582,7 @@ { struct ate_softc *sc; int val; - + /* * XXX if we implement agressive power savings, then we need * XXX to make sure that the clock to the emac is on here From owner-p4-projects@FreeBSD.ORG Fri Jan 6 01:34:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28C7016A41F; Fri, 6 Jan 2006 01:34:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F378816A41F for ; Fri, 6 Jan 2006 01:34:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A983F43D45 for ; Fri, 6 Jan 2006 01:34:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k061YvtI063526 for ; Fri, 6 Jan 2006 01:34:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k061Yvpx063523 for perforce@freebsd.org; Fri, 6 Jan 2006 01:34:57 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 01:34:57 GMT Message-Id: <200601060134.k061Yvpx063523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 01:34:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=89242 Change 89242 by imp@imp_Speedy on 2006/01/06 01:34:16 It is LOW HIGH in the most two significant bits, not HIGH LOW. # we now really probe ukphy! We should be probing lxtphy, since # that's what we have. Likely a mismatch in an ID or something. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#3 (text+ko) ==== @@ -142,7 +142,7 @@ #define ETH_ISR_ABT (1U << 11) /* ABT: Abort */ /* ETH_MAN */ -#define ETH_MAN_BITS 0x80020000 /* HIGH and CODE bits */ +#define ETH_MAN_BITS 0x40020000 /* HIGH and CODE bits */ #define ETH_MAN_READ (2U << 28) #define ETH_MAN_WRITE (1U << 28) #define ETH_MAN_PHYA_BIT 23 From owner-p4-projects@FreeBSD.ORG Fri Jan 6 01:34:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A08D516A44F; Fri, 6 Jan 2006 01:34:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4807116A42C for ; Fri, 6 Jan 2006 01:34:58 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E01F943D46 for ; Fri, 6 Jan 2006 01:34:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k061YveF063532 for ; Fri, 6 Jan 2006 01:34:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k061YvIJ063529 for perforce@freebsd.org; Fri, 6 Jan 2006 01:34:57 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 01:34:57 GMT Message-Id: <200601060134.k061YvIJ063529@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 01:34:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=89243 Change 89243 by imp@imp_Speedy on 2006/01/06 01:34:53 Remove debug Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#12 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#12 (text+ko) ==== @@ -469,7 +469,6 @@ * turned off, there's no DMA to worry about after this write. */ WR4(sc, ETH_CTL, ETH_CTL_MPE); - printf("Writing MPE: Readback is %#x\n", RD4(sc, ETH_CTL)); /* * Turn off all the configured options and revert to defaults. From owner-p4-projects@FreeBSD.ORG Fri Jan 6 04:28:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2541216A422; Fri, 6 Jan 2006 04:28:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A58BD16A41F for ; Fri, 6 Jan 2006 04:28:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 591E843D45 for ; Fri, 6 Jan 2006 04:28:19 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k064SJYe069960 for ; Fri, 6 Jan 2006 04:28:19 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k064SI85069957 for perforce@freebsd.org; Fri, 6 Jan 2006 04:28:18 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 04:28:18 GMT Message-Id: <200601060428.k064SI85069957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 04:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=89249 Change 89249 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 04:27:21 first *small* changes for DOM0 support add PHYSDEV_ACCESS option add DOM0 support to console driver Affected files ... .. //depot/projects/xen3/src/sys/conf/options.i386-xen#2 edit .. //depot/projects/xen3/src/sys/dev/xen/console/console.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/conf/options.i386-xen#2 (text+ko) ==== @@ -32,8 +32,14 @@ # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h + +# support xen hypervisor. XEN opt_global.h +# support physical device access +XEN_PHYSDEV_ACCESS opt_global.h + + # Physical address extensions and support for >4G ram. As above. PAE opt_global.h ==== //depot/projects/xen3/src/sys/dev/xen/console/console.c#2 (text+ko) ==== @@ -16,11 +16,13 @@ #include #include #include +#include #include #include #include + #include "opt_ddb.h" #ifdef DDB #include @@ -39,12 +41,14 @@ static void xc_shutdown(void *arg, int howto); static int xc_mute; -void xcons_force_flush(void); +static void xcons_force_flush(void); +static void xencons_priv_interrupt(void *); static cn_probe_t xccnprobe; static cn_init_t xccninit; static cn_getc_t xccngetc; static cn_putc_t xccnputc; +static cn_putc_t xccnputc_dom0; static cn_checkc_t xccncheckc; #define XC_POLLTIME (hz/10) @@ -106,16 +110,16 @@ static void xccnprobe(struct consdev *cp) { - cp->cn_pri = CN_REMOTE; - cp->cn_tp = xccons; - sprintf(cp->cn_name, "%s0", driver_name); + cp->cn_pri = CN_REMOTE; + cp->cn_tp = xccons; + sprintf(cp->cn_name, "%s0", driver_name); } static void xccninit(struct consdev *cp) { - CN_LOCK_INIT(cn_mtx,"XCONS LOCK"); + CN_LOCK_INIT(cn_mtx,"XCONS LOCK"); } int @@ -140,16 +144,16 @@ int xccncheckc(struct consdev *dev) { - int ret = (xc_mute ? 0 : -1); - int flags; - CN_LOCK(cn_mtx, flags); - if ( (rp - rc) ){ - /* we need to return only one char */ - ret = (int)rbuf[RBUF_MASK(rc)]; - rc++; - } - CN_UNLOCK(cn_mtx, flags); - return(ret); + int ret = (xc_mute ? 0 : -1); + int flags; + CN_LOCK(cn_mtx, flags); + if ( (rp - rc) ){ + /* we need to return only one char */ + ret = (int)rbuf[RBUF_MASK(rc)]; + rc++; + } + CN_UNLOCK(cn_mtx, flags); + return(ret); } static void @@ -161,6 +165,12 @@ CN_UNLOCK(cn_mtx, flags); } +static void +xccnputc_dom0(struct consdev *dev, int c) +{ + HYPERVISOR_console_io(CONSOLEIO_write, 1, (char *)&c); +} + static boolean_t xcons_putc(int c) { @@ -213,32 +223,47 @@ static int xc_attach(device_t dev) { - struct xc_softc *sc = (struct xc_softc *)device_get_softc(dev); - TRACE_ENTER; + struct xc_softc *sc = (struct xc_softc *)device_get_softc(dev); + + + if (xen_start_info->flags & SIF_INITDOMAIN) { + xc_consdev.cn_putc = xccnputc_dom0; + } - sc->xc_dev = make_dev(&xc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "xc%r", 0); - xccons = ttymalloc(NULL); + sc->xc_dev = make_dev(&xc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "xc%r", 0); + xccons = ttymalloc(NULL); - sc->xc_dev->si_drv1 = (void *)sc; - sc->xc_dev->si_tty = xccons; + sc->xc_dev->si_drv1 = (void *)sc; + sc->xc_dev->si_tty = xccons; - xccons->t_oproc = xcstart; - xccons->t_param = xcparam; - xccons->t_stop = xcstop; - xccons->t_dev = sc->xc_dev; + xccons->t_oproc = xcstart; + xccons->t_param = xcparam; + xccons->t_stop = xcstop; + xccons->t_dev = sc->xc_dev; + + callout_init(&xc_callout, 0); - callout_init(&xc_callout, 0); + xencons_ring_init(); - xencons_ring_init(); + cnsl_evt_reg = 1; + callout_reset(&xc_callout, XC_POLLTIME, xc_timeout, xccons); + + if (xen_start_info->flags & SIF_INITDOMAIN) { + PANIC_IF(bind_virq_to_irqhandler( + VIRQ_CONSOLE, + 0, + "console", + xencons_priv_interrupt, + INTR_TYPE_TTY) < 0); + + } - cnsl_evt_reg = 1; - callout_reset(&xc_callout, XC_POLLTIME, xc_timeout, xccons); - /* register handler to flush console on shutdown */ - if ((EVENTHANDLER_REGISTER(shutdown_post_sync, xc_shutdown, - NULL, SHUTDOWN_PRI_DEFAULT)) == NULL) + /* register handler to flush console on shutdown */ + if ((EVENTHANDLER_REGISTER(shutdown_post_sync, xc_shutdown, + NULL, SHUTDOWN_PRI_DEFAULT)) == NULL) printf("xencons: shutdown event registration failed!\n"); - + TRACE_EXIT; return (0); } @@ -250,9 +275,7 @@ xc_shutdown(void *arg, int howto) { xc_mute = 1; -#ifdef notyet xcons_force_flush(); -#endif } void @@ -310,17 +333,20 @@ __xencons_tx_flush(); CN_UNLOCK(cn_mtx, flags); } -#ifdef nomore -static void -xencons_tx_flush_task_routine(void * data, int arg) + +static void +xencons_priv_interrupt(void *arg) { - int flags; - CN_LOCK(cn_mtx, flags); - xc_tx_task_queued = FALSE; - __xencons_tx_flush(); - CN_UNLOCK(cn_mtx, flags); + + static char rbuf[16]; + int l; + + while ((l = HYPERVISOR_console_io(CONSOLEIO_read, 16, rbuf)) > 0) + xencons_rx(rbuf, l); + + xencons_tx(); } -#endif + int xcopen(struct cdev *dev, int flag, int mode, struct thread *td) { @@ -484,59 +510,45 @@ static device_method_t xc_methods[] = { - DEVMETHOD(device_identify, xc_identify), - DEVMETHOD(device_probe, xc_probe), - DEVMETHOD(device_attach, xc_attach), - {0, 0} + DEVMETHOD(device_identify, xc_identify), + DEVMETHOD(device_probe, xc_probe), + DEVMETHOD(device_attach, xc_attach), + {0, 0} }; static driver_t xc_driver = { - driver_name, - xc_methods, - sizeof(struct xc_softc), + driver_name, + xc_methods, + sizeof(struct xc_softc), }; -#if 0 + /*** Forcibly flush console data before dying. ***/ void xcons_force_flush(void) { - int sz; + int sz; - /* - * We use dangerous control-interface functions that require a quiescent - * system and no interrupts. Try to ensure this with a global cli(). - */ - cli(); + if (xen_start_info->flags & SIF_INITDOMAIN) + return; - /* Spin until console data is flushed through to the domain controller. */ - while ( (wc != wp) && !ctrl_if_transmitter_empty() ) - { - /* Interrupts are disabled -- we must manually reap responses. */ - ctrl_if_discard_responses(); + /* Spin until console data is flushed through to the domain controller. */ + while (wc != wp) { + int sent = 0; + if ((sz = wp - wc) == 0) + continue; + + sent = xencons_ring_send(&wbuf[WBUF_MASK(wc)], sz); + if (sent > 0) + wc += sent; + } +} - if ( (sz = wp - wc) == 0 ) - continue; - if ( sz > sizeof(msg.msg) ) - sz = sizeof(msg.msg); - if ( sz > (WBUF_SIZE - WBUF_MASK(wc)) ) - sz = WBUF_SIZE - WBUF_MASK(wc); - - msg.type = CMSG_CONSOLE; - msg.subtype = CMSG_CONSOLE_DATA; - msg.length = sz; - memcpy(msg.msg, &wbuf[WBUF_MASK(wc)], sz); - - if ( ctrl_if_send_message_noblock(&msg, NULL, 0) == 0 ) - wc += sz; - } -} -#endif DRIVER_MODULE(xc, nexus, xc_driver, xc_devclass, 0, 0); /* * Local variables: * mode: C * c-set-style: "BSD" - * c-basic-offset: 4 + * c-basic-offset: 8 * tab-width: 4 * indent-tabs-mode: t * End: From owner-p4-projects@FreeBSD.ORG Fri Jan 6 05:10:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43B4916A422; Fri, 6 Jan 2006 05:10:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 060F016A41F for ; Fri, 6 Jan 2006 05:10:14 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0CCB43D45 for ; Fri, 6 Jan 2006 05:10:13 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k065ADPq079119 for ; Fri, 6 Jan 2006 05:10:13 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k065ADcB079116 for perforce@freebsd.org; Fri, 6 Jan 2006 05:10:13 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 05:10:13 GMT Message-Id: <200601060510.k065ADcB079116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 05:10:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=89255 Change 89255 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 05:09:40 ensure that pcb_cr3 always contains a physical address Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#2 (text+ko) ==== @@ -2417,9 +2417,9 @@ /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ #ifdef PAE - thread0.td_pcb->pcb_cr3 = (int)IdlePDPT; + thread0.td_pcb->pcb_cr3 = xpmap_mtop((int)IdlePDPT); #else - thread0.td_pcb->pcb_cr3 = (int)IdlePTD; + thread0.td_pcb->pcb_cr3 = xpmap_mtop((int)IdlePTD); #endif thread0.td_pcb->pcb_ext = 0; thread0.td_frame = &proc0_tf; From owner-p4-projects@FreeBSD.ORG Fri Jan 6 06:20:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B50916A42B; Fri, 6 Jan 2006 06:20:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D8AE016A429 for ; Fri, 6 Jan 2006 06:20:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D89D43D58 for ; Fri, 6 Jan 2006 06:20:11 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k066KBFQ082231 for ; Fri, 6 Jan 2006 06:20:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k066KB17082228 for perforce@freebsd.org; Fri, 6 Jan 2006 06:20:11 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 06:20:11 GMT Message-Id: <200601060620.k066KB17082228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 06:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=89256 Change 89256 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 06:19:12 add back in wall_cmos_clock sysctl to make complaining from adjkerntz go away Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#6 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#3 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#6 (text+ko) ==== @@ -109,6 +109,7 @@ #ifndef TIMER_FREQ #define TIMER_FREQ 1193182 #endif +int wall_cmos_clock; u_int timer_freq = TIMER_FREQ; struct mtx clock_lock; @@ -524,6 +525,7 @@ void inittodr(time_t base) { + unsigned long sec; int s, y; struct timespec ts; @@ -536,6 +538,8 @@ tc_setclock(&ts); } + sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + y = time_second - shadow_tv.tv_sec; if (y <= -2 || y >= 2) { /* badly off, adjust it */ ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#3 (text+ko) ==== @@ -1290,10 +1290,10 @@ SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo, CTLFLAG_RD, &bootinfo, bootinfo, ""); -#ifndef XEN + SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); -#endif + u_long bootdev; /* not a struct cdev *- encoding is different */ SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); From owner-p4-projects@FreeBSD.ORG Fri Jan 6 08:25:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD81916A422; Fri, 6 Jan 2006 08:25:22 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 65DC016A41F for ; Fri, 6 Jan 2006 08:25:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 077A043D45 for ; Fri, 6 Jan 2006 08:25:22 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k068PLUK086913 for ; Fri, 6 Jan 2006 08:25:21 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k068PJVV086910 for perforce@freebsd.org; Fri, 6 Jan 2006 08:25:19 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 08:25:19 GMT Message-Id: <200601060825.k068PJVV086910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 08:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=89259 Change 89259 by imp@imp_harmony on 2006/01/06 08:24:20 IFC @89258 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#11 integrate .. //depot/projects/arm/src/sys/conf/files#12 integrate .. //depot/projects/arm/src/sys/conf/options#11 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/arm/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/arm/src/sys/dev/ata/atapi-tape.h#3 integrate .. //depot/projects/arm/src/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#5 integrate .. //depot/projects/arm/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/arm/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/arm/src/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/arm/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/arm/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/arm/src/sys/dev/nmdm/nmdm.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/arm/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/arm/src/sys/dev/ti/if_tireg.h#4 integrate .. //depot/projects/arm/src/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/arm/src/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/arm/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/arm/src/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/arm/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/arm/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/arm/src/sys/kern/kern_conf.c#5 integrate .. //depot/projects/arm/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/arm/src/sys/kern/tty.c#5 integrate .. //depot/projects/arm/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/arm/src/sys/net/bpf_filter.c#3 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#6 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/arm/src/sys/net/if_mib.c#3 integrate .. //depot/projects/arm/src/sys/net/if_mib.h#2 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#5 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/arm/src/sys/sparc64/conf/NOTES#5 integrate .. //depot/projects/arm/src/sys/sys/tty.h#3 integrate .. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/arm/src/sys/vm/vm_pageq.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/bpf_jit_machdep.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.3 2005/12/06 07:22:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $"); #include "opt_bpf.h" @@ -103,6 +103,10 @@ */ emit_func emitm; + /* Do not compile an empty filter. */ + if (nins == 0) + return NULL; + /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); ==== //depot/projects/arm/src/sys/conf/NOTES#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1341 2005/12/31 14:39:19 netchild Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1343 2006/01/04 17:19:28 joel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1922,9 +1922,9 @@ # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # +# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_als4000: Avance Logic ALS4000 PCI. # snd_atiixp: ATI IXP 200/300/400 PCI. -# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_audiocs: Crystal Semiconductor CS4231 SBus/EBus. # snd_cmi: CMedia CMI8338/CMI8738 PCI. # snd_cs4281: Crystal Semiconductor CS4281 PCI. @@ -1984,7 +1984,6 @@ device snd_via8233 device snd_via82c686 device snd_vibes -#device snd_vortex1 device snd_uaudio # For non-pnp sound cards: ==== //depot/projects/arm/src/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1080 2005/12/29 01:43:46 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1081 2006/01/04 17:05:18 joel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -860,7 +860,6 @@ dev/sound/pci/via8233.c optional snd_via8233 pci dev/sound/pci/via82c686.c optional snd_via82c686 pci dev/sound/pci/vibes.c optional snd_vibes pci -#dev/sound/pci/vortex1.c optional snd_vortex1 pci dev/sound/pcm/ac97.c optional sound dev/sound/pcm/ac97_if.m optional sound dev/sound/pcm/ac97_patch.c optional sound ==== //depot/projects/arm/src/sys/conf/options#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.522 2005/12/31 14:39:19 netchild Exp $ +# $FreeBSD: src/sys/conf/options,v 1.523 2006/01/06 04:44:09 imp Exp $ # # On the handling of kernel options # ==== //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.51 2005/12/05 19:50:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.52 2006/01/03 20:19:34 jhb Exp $"); #include "opt_acpi.h" #include @@ -449,8 +449,10 @@ } } sc->pl_num_links = creq.count; - if (creq.count == 0) + if (creq.count == 0) { + ACPI_SERIAL_END(pci_link); return (0); + } sc->pl_links = malloc(sizeof(struct link) * sc->pl_num_links, M_PCI_LINK, M_WAITOK | M_ZERO); ==== //depot/projects/arm/src/sys/dev/ata/ata-all.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.260 2005/11/25 09:00:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.261 2006/01/05 21:27:18 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-all.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.109 2005/12/27 16:49:33 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.110 2006/01/05 21:27:19 sos Exp $ */ /* ATA register defines */ ==== //depot/projects/arm/src/sys/dev/ata/ata-card.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.38 2005/09/22 18:46:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.39 2006/01/05 21:27:19 sos Exp $"); #include #include ==== //depot/projects/arm/src/sys/dev/ata/ata-cbus.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 - 2005 Søren Schmidt + * Copyright (c) 2002 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.22 2005/04/30 16:22:06 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.23 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.146 2005/12/30 23:15:02 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.149 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include @@ -2920,7 +2918,8 @@ devid == ATA_I960RM) return ENXIO; - strcpy(buffer, idx->text); + strcpy(buffer, "Promise "); + strcat(buffer, idx->text); /* if we are on a FastTrak TX4, adjust the interrupt resource */ if ((idx->cfg2 & PRTX4) && pci_get_class(GRANDPARENT(dev))==PCIC_BRIDGE && @@ -2942,8 +2941,7 @@ start = end = 0; } } - sprintf(buffer, "Promise %s %s controller", - buffer, ata_mode2str(idx->max_dma)); + sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_promise_chipinit; @@ -2995,8 +2993,6 @@ break; case PRMIO: -// if (ctlr->r_res1) -// bus_release_resource(dev, ctlr->r_type1, ctlr->r_rid1,ctlr->r_res1); ctlr->r_type1 = SYS_RES_MEMORY; ctlr->r_rid1 = PCIR_BAR(4); if (!(ctlr->r_res1 = bus_alloc_resource_any(dev, ctlr->r_type1, @@ -3694,7 +3690,7 @@ struct ata_device *atadev = device_get_softc(dev); int devno = (ch->unit << 1) + ATA_DEV(atadev->unit); int error; - u_int32_t timings33[][2] = { + u_int32_t timings[][2] = { /* PROLD PRNEW mode */ { 0x004ff329, 0x004fff2f }, /* PIO 0 */ { 0x004fec25, 0x004ff82a }, /* PIO 1 */ @@ -3755,7 +3751,7 @@ if (!error) { if (ctlr->chip->cfg1 < PRTX) pci_write_config(gparent, 0x60 + (devno << 2), - timings33[ctlr->chip->cfg1][ata_mode2idx(mode)],4); + timings[ata_mode2idx(mode)][ctlr->chip->cfg1], 4); atadev->mode = mode; } return; ==== //depot/projects/arm/src/sys/dev/ata/ata-disk.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.191 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.192 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-disk.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.50 2005/03/30 12:03:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.51 2006/01/05 21:27:19 sos Exp $ */ /* structure describing an ATA disk */ ==== //depot/projects/arm/src/sys/dev/ata/ata-dma.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.140 2005/12/05 22:31:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.141 2006/01/05 21:27:19 sos Exp $"); #include #include ==== //depot/projects/arm/src/sys/dev/ata/ata-isa.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.29 2005/04/30 16:22:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.30 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.74 2005/12/05 22:31:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.75 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-pci.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.109 2005/12/27 18:22:11 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.110 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-pci.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 - 2005 Søren Schmidt + * Copyright (c) 2003 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.58 2005/12/27 17:09:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.59 2006/01/05 21:27:19 sos Exp $ */ /* structure holding chipset config info */ ==== //depot/projects/arm/src/sys/dev/ata/ata-queue.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.52 2005/12/27 16:49:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.53 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-raid.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2005 Søren Schmidt + * Copyright (c) 2000 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.114 2005/12/27 16:49:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.115 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/ata-raid.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2005 Søren Schmidt + * Copyright (c) 2000 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.41 2005/12/15 13:30:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.42 2006/01/05 21:27:19 sos Exp $ */ /* misc defines */ ==== //depot/projects/arm/src/sys/dev/ata/ata_if.m#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) 2004, 2005 Søren Schmidt +# Copyright (c) 2004 - 2006 Søren Schmidt # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -10,8 +10,6 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.5 2005/04/30 16:22:07 sos Exp $ +# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.6 2006/01/05 21:27:19 sos Exp $ #include #include ==== //depot/projects/arm/src/sys/dev/ata/atapi-cd.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.184 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.186 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include @@ -1513,7 +1511,7 @@ case DVD_STRUCT_COPYRIGHT: s->cpst = d->data[0]; - s->rmi = d->data[0]; + s->rmi = d->data[1]; break; case DVD_STRUCT_DISCKEY: ==== //depot/projects/arm/src/sys/dev/ata/atapi-cd.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.44 2005/03/30 12:03:38 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.h,v 1.45 2006/01/05 21:27:19 sos Exp $ */ /* CDROM Table Of Contents */ ==== //depot/projects/arm/src/sys/dev/ata/atapi-fd.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.103 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.104 2006/01/05 21:27:19 sos Exp $"); #include #include ==== //depot/projects/arm/src/sys/dev/ata/atapi-fd.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.24 2005/03/30 12:03:38 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.25 2006/01/05 21:27:19 sos Exp $ */ /* ATAPI Rewriteable drive Capabilities and Mechanical Status Page */ ==== //depot/projects/arm/src/sys/dev/ata/atapi-tape.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.100 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.101 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include ==== //depot/projects/arm/src/sys/dev/ata/atapi-tape.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt + * Copyright (c) 1998 - 2006 Søren Schmidt * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-tape.h,v 1.23 2005/03/30 12:03:38 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.h,v 1.24 2006/01/05 21:27:19 sos Exp $ */ /* ATAPI tape drive Capabilities and Mechanical Status Page */ ==== //depot/projects/arm/src/sys/dev/atkbdc/psm.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.87 2005/12/04 02:12:40 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/psm.c,v 1.88 2006/01/05 19:24:01 dumbbell Exp $"); #include "opt_isa.h" #include "opt_psm.h" @@ -2546,7 +2546,7 @@ /* Sanity check for out of sync packets. */ if ((pb->ipacket[0] & 0xc8) != 0x80 || (pb->ipacket[3] & 0xc8) != 0xc0) - continue; + goto NEXT; x = y = x0 = y0 = 0; @@ -2818,6 +2818,7 @@ } pb->inputbytes = 0; +NEXT: if (++sc->pqueue_start >= PSM_PACKETQUEUE) sc->pqueue_start = 0; } while (sc->pqueue_start != sc->pqueue_end); ==== //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.56 2005/12/31 01:45:40 avatar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.58 2006/01/03 03:36:17 imp Exp $"); /* * CIS Handling for the Cardbus Bus @@ -58,6 +58,8 @@ #define DPRINTF(a) if (cardbus_cis_debug) printf a #define DEVPRINTF(x) if (cardbus_cis_debug) device_printf x +#define CIS_CONFIG_SPACE (struct resource *)~0UL + static int decode_tuple_generic(device_t cbdev, device_t child, int id, int len, uint8_t *tupledata, uint32_t start, uint32_t *off, struct tuple_callbacks *info, void *); @@ -287,7 +289,7 @@ struct cardbus_devinfo *dinfo = device_get_ivars(child); int type; uint8_t reg; - uint32_t bar, pci_bar; + uint32_t bar; if (len != 6) { device_printf(cbdev, "CIS BAR length not 6 (%d)\n", len); @@ -296,11 +298,10 @@ reg = *tupledata; len = le32toh(*(uint32_t*)(tupledata + 2)); - if (reg & TPL_BAR_REG_AS) { + if (reg & TPL_BAR_REG_AS) type = SYS_RES_IOPORT; - } else { + else type = SYS_RES_MEMORY; - } bar = reg & TPL_BAR_REG_ASI_MASK; if (bar == 0) { @@ -342,37 +343,6 @@ #endif } - /* - * Sanity check the BAR length reported in the CIS with the length - * encoded in the PCI BAR. The latter seems to be more reliable. - * XXX - This probably belongs elsewhere. - */ - pci_write_config(child, bar, 0xffffffff, 4); - pci_bar = pci_read_config(child, bar, 4); - if ((pci_bar != 0x0) && (pci_bar != 0xffffffff)) { - if (type == SYS_RES_MEMORY) { - pci_bar &= ~0xf; - } else { - pci_bar &= ~0x3; - } - len = 1 << (ffs(pci_bar) - 1); - } - - DEVPRINTF((cbdev, "Opening BAR: type=%s, bar=%02x, len=%04x%s%s\n", - (type == SYS_RES_MEMORY) ? "MEM" : "IO", bar, len, - (type == SYS_RES_MEMORY && - dinfo->mprefetchable & (1 << PCI_RID2BAR(bar))) ? - " (Prefetchable)" : "", type == SYS_RES_MEMORY ? - ((dinfo->mbelow1mb & (1 << PCI_RID2BAR(bar))) ? - " (Below 1Mb)" : "") : "")); - - resource_list_add(&dinfo->pci.resources, type, bar, 0UL, ~0UL, len); - - /* - * Mark the appropriate bit in the PCI command register so that - * device drivers will know which type of BARs can be used. - */ - pci_enable_io(child, type); return (0); } @@ -453,21 +423,19 @@ uint32_t start, uint32_t *off, int *tupleid, int *len, uint8_t *tupledata) { - if (res == (struct resource*)~0UL) { + if (res == CIS_CONFIG_SPACE) return (cardbus_read_tuple_conf(cbdev, child, start, off, tupleid, len, tupledata)); - } else { - return (cardbus_read_tuple_mem(cbdev, res, start, off, - tupleid, len, tupledata)); - } + return (cardbus_read_tuple_mem(cbdev, res, start, off, tupleid, len, + tupledata)); } static void cardbus_read_tuple_finish(device_t cbdev, device_t child, int rid, struct resource *res) { - if (res != (struct resource*)~0UL) { - bus_release_resource(cbdev, SYS_RES_MEMORY, rid, res); + if (res != CIS_CONFIG_SPACE) { + bus_release_resource(child, SYS_RES_MEMORY, rid, res); if (rid == PCIM_CIS_ASI_ROM) pci_write_config(child, rid, pci_read_config(child, rid, 4) & ~PCIR_BIOS, 4); @@ -487,7 +455,7 @@ if (cardbus_cis_debug) device_printf(cbdev, "CIS in PCI config space\n"); /* CIS in PCI config space need no initialization */ - return ((struct resource*)~0UL); + return (CIS_CONFIG_SPACE); case PCIM_CIS_ASI_BAR0: case PCIM_CIS_ASI_BAR1: case PCIM_CIS_ASI_BAR2: @@ -510,15 +478,13 @@ } /* allocate the memory space to read CIS */ - res = bus_alloc_resource(cbdev, SYS_RES_MEMORY, rid, 0, ~0, 1, + res = bus_alloc_resource(child, SYS_RES_MEMORY, rid, 0, ~0, 1, rman_make_alignment_flags(4096) | RF_ACTIVE); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 6 13:35:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 685BF16A422; Fri, 6 Jan 2006 13:35:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 246BA16A41F for ; Fri, 6 Jan 2006 13:35:10 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6D7E43D48 for ; Fri, 6 Jan 2006 13:35:09 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06DZ9iO015938 for ; Fri, 6 Jan 2006 13:35:09 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06DZ7xe015935 for perforce@freebsd.org; Fri, 6 Jan 2006 13:35:07 GMT (envelope-from gnn@neville-neil.com) Date: Fri, 6 Jan 2006 13:35:07 GMT Message-Id: <200601061335.k06DZ7xe015935@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 89264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 13:35:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=89264 Change 89264 by gnn@fast_ipsec_integ on 2006/01/06 13:34:10 Updating from the main branch. Affected files ... .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/clock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/interrupt.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/alpha/trap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/identcpu.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/bcopyinout_xscale.S#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/intr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/fast_ipsec/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/i80321_timer.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ia32/ia32_signal.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/NOTES#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files#6 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.amd64#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.i386#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/files.pc98#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options#5 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.amd64#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.arm#2 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.i386#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/options.pc98#3 integrate .. //depot/projects/fast_ipsec/src/sys/conf/systags.sh#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/if_pfsync.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/README#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fb/vga.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/md/md.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nve/if_nve.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/nve/if_nvereg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/hostb_pci.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/pci/vga_pci.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/re/if_re.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/dev/rp/rp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sio/sio.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_udav.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ugraphire_rdesc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/fs/devfs/devfs_rule.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/fast_ipsec/src/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/fast_ipsec/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/fast_ipsec/src/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/fast_ipsec/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/frame.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/icu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/i386/isa/vesa.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/linux/linux_sysvec.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/init_sysent.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_clock.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_proc.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sig.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/kern_time.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/link_elf.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/Makefile#5 integrate .. //depot/projects/fast_ipsec/src/sys/modules/cardbus/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/drm/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/i2c/controllers/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/i2c/controllers/amdsmb/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/i2c/controllers/nfsmb/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/modules/if_gif/Makefile#4 integrate .. //depot/projects/fast_ipsec/src/sys/modules/netgraph/bpf/Makefile#2 integrate .. //depot/projects/fast_ipsec/src/sys/modules/ti/Makefile#3 integrate .. //depot/projects/fast_ipsec/src/sys/modules/xfs/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/net/bpf.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/bpf_jitter.c#1 branch .. //depot/projects/fast_ipsec/src/sys/net/bpf_jitter.h#1 branch .. //depot/projects/fast_ipsec/src/sys/net/bpfdesc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridge.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gif.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_gif.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_media.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_mib.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_mib.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_ppp.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/atm_sys.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netatm/uni/unisig_encode.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/netkey/key_debug.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/ppc.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/cbus/sio.c#5 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/conf/NOTES#5 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/include/_types.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/include/bus.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_amd64.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_i810.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_intel.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agpreg.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/pci/agpvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/pci/amdsmb.c#1 branch .. //depot/projects/fast_ipsec/src/sys/pci/if_de.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_devar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/pci/if_ti.c#4 delete .. //depot/projects/fast_ipsec/src/sys/pci/if_tireg.h#3 delete .. //depot/projects/fast_ipsec/src/sys/pci/nfsmb.c#1 branch .. //depot/projects/fast_ipsec/src/sys/pci/ti_fw.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pci/ti_fw2.h#2 delete .. //depot/projects/fast_ipsec/src/sys/pci/viapm.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/conf/Makefile#1 branch .. //depot/projects/fast_ipsec/src/sys/powerpc/conf/NOTES#1 branch .. //depot/projects/fast_ipsec/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/interrupt.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/fast_ipsec/src/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/ktr.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/ofw_upa.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/param.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/_lock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/_timeval.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/buf.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/condvar.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/copyright.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/elf32.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/elf64.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/elf_generic.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/kbio.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ktr.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/linker.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/lock.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/malloc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mount.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/mouse.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/param.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/pmc.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/resourcevar.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/signal.h#4 integrate .. //depot/projects/fast_ipsec/src/sys/sys/signalvar.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.h#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/syscall.mk#5 integrate .. //depot/projects/fast_ipsec/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/fast_ipsec/src/sys/sys/systm.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/sys/timers.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/tty.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/sys/vnode.h#3 integrate .. //depot/projects/fast_ipsec/src/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/memguard.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/memguard.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.c#4 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_page.h#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/fast_ipsec/src/sys/vm/vm_zeroidle.c#3 integrate Differences ... ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/clock.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.40 2005/11/20 01:31:29 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); #include "opt_clock.h" @@ -157,9 +157,9 @@ static u_int32_t max_cycles_per_tick; static u_int32_t last_time; -static void handleclock(void* arg); -static void -calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); +static void handleclock(int usermode, uintfptr_t pc); +static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, + u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); void @@ -230,8 +230,7 @@ */ /* - * Start the real-time and statistics clocks. Leave stathz 0 since there - * are no other timers available. + * Start the real-time and statistics clocks. */ void cpu_initclocks() @@ -275,7 +274,9 @@ */ if (hwrpb->rpb_type != ST_DEC_21000) { tc_init(&i8254_timecounter); - } + platform.clockintr = handleclock; + } else + platform.clockintr = hardclock; if (ncpus == 1) { alpha_timecounter.tc_frequency = freq; @@ -283,7 +284,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*)(void *)) handleclock; + profhz = hz; /* * Get the clock started. @@ -424,27 +425,23 @@ } static void -handleclock(void *arg) +handleclock(int usermode, uintfptr_t pc) { - /* - * XXX: TurboLaser doesn't have an i8254 counter. - * XXX: A replacement is needed, and another method - * XXX: of determining this would be nice. - */ - if (hwrpb->rpb_type != ST_DEC_21000) { - if (timecounter->tc_get_timecount == i8254_get_timecount) { - mtx_lock_spin(&clock_lock); - if (i8254_ticked) - i8254_ticked = 0; - else { - i8254_offset += timer0_max_count; - i8254_lastcount = 0; - } - clkintr_pending = 0; - mtx_unlock_spin(&clock_lock); + + KASSERT(hwrpb->rpb_type != ST_DEC_21000, + ("custom clock handler called on TurboLaser")); + if (timecounter->tc_get_timecount == i8254_get_timecount) { + mtx_lock_spin(&clock_lock); + if (i8254_ticked) + i8254_ticked = 0; + else { + i8254_offset += timer0_max_count; + i8254_lastcount = 0; } + clkintr_pending = 0; + mtx_unlock_spin(&clock_lock); } - hardclock(arg); + hardclock(usermode, pc); } void ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/fast_ipsec/src/sys/alpha/alpha/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.21 2005/12/26 21:23:56 sobomax Exp $"); #include #include @@ -85,6 +85,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,6 +100,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -121,7 +123,7 @@ Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 6 13:53:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88D5B16A422; Fri, 6 Jan 2006 13:53:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3DB8416A41F for ; Fri, 6 Jan 2006 13:53:35 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C10C843D45 for ; Fri, 6 Jan 2006 13:53:34 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06DrYPG016866 for ; Fri, 6 Jan 2006 13:53:34 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06DrWC9016863 for perforce@freebsd.org; Fri, 6 Jan 2006 13:53:32 GMT (envelope-from gnn@neville-neil.com) Date: Fri, 6 Jan 2006 13:53:32 GMT Message-Id: <200601061353.k06DrWC9016863@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 89266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 13:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=89266 Change 89266 by gnn@gnn_devbox_fast_ipsec on 2006/01/06 13:52:50 Integrate from the fast_ipsec integration branch. Affected files ... .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/_types.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/include/pmap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/local_apic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/ia32/ia32_signal.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/_types.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/frame.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/isa/atpic_vector.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/isa/icu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/bcopyinout_xscale.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/intr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/locore.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/_types.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/frame.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/arm/xscale/i80321/std.iq31244#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/load_elf_obj.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/common/reloc_elf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/ia32/ia32_signal.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/NOTES#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.amd64#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.i386#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/files.pc98#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.amd64#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.arm#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.i386#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/options.pc98#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/conf/systags.sh#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/if_pflog.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pf_norm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/contrib/pf/net/pfvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ddb/db_access.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/advlib.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/advansys/adwcam.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amrio.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bktr/bktr_card.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/cp/cpddk.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dc/if_dc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/README#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/esp/ncr53c9xvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fb/vga.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hptmv/mvOs.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_logging.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/md/md.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/my/if_my.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/nve/if_nvereg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/hostb_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/pci/vga_pci.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/immio.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ppc/ppc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rp/rp_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/syscons/scterm-dumb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/syscons/scterm-sc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_alpha.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_amd64.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_i386.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_ia64.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_cpu_pc98.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/uart/uart_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_cdce.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ugraphire_rdesc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/umass.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/usbdi.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/fs/smbfs/smbfs_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/nop/g_nop.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/nop/g_nop.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/apic_vector.s#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/_types.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/asmacros.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/frame.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/intr_machdep.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/pcpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/pmap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/atpic_vector.s#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/icu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/npx.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/pcvt/pcvt_hdr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i4b/layer2/i4b_l2timer.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/i4b/layer4/i4b_l4.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/_types.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_clock.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mbuf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_switch.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_synch.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_thread.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/kern_time.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/link_elf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_prof.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/syscalls.master#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_cluster.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/cardbus/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/drm/Makefile#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/i2c/controllers/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/i2c/controllers/amdsmb/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/i2c/controllers/nfsmb/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/netgraph/bpf/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/ti/Makefile#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/modules/xfs/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/net/bpf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/bpf_jitter.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/net/bpf_jitter.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/net/bpfdesc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridge.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gif.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_gif.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_media.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_mib.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_mib.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_ppp.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/_ieee80211.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_crypto_wep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/atm_sys.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netatm/uni/unisig_encode.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_bpf.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_source.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netgraph/ng_vjc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/in_proto.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/netkey/key_debug.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/clock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/fdc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/ppc.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/cbus/sio.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/_types.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/bus.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_ali.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_amd.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_amd64.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_ati.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_i810.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_intel.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_sis.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agp_via.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agpreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/agpvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/amdpm.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/amdsmb.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_de.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_devar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_ti.c#3 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/if_tireg.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/nfsmb.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/pci/ti_fw.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/ti_fw2.h#2 delete .. //depot/projects/gnn_fast_ipsec/src/sys/pci/viapm.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/conf/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/conf/NOTES#1 branch .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/clock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powermac/maciovar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/db_trace.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/interrupt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/machdep.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/rpc/rpcclnt.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/central/central.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/elf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/ktr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/ofw_upa.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/param.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/pci/psychoreg.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/_lock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/_timeval.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/buf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/condvar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/copyright.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/elf32.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/elf64.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/elf_common.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/elf_generic.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/kbio.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ktr.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/linker.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/lock.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/malloc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mbuf.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mount.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/mouse.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/param.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/pmc.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/resourcevar.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/signal.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/syscall.mk#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/sysproto.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/systm.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/timers.h#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/tty.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/sys/vnode.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/tools/vnode_if.awk#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/ufs/ufs/ufs_vfsops.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/memguard.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/memguard.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_contig.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_extern.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_fault.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_glue.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_map.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_page.h#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/gnn_fast_ipsec/src/sys/vm/vm_zeroidle.c#2 integrate Differences ... ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/clock.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.40 2005/11/20 01:31:29 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); #include "opt_clock.h" @@ -157,9 +157,9 @@ static u_int32_t max_cycles_per_tick; static u_int32_t last_time; -static void handleclock(void* arg); -static void -calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); +static void handleclock(int usermode, uintfptr_t pc); +static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, + u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); void @@ -230,8 +230,7 @@ */ /* - * Start the real-time and statistics clocks. Leave stathz 0 since there - * are no other timers available. + * Start the real-time and statistics clocks. */ void cpu_initclocks() @@ -275,7 +274,9 @@ */ if (hwrpb->rpb_type != ST_DEC_21000) { tc_init(&i8254_timecounter); - } + platform.clockintr = handleclock; + } else + platform.clockintr = hardclock; if (ncpus == 1) { alpha_timecounter.tc_frequency = freq; @@ -283,7 +284,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*)(void *)) handleclock; + profhz = hz; /* * Get the clock started. @@ -424,27 +425,23 @@ } static void -handleclock(void *arg) +handleclock(int usermode, uintfptr_t pc) { - /* - * XXX: TurboLaser doesn't have an i8254 counter. - * XXX: A replacement is needed, and another method - * XXX: of determining this would be nice. - */ - if (hwrpb->rpb_type != ST_DEC_21000) { - if (timecounter->tc_get_timecount == i8254_get_timecount) { - mtx_lock_spin(&clock_lock); - if (i8254_ticked) - i8254_ticked = 0; - else { - i8254_offset += timer0_max_count; - i8254_lastcount = 0; - } - clkintr_pending = 0; - mtx_unlock_spin(&clock_lock); + + KASSERT(hwrpb->rpb_type != ST_DEC_21000, + ("custom clock handler called on TurboLaser")); + if (timecounter->tc_get_timecount == i8254_get_timecount) { + mtx_lock_spin(&clock_lock); + if (i8254_ticked) + i8254_ticked = 0; + else { + i8254_offset += timer0_max_count; + i8254_lastcount = 0; } + clkintr_pending = 0; + mtx_unlock_spin(&clock_lock); } - hardclock(arg); + hardclock(usermode, pc); } void ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/gnn_fast_ipsec/src/sys/alpha/alpha/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.19 2004/08/11 02:35:04 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.21 2005/12/26 21:23:56 sobomax Exp $"); #include #include @@ -85,6 +85,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,6 +100,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -121,7 +123,7 @@ Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 6 14:20:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DD2B16A422; Fri, 6 Jan 2006 14:20:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CBF416A41F for ; Fri, 6 Jan 2006 14:20:08 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC02843D48 for ; Fri, 6 Jan 2006 14:20:07 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06EK7MP017887 for ; Fri, 6 Jan 2006 14:20:07 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06EK7w4017884 for perforce@freebsd.org; Fri, 6 Jan 2006 14:20:07 GMT (envelope-from gnn@neville-neil.com) Date: Fri, 6 Jan 2006 14:20:07 GMT Message-Id: <200601061420.k06EK7w4017884@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 89268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 14:20:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=89268 Change 89268 by gnn@fast_ipsec_integ on 2006/01/06 14:19:35 Add libipsec to the branch. Affected files ... .. //depot/projects/fast_ipsec/src/lib/libipsec/Makefile#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_dump_policy.c#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_get_policylen.c#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_set_policy.3#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_strerror.3#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_strerror.c#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/ipsec_strerror.h#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/libpfkey.h#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/pfkey.c#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/pfkey_dump.c#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/policy_parse.y#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/policy_token.l#1 branch .. //depot/projects/fast_ipsec/src/lib/libipsec/test-policy.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 6 14:21:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE17F16A422; Fri, 6 Jan 2006 14:21:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A147216A41F for ; Fri, 6 Jan 2006 14:21:09 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64A6F43D48 for ; Fri, 6 Jan 2006 14:21:09 +0000 (GMT) (envelope-from gnn@neville-neil.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06EL9lI017976 for ; Fri, 6 Jan 2006 14:21:09 GMT (envelope-from gnn@neville-neil.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06EL9uq017973 for perforce@freebsd.org; Fri, 6 Jan 2006 14:21:09 GMT (envelope-from gnn@neville-neil.com) Date: Fri, 6 Jan 2006 14:21:09 GMT Message-Id: <200601061421.k06EL9uq017973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gnn@neville-neil.com using -f From: "George V. Neville-Neil" To: Perforce Change Reviews Cc: Subject: PERFORCE change 89269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 14:21:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=89269 Change 89269 by gnn@gnn_devbox_fast_ipsec on 2006/01/06 14:21:06 Add libipsec to my own branch. Affected files ... .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/Makefile#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_dump_policy.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_get_policylen.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_set_policy.3#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_strerror.3#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_strerror.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/ipsec_strerror.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/libpfkey.h#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/pfkey.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/pfkey_dump.c#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/policy_parse.y#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/policy_token.l#1 branch .. //depot/projects/gnn_fast_ipsec/src/lib/libipsec/test-policy.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 6 17:18:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CEF916A422; Fri, 6 Jan 2006 17:18:49 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4356B16A41F for ; Fri, 6 Jan 2006 17:18:49 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E898E43D46 for ; Fri, 6 Jan 2006 17:18:48 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06HImKM032291 for ; Fri, 6 Jan 2006 17:18:48 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06HImbR032288 for perforce@freebsd.org; Fri, 6 Jan 2006 17:18:48 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 17:18:48 GMT Message-Id: <200601061718.k06HImbR032288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 17:18:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=89275 Change 89275 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 17:17:52 update copyright remove dead code Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#4 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2004-2005 Kip Macy + * Copyright (c) 2004-2006 Kip Macy * All rights reserved. * * @@ -16,8 +16,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_nfsroot.h" - #include #include #include @@ -124,34 +122,6 @@ struct mbuf *xn_rx_chain[NET_RX_RING_SIZE+1]; }; -struct xn_softc { - struct arpcom arpcom; /* interface info */ - device_t xn_dev; - SLIST_ENTRY(xn_softc) xn_links; - void *xn_intrhand; - struct resource *xn_res; - u_int8_t xn_ifno; /* interface number */ - - int xn_txcnt; - int xn_rxbufcnt; - unsigned int xn_irq; - unsigned int xn_evtchn; - - - /* What is the status of our connection to the remote backend? */ -#define BEST_CLOSED 0 -#define BEST_DISCONNECTED 1 -#define BEST_CONNECTED 2 - unsigned int xn_backend_state; - - /* Is this interface open or closed (down or up)? */ -#define UST_CLOSED 0 -#define UST_OPEN 1 - unsigned int xn_user_state; - - int xn_rx_target; /* number to allocate */ - -}; static unsigned long rx_pfn_array[NET_RX_RING_SIZE]; static multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1]; @@ -1459,15 +1429,7 @@ static void netif_disconnect_backend(struct netfront_info *info) { -#if 0 - /* Stop old i/f to prevent errors whilst we rebuild the state. */ - mtx_lock_spin(&info->tx_lock); - mtx_lock(&info->rx_lock); - netif_stop_queue(info->netdev); - /* info->backend_state = BEST_DISCONNECTED; */ - mtx_unlock(&info->rx_lock); - mtx_unlock_spin(&info->tx_lock); -#endif + xn_stop(info); end_access(info->tx_ring_ref, info->tx.sring); end_access(info->rx_ring_ref, info->rx.sring); info->tx_ring_ref = GRANT_INVALID_REF; @@ -1510,28 +1472,14 @@ .otherend_changed = backend_changed, }; -#if 0 -static struct notifier_block notifier_inetdev = { - .notifier_call = inetdev_notify, - .next = NULL, - .priority = 0 -}; -#endif - static void netif_init(void *unused) { if (xen_start_info->flags & SIF_INITDOMAIN) return; -#if 0 - if ((err = xennet_proc_init()) != 0) - return err; -#endif + IPRINTK("Initialising virtual ethernet driver.\n"); -#if 0 - (void)register_inetaddr_notifier(¬ifier_inetdev); -#endif xenbus_register_frontend(&netfront); From owner-p4-projects@FreeBSD.ORG Fri Jan 6 18:44:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91B8316A422; Fri, 6 Jan 2006 18:44:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35ED116A41F for ; Fri, 6 Jan 2006 18:44:35 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC7FA43D45 for ; Fri, 6 Jan 2006 18:44:34 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06IiYVj036888 for ; Fri, 6 Jan 2006 18:44:34 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06IiYvP036885 for perforce@freebsd.org; Fri, 6 Jan 2006 18:44:34 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 18:44:34 GMT Message-Id: <200601061844.k06IiYvP036885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 18:44:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=89280 Change 89280 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 18:43:53 cleanups: style cleanup for console.c and add in missed SIF_INITDOMAIN case remove unnecessary xen-ism in segments.h Affected files ... .. //depot/projects/xen3/src/sys/dev/xen/console/console.c#3 edit .. //depot/projects/xen3/src/sys/i386/include/segments.h#3 edit Differences ... ==== //depot/projects/xen3/src/sys/dev/xen/console/console.c#3 (text+ko) ==== @@ -137,7 +137,7 @@ tsleep(&cn_mtx, PWAIT | PCATCH, "console sleep", XC_POLLTIME); } - } while( c == -1 ); + } while(c == -1); return c; } @@ -147,7 +147,7 @@ int ret = (xc_mute ? 0 : -1); int flags; CN_LOCK(cn_mtx, flags); - if ( (rp - rc) ){ + if ((rp - rc)) { /* we need to return only one char */ ret = (int)rbuf[RBUF_MASK(rc)]; rc++; @@ -182,8 +182,8 @@ * flush */ - if ( (wp-wc) < (WBUF_SIZE-1) ){ - if ( (wbuf[WBUF_MASK(wp++)] = c) == '\n' ) { + if ((wp-wc) < (WBUF_SIZE-1)) { + if ((wbuf[WBUF_MASK(wp++)] = c) == '\n') { wbuf[WBUF_MASK(wp++)] = '\r'; #ifdef notyet if (force_flush) @@ -286,7 +286,7 @@ CN_LOCK(cn_mtx, flags); for (i = 0; i < len; i++) { - if ( xen_console_up) + if (xen_console_up) (*linesw[tp->t_line]->l_rint)(buf[i], tp); else rbuf[RBUF_MASK(rp++)] = buf[i]; @@ -298,31 +298,25 @@ __xencons_tx_flush(void) { int sz, work_done = 0; - TRACE_ENTER; -#ifdef notyet - while (x_char) { - if (xencons_ring_send(&x_char, 1) == 1) { - x_char = 0; - work_done = 1; - } - } -#endif - while ( wc != wp ) { + while (wc != wp) { int sent; sz = wp - wc; - if ( sz > (WBUF_SIZE - WBUF_MASK(wc)) ) + if (sz > (WBUF_SIZE - WBUF_MASK(wc))) sz = WBUF_SIZE - WBUF_MASK(wc); - sent = xencons_ring_send(&wbuf[WBUF_MASK(wc)], sz); - if (sent == 0) - break; - wc += sent; + if (xen_start_info->flags & SIF_INITDOMAIN) { + HYPERVISOR_console_io(CONSOLEIO_write, sz, &wbuf[WBUF_MASK(wc)]); + wc += sz; + } else { + sent = xencons_ring_send(&wbuf[WBUF_MASK(wc)], sz); + if (sent == 0) + break; + wc += sent; + } work_done = 1; - } - if ( work_done && xen_console_up ) + if (work_done && xen_console_up) ttwakeup(xccons); - TRACE_EXIT; } void @@ -425,7 +419,7 @@ __xencons_put_char(int ch) { char _ch = (char)ch; - if ( (wp - wc) == WBUF_SIZE ) + if ((wp - wc) == WBUF_SIZE) return 0; wbuf[WBUF_MASK(wp++)] = _ch; return 1; ==== //depot/projects/xen3/src/sys/i386/include/segments.h#3 (text+ko) ==== @@ -210,13 +210,8 @@ #define GPRIV_SEL 1 /* SMP Per-Processor Private Data */ #define GUFS_SEL 2 /* User %fs Descriptor (order critical: 1) */ #define GUGS_SEL 3 /* User %gs Descriptor (order critical: 2) */ -#ifdef XEN -#define GCODE_SEL (__KERNEL_CS >> 3) /* Kernel Code Descriptor (order critical: 1) */ -#define GDATA_SEL (__KERNEL_DS >> 3) /* Kernel Data Descriptor (order critical: 2) */ -#else #define GCODE_SEL 4 /* Kernel Code Descriptor (order critical: 1) */ #define GDATA_SEL 5 /* Kernel Data Descriptor (order critical: 2) */ -#endif #define GUCODE_SEL 6 /* User Code Descriptor (order critical: 3) */ #define GUDATA_SEL 7 /* User Data Descriptor (order critical: 4) */ #define GBIOSLOWMEM_SEL 8 /* BIOS low memory access (must be entry 8) */ From owner-p4-projects@FreeBSD.ORG Fri Jan 6 18:48:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3927716A422; Fri, 6 Jan 2006 18:48:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0B6CE16A41F for ; Fri, 6 Jan 2006 18:48:41 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FA3F43D49 for ; Fri, 6 Jan 2006 18:48:40 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06ImePS037069 for ; Fri, 6 Jan 2006 18:48:40 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06Imedr037066 for perforce@freebsd.org; Fri, 6 Jan 2006 18:48:40 GMT (envelope-from kmacy@freebsd.org) Date: Fri, 6 Jan 2006 18:48:40 GMT Message-Id: <200601061848.k06Imedr037066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 18:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=89281 Change 89281 by kmacy@kmacy:freebsd7_xen3 on 2006/01/06 18:48:06 add dom0 support to clock driver still confused between setting time of day and rtc add in new option for setting hardware rtc Affected files ... .. //depot/projects/xen3/src/sys/conf/options.i386-xen#3 edit .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#7 edit Differences ... ==== //depot/projects/xen3/src/sys/conf/options.i386-xen#3 (text+ko) ==== @@ -39,6 +39,10 @@ # support physical device access XEN_PHYSDEV_ACCESS opt_global.h +# unclear how this differs from the being PHYSDEV_ACCESS + INITDOMAIN but +# stay consistent with mainline for now +XEN_PRIVILEGED_GUEST opt_global.h + # Physical address extensions and support for >4G ram. As above. PAE opt_global.h ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/clock.c#7 (text+ko) ==== @@ -44,16 +44,7 @@ * Routines to handle clock hardware. */ -/* - * inittodr, settodr and support routines written - * by Christoph Robitschko - * - * reintroduced and updated by Chris Stenton 8/10/94 - */ - #include "opt_clock.h" -#include "opt_isa.h" -#include "opt_mca.h" #include #include @@ -110,6 +101,7 @@ #define TIMER_FREQ 1193182 #endif int wall_cmos_clock; +int independent_wallclock; u_int timer_freq = TIMER_FREQ; struct mtx clock_lock; @@ -134,7 +126,10 @@ uint32_t shadow_tv_version; +SYSCTL_INT(_machdep, OID_AUTO, independent_wallclock, + CTLFLAG_RW, &independent_wallclock, 0, ""); + #define do_div(n,base) ({ \ unsigned long __upper, __low, __high, __mod, __base; \ __base = (base); \ @@ -518,6 +513,7 @@ rdtscll(alarm); } +#ifdef XEN_PRIVILEGED_GUEST /* * Initialize the time of day register, based on the time base which is, e.g. * from a filesystem. @@ -525,6 +521,143 @@ void inittodr(time_t base) { + unsigned long sec, days; + int year, month; + int y, m, s; + struct timespec ts; + + if (base) { + s = splclock(); + ts.tv_sec = base; + ts.tv_nsec = 0; + tc_setclock(&ts); + splx(s); + } + + /* Look if we have a RTC present and the time is valid */ + if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) + goto wrong_time; + + /* wait for time update to complete */ + /* If RTCSA_TUP is zero, we have at least 244us before next update */ + s = splhigh(); + while (rtcin(RTC_STATUSA) & RTCSA_TUP) { + splx(s); + s = splhigh(); + } + + days = 0; +#ifdef USE_RTC_CENTURY + year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; +#else + year = readrtc(RTC_YEAR) + 1900; + if (year < 1970) + year += 100; +#endif + if (year < 1970) { + splx(s); + goto wrong_time; + } + month = readrtc(RTC_MONTH); + for (m = 1; m < month; m++) + days += daysinmonth[m-1]; + if ((month > 2) && LEAPYEAR(year)) + days ++; + days += readrtc(RTC_DAY) - 1; + for (y = 1970; y < year; y++) + days += DAYSPERYEAR + LEAPYEAR(y); + sec = ((( days * 24 + + readrtc(RTC_HRS)) * 60 + + readrtc(RTC_MIN)) * 60 + + readrtc(RTC_SEC)); + /* sec now contains the number of seconds, since Jan 1 1970, + in the local time zone */ + + sec += tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + + y = time_second - sec; + if (y <= -2 || y >= 2) { + /* badly off, adjust it */ + ts.tv_sec = sec; + ts.tv_nsec = 0; + tc_setclock(&ts); + } + splx(s); + return; + +wrong_time: + printf("Invalid time in real time clock.\n"); + printf("Check and reset the date immediately!\n"); +} + + + +/* + * Write system time back to RTC + */ +void +resettodr() +{ + unsigned long tm; + int y, m, s; + + if (disable_rtc_set) + return; + + s = splclock(); + tm = time_second; + splx(s); + + /* Disable RTC updates and interrupts. */ + writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); + + /* Calculate local time to put in RTC */ + + tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + + writertc(RTC_SEC, bin2bcd(tm%60)); tm /= 60; /* Write back Seconds */ + writertc(RTC_MIN, bin2bcd(tm%60)); tm /= 60; /* Write back Minutes */ + writertc(RTC_HRS, bin2bcd(tm%24)); tm /= 24; /* Write back Hours */ + + /* We have now the days since 01-01-1970 in tm */ + writertc(RTC_WDAY, (tm + 4) % 7 + 1); /* Write back Weekday */ + for (y = 1970, m = DAYSPERYEAR + LEAPYEAR(y); + tm >= m; + y++, m = DAYSPERYEAR + LEAPYEAR(y)) + tm -= m; + + /* Now we have the years in y and the day-of-the-year in tm */ + writertc(RTC_YEAR, bin2bcd(y%100)); /* Write back Year */ +#ifdef USE_RTC_CENTURY + writertc(RTC_CENTURY, bin2bcd(y/100)); /* ... and Century */ +#endif + for (m = 0; ; m++) { + int ml; + + ml = daysinmonth[m]; + if (m == 1 && LEAPYEAR(y)) + ml++; + if (tm < ml) + break; + tm -= ml; + } + + writertc(RTC_MONTH, bin2bcd(m + 1)); /* Write back Month */ + writertc(RTC_DAY, bin2bcd(tm + 1)); /* Write back Month Day */ + + /* Reenable RTC updates and interrupts. */ + writertc(RTC_STATUSB, rtc_statusb); + rtcin(RTC_INTR); +} + +#else +/* + * Initialize the time of day register, based on the time base which is, e.g. + * from a filesystem. + */ +void +inittodr(time_t base) +{ unsigned long sec; int s, y; struct timespec ts; @@ -549,13 +682,41 @@ } /* - * Write system time back to RTC. Not supported for guest domains. + * Write system time back to RTC. */ void resettodr() { + unsigned long tm; + int s; + dom0_op_t op; + struct shadow_time_info *shadow; + + shadow = &per_cpu(shadow_time, smp_processor_id()); + if (disable_rtc_set) + return; + + s = splclock(); + tm = time_second; + splx(s); + + tm -= tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); + + if ((xen_start_info->flags & SIF_INITDOMAIN) && + !independent_wallclock) + { + op.cmd = DOM0_SETTIME; + op.u.settime.secs = tm; + op.u.settime.nsecs = 0; + op.u.settime.system_time = shadow->system_timestamp; + HYPERVISOR_dom0_op(&op); + update_wallclock(); + } else if (independent_wallclock) { + /* notyet */ + ; + } } - +#endif /* * Start clocks running. From owner-p4-projects@FreeBSD.ORG Fri Jan 6 20:21:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFF7D16A423; Fri, 6 Jan 2006 20:21:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B63FD16A420 for ; Fri, 6 Jan 2006 20:21:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 510A643D46 for ; Fri, 6 Jan 2006 20:21:58 +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 k06KLwi1041421 for ; Fri, 6 Jan 2006 20:21:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06KLujL041410 for perforce@freebsd.org; Fri, 6 Jan 2006 20:21:56 GMT (envelope-from jhb@freebsd.org) Date: Fri, 6 Jan 2006 20:21:56 GMT Message-Id: <200601062021.k06KLujL041410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 89290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 20:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=89290 Change 89290 by jhb@jhb_slimer on 2006/01/06 20:21:45 IFC @89285. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/clock.c#18 integrate .. //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#16 integrate .. //depot/projects/smpng/sys/alpha/alpha/interrupt.c#37 integrate .. //depot/projects/smpng/sys/alpha/include/_types.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/alpha/include/cpuconf.h#5 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#24 integrate .. //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/db_trace.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#16 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#31 integrate .. //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#40 integrate .. //depot/projects/smpng/sys/amd64/include/_types.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/clock.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/cpu.h#7 integrate .. //depot/projects/smpng/sys/amd64/include/frame.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#12 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#14 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#6 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#5 integrate .. //depot/projects/smpng/sys/arm/include/frame.h#4 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#25 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#61 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#27 integrate .. //depot/projects/smpng/sys/conf/NOTES#111 integrate .. //depot/projects/smpng/sys/conf/files#162 integrate .. //depot/projects/smpng/sys/conf/options#111 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#20 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#15 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.h#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_htable.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_irc_pxy.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_lookup.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_lookup.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#14 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pool.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pool.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#12 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.h#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_scan.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#13 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#22 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf_norm.c#11 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pfvar.h#10 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#54 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#34 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#21 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#77 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#41 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#16 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#61 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#54 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#17 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#48 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#33 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#59 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#43 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#25 integrate .. //depot/projects/smpng/sys/dev/ata/ata_if.m#3 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#60 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#16 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#10 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#67 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#36 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#28 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#26 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_device.c#1 branch .. //depot/projects/smpng/sys/dev/cardbus/cardbusvar.h#11 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/smpng/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#61 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#37 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#71 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#11 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#6 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#11 integrate .. //depot/projects/smpng/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/smpng/sys/dev/md/md.c#71 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#41 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#54 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#12 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#67 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#14 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#7 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#17 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/si/si.c#21 integrate .. //depot/projects/smpng/sys/dev/si/si3_t225.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#25 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#34 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#11 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/smpng/sys/dev/ti/if_tireg.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_cdce.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#27 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#82 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#15 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#23 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#24 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#16 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#12 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#11 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_var.h#10 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#9 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#32 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#41 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#101 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#96 integrate .. //depot/projects/smpng/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#27 integrate .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#45 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#90 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#9 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#10 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#18 integrate .. //depot/projects/smpng/sys/i386/include/clock.h#12 integrate .. //depot/projects/smpng/sys/i386/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/i386/include/frame.h#7 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#14 integrate .. //depot/projects/smpng/sys/i386/include/pcpu.h#14 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#20 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#47 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#18 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#49 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#29 integrate .. //depot/projects/smpng/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#34 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#99 integrate .. //depot/projects/smpng/sys/ia64/ia64/ssc.c#17 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#25 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#28 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#51 integrate .. //depot/projects/smpng/sys/kern/imgact_gzip.c#13 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#88 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#107 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#115 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#82 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#116 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#62 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#96 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#64 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#7 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#147 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#43 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#47 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#64 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#66 integrate .. //depot/projects/smpng/sys/kern/tty.c#63 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#66 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#87 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#116 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#95 integrate .. //depot/projects/smpng/sys/modules/Makefile#113 integrate .. //depot/projects/smpng/sys/modules/cardbus/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf_filter.c#9 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#20 integrate .. //depot/projects/smpng/sys/net/if_bridgevar.h#7 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#68 integrate .. //depot/projects/smpng/sys/net/if_gif.c#31 integrate .. //depot/projects/smpng/sys/net/if_gif.h#12 integrate .. //depot/projects/smpng/sys/net/if_media.c#7 integrate .. //depot/projects/smpng/sys/net/if_mib.c#9 integrate .. //depot/projects/smpng/sys/net/if_mib.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#18 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#23 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#17 integrate .. //depot/projects/smpng/sys/netatm/atm_sys.h#6 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.h#7 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#17 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#23 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#56 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#50 integrate .. //depot/projects/smpng/sys/pc98/include/_types.h#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/smpng/sys/pci/if_de.c#32 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/smpng/sys/powerpc/include/clock.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/cpu.h#18 integrate .. //depot/projects/smpng/sys/powerpc/include/frame.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/profile.h#6 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcib_pci.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#16 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#14 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/interrupt.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#66 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#14 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#38 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#62 integrate .. //depot/projects/smpng/sys/sparc64/conf/NOTES#20 integrate .. //depot/projects/smpng/sys/sparc64/include/cpu.h#15 integrate .. //depot/projects/smpng/sys/sparc64/include/frame.h#13 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#62 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#16 integrate .. //depot/projects/smpng/sys/sys/_lock.h#13 integrate .. //depot/projects/smpng/sys/sys/_timeval.h#2 integrate .. //depot/projects/smpng/sys/sys/copyright.h#8 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#10 integrate .. //depot/projects/smpng/sys/sys/ktrace.h#13 integrate .. //depot/projects/smpng/sys/sys/lock.h#35 integrate .. //depot/projects/smpng/sys/sys/malloc.h#24 integrate .. //depot/projects/smpng/sys/sys/param.h#94 integrate .. //depot/projects/smpng/sys/sys/syscall.h#63 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#63 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#65 integrate .. //depot/projects/smpng/sys/sys/systm.h#69 integrate .. //depot/projects/smpng/sys/sys/tty.h#20 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#53 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#50 integrate .. //depot/projects/smpng/sys/vm/memguard.c#3 integrate .. //depot/projects/smpng/sys/vm/memguard.h#3 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#33 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#74 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#69 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#31 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#55 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#27 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.41 2005/12/14 21:42:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.42 2005/12/22 22:16:04 jhb Exp $"); #include "opt_clock.h" @@ -157,7 +157,7 @@ static u_int32_t max_cycles_per_tick; static u_int32_t last_time; -static void handleclock(void* arg); +static void handleclock(int usermode, uintfptr_t pc); static void calibrate_clocks(u_int32_t firmware_freq, u_int32_t *pcc, u_int32_t *timer); static void set_timer_freq(u_int freq, int intr_freq); @@ -230,8 +230,7 @@ */ /* - * Start the real-time and statistics clocks. Leave stathz 0 since there - * are no other timers available. + * Start the real-time and statistics clocks. */ void cpu_initclocks() @@ -275,7 +274,9 @@ */ if (hwrpb->rpb_type != ST_DEC_21000) { tc_init(&i8254_timecounter); - } + platform.clockintr = handleclock; + } else + platform.clockintr = hardclock; if (ncpus == 1) { alpha_timecounter.tc_frequency = freq; @@ -283,7 +284,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*)(void *)) handleclock; + profhz = hz; /* * Get the clock started. @@ -424,27 +425,23 @@ } static void -handleclock(void *arg) +handleclock(int usermode, uintfptr_t pc) { - /* - * XXX: TurboLaser doesn't have an i8254 counter. - * XXX: A replacement is needed, and another method - * XXX: of determining this would be nice. - */ - if (hwrpb->rpb_type != ST_DEC_21000) { - if (timecounter->tc_get_timecount == i8254_get_timecount) { - mtx_lock_spin(&clock_lock); - if (i8254_ticked) - i8254_ticked = 0; - else { - i8254_offset += timer0_max_count; - i8254_lastcount = 0; - } - clkintr_pending = 0; - mtx_unlock_spin(&clock_lock); + + KASSERT(hwrpb->rpb_type != ST_DEC_21000, + ("custom clock handler called on TurboLaser")); + if (timecounter->tc_get_timecount == i8254_get_timecount) { + mtx_lock_spin(&clock_lock); + if (i8254_ticked) + i8254_ticked = 0; + else { + i8254_offset += timer0_max_count; + i8254_lastcount = 0; } + clkintr_pending = 0; + mtx_unlock_spin(&clock_lock); } - hardclock(arg); + hardclock(usermode, pc); } void ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.18 2005/01/05 20:05:48 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.19 2005/12/31 14:39:18 netchild Exp $"); #include "opt_cpu.h" @@ -171,6 +171,13 @@ }; int napi_cpuinit = (sizeof(api_cpuinit) / sizeof(api_cpuinit[0])); +void setPQL2(int *const size, int *const ways); + +void +setPQL2(int *const size, int *const ways) +{ + return; +} void platform_not_configured(int cputype) ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.20 2005/12/18 04:52:34 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.21 2005/12/26 21:23:56 sobomax Exp $"); #include #include @@ -85,6 +85,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,6 +100,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#37 (text+ko) ==== @@ -33,7 +33,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.88 2005/10/25 19:48:45 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.89 2005/12/22 22:16:04 jhb Exp $"); #include #include @@ -489,23 +489,21 @@ */ if (PCPU_GET(cpuid) == 0) { #endif - (*platform.clockintr)(framep); - /* divide hz (1024) by 8 to get stathz (128) */ - if ((++schedclk2 & 0x7) == 0) { - if (profprocs != 0) - profclock((struct clockframe *)framep); - statclock((struct clockframe *)framep); - } + (*platform.clockintr)(TRAPF_USERMODE(framep), + TRAPF_PC(framep)); + + /* Bump stathz divider. */ + schedclk2++; #ifdef SMP - } else { - hardclock_process((struct clockframe *)framep); - if ((schedclk2 & 0x7) == 0) { - if (profprocs != 0) - profclock((struct clockframe *)framep); - statclock((struct clockframe *)framep); - } - } + } else + hardclock_cpu(TRAPF_USERMODE(framep)); #endif + if (profprocs != 0) + profclock(TRAPF_USERMODE(framep), TRAPF_PC(framep)); + + /* divide hz (1024) by 8 to get stathz (128) */ + if ((schedclk2 & 0x7) == 0) + statclock(TRAPF_USERMODE(framep)); critical_exit(); } } ==== //depot/projects/smpng/sys/alpha/include/_types.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.6 2005/03/02 21:33:20 joerg Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __PCI_REROUTE_INTERRUPT + /* * Basic types upon which most other types are built. */ ==== //depot/projects/smpng/sys/alpha/include/cpu.h#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.42 2005/01/05 20:05:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.43 2005/12/22 22:16:04 jhb Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /*- @@ -48,21 +48,10 @@ #include -/* - * Arguments to hardclock and gatherstats encapsulate the previous - * machine state in an opaque clockframe. One the Alpha, we use - * what we push on an interrupt (a trapframe). - */ -struct clockframe { - struct trapframe cf_tf; -}; #define TRAPF_USERMODE(framep) \ (((framep)->tf_regs[FRAME_PS] & ALPHA_PSL_USERMODE) != 0) #define TRAPF_PC(framep) ((framep)->tf_regs[FRAME_PC]) -#define CLKF_USERMODE(framep) TRAPF_USERMODE(&(framep)->cf_tf) -#define CLKF_PC(framep) TRAPF_PC(&(framep)->cf_tf) - /* * CTL_MACHDEP definitions. */ ==== //depot/projects/smpng/sys/alpha/include/cpuconf.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.14 2005/01/31 23:07:42 ticso Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpuconf.h,v 1.15 2005/12/22 22:16:04 jhb Exp $ */ /* $NetBSD: cpuconf.h,v 1.7 1997/11/06 00:42:03 thorpej Exp $ */ #ifndef _ALPHA_CPUCONF_H #define _ALPHA_CPUCONF_H @@ -68,7 +68,7 @@ void (*cons_init)(void); void (*device_register)(struct device *, void *); void (*iointr)(void *, unsigned long); - void (*clockintr)(void *); + void (*clockintr)(int, uintfptr_t); void (*mcheck_handler)(unsigned long, struct trapframe *, unsigned long, unsigned long); void (*cpu_idle)(void); ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#24 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.97 2005/12/15 16:30:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.98 2005/12/26 21:23:56 sobomax Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -206,6 +206,7 @@ "/lib/ld-linux.so.1", &elf_linux_sysvec, NULL, + BI_CAN_EXEC_DYN, }; static Elf64_Brandinfo linux_glibc2brand = { @@ -216,6 +217,7 @@ "/lib/ld-linux.so.2", &elf_linux_sysvec, NULL, + BI_CAN_EXEC_DYN, }; Elf64_Brandinfo *linux_brandlist[] = { ==== //depot/projects/smpng/sys/amd64/amd64/bpf_jit_machdep.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.3 2005/12/06 07:22:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $"); #include "opt_bpf.h" @@ -103,6 +103,10 @@ */ emit_func emitm; + /* Do not compile an empty filter. */ + if (nins == 0) + return NULL; + /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); ==== //depot/projects/smpng/sys/amd64/amd64/db_trace.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.71 2005/12/08 18:33:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.73 2005/12/27 23:23:47 pjd Exp $"); #include #include @@ -180,7 +180,7 @@ * Stack trace. */ #define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \ - || (va) >= KERNBASE) + || ((va) >= KERNBASE && (va) < VM_MAX_KERNEL_ADDRESS)) struct amd64_frame { struct amd64_frame *f_frame; @@ -199,8 +199,8 @@ static void decode_syscall(int, struct thread *); static char * watchtype_str(int type); -int amd64_set_watch(int watchnum, unsigned int watchaddr, int size, int access, - struct dbreg * d); +int amd64_set_watch(int watchnum, unsigned long watchaddr, int size, + int access, struct dbreg * d); int amd64_clr_watch(int watchnum, struct dbreg * d); /* @@ -515,6 +515,10 @@ break; if (stack_put(st, callpc) == -1) break; + if (frame->f_frame <= frame || + (vm_offset_t)frame->f_frame >= + (vm_offset_t)rbp + KSTACK_PAGES * PAGE_SIZE) + break; frame = frame->f_frame; } } @@ -522,7 +526,7 @@ int amd64_set_watch(watchnum, watchaddr, size, access, d) int watchnum; - unsigned int watchaddr; + unsigned long watchaddr; int size; int access; struct dbreg * d; ==== //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.24 2005/12/18 04:52:35 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $"); #include #include @@ -82,6 +82,7 @@ "/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -96,6 +97,7 @@ "/usr/libexec/ld-elf.so.1", &elf64_freebsd_sysvec, NULL, + 0, }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#16 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.141 2005/11/17 02:32:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.143 2006/01/01 05:35:57 netchild Exp $"); #include "opt_cpu.h" @@ -69,6 +69,8 @@ static void print_AMD_info(void); static void print_AMD_assoc(int i); +void setPQL2(int *const size, int *const ways); +static void setPQL2_AMD(int *const size, int *const ways); int cpu_class; char machine[] = "amd64"; @@ -93,6 +95,9 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +extern int pq_l2size; +extern int pq_l2nways; + void printcpuinfo(void) { @@ -526,3 +531,30 @@ print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } } + +static void +setPQL2_AMD(int *const size, int *const ways) +{ + if (cpu_exthigh >= 0x80000006) { + u_int regs[4]; + + do_cpuid(0x80000006, regs); + *size = regs[2] >> 16; + *ways = (regs[2] >> 12) & 0x0f; + switch (*ways) { + case 0: /* disabled/not present */ + case 15: /* fully associative */ + default: *ways = 1; break; /* reserved configuration */ + case 4: *ways = 4; break; + case 6: *ways = 8; break; + case 8: *ways = 16; break; + } + } +} + +void +setPQL2(int *const size, int *const ways) +{ + if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + setPQL2_AMD(size, ways); +} ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#19 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.22 2005/12/13 18:29:09 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.23 2005/12/22 22:16:05 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -51,6 +51,7 @@ #include #include +#include #include #include #include @@ -617,7 +618,7 @@ } void -lapic_handle_timer(struct clockframe frame) +lapic_handle_timer(struct trapframe frame) { struct lapic *la; @@ -634,16 +635,16 @@ if (la->la_hard_ticks >= lapic_timer_hz) { la->la_hard_ticks -= lapic_timer_hz; if (PCPU_GET(cpuid) == 0) - hardclock(&frame); + hardclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); else - hardclock_process(&frame); + hardclock_cpu(TRAPF_USERMODE(&frame)); } /* Fire statclock at stathz. */ la->la_stat_ticks += stathz; if (la->la_stat_ticks >= lapic_timer_hz) { la->la_stat_ticks -= lapic_timer_hz; - statclock(&frame); + statclock(TRAPF_USERMODE(&frame)); } /* Fire profclock at profhz, but only when needed. */ @@ -651,7 +652,7 @@ if (la->la_prof_ticks >= lapic_timer_hz) { la->la_prof_ticks -= lapic_timer_hz; if (profprocs != 0) - profclock(&frame); + profclock(TRAPF_USERMODE(&frame), TRAPF_PC(&frame)); } critical_exit(); } ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#31 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.266 2005/12/08 18:33:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.267 2005/12/22 22:16:05 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -917,7 +917,7 @@ } void -ipi_bitmap_handler(struct clockframe frame) +ipi_bitmap_handler(struct trapframe frame) { int cpu = PCPU_GET(cpuid); u_int ipi_bitmap; ==== //depot/projects/smpng/sys/amd64/amd64/mptable_pci.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.3 2005/09/18 01:42:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.4 2006/01/06 19:22:18 jhb Exp $"); #include #include @@ -100,13 +100,10 @@ { 0, 0 } }; -static driver_t mptable_hostb_driver = { - "pcib", - mptable_hostb_methods, - 1, -}; +static devclass_t hostb_devclass; -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, pcib_devclass, 0, 0); +DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); +DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); /* PCI to PCI bridge driver. */ @@ -155,11 +152,9 @@ {0, 0} }; -static driver_t mptable_pcib_driver = { - "pcib", - mptable_pcib_pci_methods, - sizeof(struct pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, + sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#40 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.299 2006/01/06 18:02:11 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -220,10 +220,10 @@ printf("kernel trap %d with interrupts disabled\n", type); /* - * We shouldn't enable interrupts while in a critical - * section or servicing an NMI. + * We shouldn't enable interrupts while holding a + * spin lock or servicing an NMI. */ - if (type != T_NMI && td->td_critnest == 0) + if (type != T_NMI && td->td_md.md_spinlock_count == 0) enable_intr(); } } ==== //depot/projects/smpng/sys/amd64/include/_types.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.9 2005/07/02 23:13:30 thompsa Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.10 2006/01/01 20:59:27 imp Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -44,6 +44,8 @@ #endif #define __NO_STRICT_ALIGNMENT +#define __HAVE_ACPI +#define __PCI_REROUTE_INTERRUPT /* * Basic types upon which most other types are built. ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.15 2005/12/08 18:33:30 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.16 2005/12/22 22:16:05 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -202,7 +202,7 @@ void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); void lapic_handle_intr(int vector, struct trapframe frame); -void lapic_handle_timer(struct clockframe frame); +void lapic_handle_timer(struct trapframe frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/smpng/sys/amd64/include/clock.h#5 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.50 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.51 2005/12/22 22:16:05 jhb Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -29,7 +29,6 @@ /* * Driver to clock driver interface. */ -struct clockframe; int acquire_timer2(int mode); int release_timer2(void); ==== //depot/projects/smpng/sys/amd64/include/cpu.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.74 2004/08/03 18:44:26 mux Exp $ + * $FreeBSD: src/sys/amd64/include/cpu.h,v 1.75 2005/12/22 22:16:05 jhb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jan 6 20:25:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E086716A422; Fri, 6 Jan 2006 20:25:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B6C8E16A420 for ; Fri, 6 Jan 2006 20:25:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CA9C43D45 for ; Fri, 6 Jan 2006 20:25: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 k06KP2xQ041619 for ; Fri, 6 Jan 2006 20:25:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06KP2v5041615 for perforce@freebsd.org; Fri, 6 Jan 2006 20:25:02 GMT (envelope-from jhb@freebsd.org) Date: Fri, 6 Jan 2006 20:25:02 GMT Message-Id: <200601062025.k06KP2v5041615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 89291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 20:25:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=89291 Change 89291 by jhb@jhb_slimer on 2006/01/06 20:24:33 IFC @89289. Affected files ... .. //depot/projects/smpng/sys/dev/si/si2_z280.c#4 integrate Differences ... ==== //depot/projects/smpng/sys/dev/si/si2_z280.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /*- - * Copyright (C) 1998 Specialix International. + * Copyright (C) 1988-1998 Specialix International. * - * Download code for SI/XIO/SX host cards. + * Download code for SI/XIO host cards. * * Redistribution and use in binary forms (this file is a binary form), with * or without modification, are permitted provided that the following @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/si/si2_z280.c,v 1.6 2005/01/06 01:43:13 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/si/si2_z280.c,v 1.7 2006/01/06 20:17:48 jhb Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Fri Jan 6 20:27:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5CF916A422; Fri, 6 Jan 2006 20:27:05 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFA5316A41F for ; Fri, 6 Jan 2006 20:27:05 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BE1E43D45 for ; Fri, 6 Jan 2006 20:27:05 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06KR5nt041713 for ; Fri, 6 Jan 2006 20:27:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06KR5gM041710 for perforce@freebsd.org; Fri, 6 Jan 2006 20:27:05 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 20:27:05 GMT Message-Id: <200601062027.k06KR5gM041710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 20:27:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=89292 Change 89292 by imp@imp_Speedy on 2006/01/06 20:26:04 A short delay is needed before reading the management registers. The reason is unknown. Maybe there's a back to back problem with certain registers. We hang otherwise. Noticed this when it worked with debug but failed w/o it. DEALY(1) is currently about 7.812ms, but this code works with delays as short as 10us (maybe even smaller). Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#13 (text+ko) ==== @@ -587,7 +587,10 @@ * XXX to make sure that the clock to the emac is on here */ + if (phy != 0) + return (0xffff); sc = device_get_softc(dev); + DELAY(1); /* Hangs w/o this delay really 7.812ms atm */ WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg)); while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) continue; From owner-p4-projects@FreeBSD.ORG Fri Jan 6 20:29:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2702516A422; Fri, 6 Jan 2006 20:29:09 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D781116A41F for ; Fri, 6 Jan 2006 20:29:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A9FF43D45 for ; Fri, 6 Jan 2006 20:29:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06KT8KL041820 for ; Fri, 6 Jan 2006 20:29:08 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06KT8sJ041817 for perforce@freebsd.org; Fri, 6 Jan 2006 20:29:08 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 20:29:08 GMT Message-Id: <200601062029.k06KT8sJ041817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 20:29:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=89293 Change 89293 by imp@imp_Speedy on 2006/01/06 20:29:07 Streamline the timer driver a little. Move from using TIMER_ defines to ST_ defines, to match the atmel datasheet. Use macros rather than raw-bus_space calls to access these registers. Fix DELAY by writing the RTMR in attach rather than at clock init time as well as making sure it will terminate. Optimize DELAY as well to avoid complicated math. Moved cpu_reset to the at91rm92timer device file, since that's where the reset hardware lives. Remove redundant definitions of ST_ that I created before. # DELAY needs to migrate Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#10 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#11 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#10 (text+ko) ==== @@ -291,22 +291,6 @@ return (0); } -void -cpu_reset(void) -{ - struct at91rm92_softc *sc = at91rm92_softc; - - /* - * Reset the CPU by programmig the watchdog timer to reset the - * CPU after 128 'slow' clocks, or about ~4ms. Loop until - * the reset happens for safety. - */ - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, ST_WDMR, ST_RSTEN | 2); - bus_space_write_4(sc->sc_st, sc->sc_sys_sh, ST_CR, ST_WDRST); - while (1) - continue; -} - static struct resource * at91rm92_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#11 (text+ko) ==== @@ -203,19 +203,6 @@ #define PIOD_OWDR (0xa00 + 164) /* Output write disable register */ #define PIOD_OWSR (0xa00 + 168) /* Output write status register */ -#define ST_CR (0xd00 + 0) /* Control register */ -#define ST_WDRST 1 -#define ST_PIMR (0xd00 + 4) /* Period Interval Mode register */ -#define ST_WDMR (0xd00 + 8) /* Watchdog Mode register */ -#define ST_RSTEN (1 << 16) -#define ST_RTMR (0xd00 + 12) /* Reat-time Mode register */ -#define ST_SR (0xd00 + 16) /* Status register */ -#define ST_IER (0xd00 + 20) /* Interrupt Enable register */ -#define ST_IDR (0xd00 + 24) /* Interrupt Disable register */ -#define ST_IMR (0xd00 + 28) /* Interrupt Mask register */ -#define ST_RTAR (0xd00 + 32) /* Real-time Alarm register */ -#define ST_CRTR (0xd00 + 36) /* Current Real-time register */ - /* IRQs : */ /* * 0: AIC @@ -280,19 +267,27 @@ /* Timer */ -#define AT91RM92_TIMER_BASE 0xffffd00 -#define AT91RM92_TIMER_SIZE 0x100 +#define AT91RM92_ST_BASE 0xffffd00 +#define AT91RM92_ST_SIZE 0x100 -#define TIMER_CR 0x00 /* Control register */ -#define TIMER_PIMR 0x04 /* Period interval mode register */ -#define TIMER_WMR 0x08 /* Watchdog mode register */ -#define TIMER_RTMR 0x0c /* Real-time mode register */ -#define TIMER_SR 0x10 /* Status register */ -#define TIMER_IER 0x14 /* Interrupt enable register */ -#define TIMER_IDR 0x18 /* Interrupt disable register */ -#define TIMER_IMR 0x1c /* Interrupt mask register */ -#define TIMER_RTAR 0x20 /* Real-time alarm register */ -#define TIMER_CRTR 0x24 /* Current real-time register */ +#define ST_CR 0x00 /* Control register */ +#define ST_CR_WDRST (1U << 0) /* WDRST: Watchdog Timer Restart */ +#define ST_PIMR 0x04 /* Period interval mode register */ +#define ST_WDMR 0x08 /* Watchdog mode register */ +#define ST_WDMR_EXTEN (1U << 17) /* EXTEN: External Signal Assert Enable */ +#define ST_WDMR_RSTEN (1U << 16) /* RSTEN: Reset Enable */ +#define ST_RTMR 0x0c /* Real-time mode register */ +#define ST_SR 0x10 /* Status register */ +#define ST_SR_PITS (1U << 0) /* PITS: Period Interval Timer Status */ +#define ST_SR_WDOVF (1U << 1) /* WDOVF: Watchdog Overflow */ +#define ST_SR_RTTINC (1U << 2) /* RTTINC: Real-time Timer Increment */ +#define ST_SR_ALMS (1U << 3) /* ALMS: Alarm Status */ +#define ST_IER 0x14 /* Interrupt enable register */ +#define ST_IDR 0x18 /* Interrupt disable register */ +#define ST_IMR 0x1c /* Interrupt mask register */ +#define ST_RTAR 0x20 /* Real-time alarm register */ +#define ST_CRTR 0x24 /* Current real-time register */ +#define ST_CRTR_MASK 0xfffff /* 20-bit counter */ #define AT91RM92_SPI_BASE 0xffe0000 #define AT91RM92_SPI_SIZE 0x4000 ==== //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#5 (text+ko) ==== @@ -50,6 +50,22 @@ device_t dev; } *timer_softc; +#define RD4(off) \ + bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, (off)) +#define WR4(off, val) \ + bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, (off), (val)) + +static inline int +st_crtr(void) +{ + int cur1, cur2; + do { + cur1 = RD4(ST_CRTR); + cur2 = RD4(ST_CRTR); + } while (cur1 != cur2); + return (cur1); +} + static unsigned at91rm92timer_get_timecount(struct timecounter *tc); static struct timecounter at91rm92timer_timecounter = { @@ -75,9 +91,15 @@ timer_softc = device_get_softc(dev); timer_softc->sc_st = sc->sc_st; timer_softc->dev = dev; - if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_TIMER_BASE, - AT91RM92_TIMER_SIZE, &timer_softc->sc_sh) != 0) + if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_ST_BASE, + AT91RM92_ST_SIZE, &timer_softc->sc_sh) != 0) panic("couldn't subregion timer registers"); + /* + * Real time counter increments every clock cycle, need to set before + * initializing clocks so that DELAY works. + */ + WR4(ST_RTMR, 1); + return (0); } @@ -100,14 +122,7 @@ static unsigned at91rm92timer_get_timecount(struct timecounter *tc) { - int cur1, cur2; - do { - cur1 = bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_CRTR); - cur2 = bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_CRTR); - } while (cur1 != cur2); - return (cur1); + return (st_crtr()); } static void @@ -116,10 +131,8 @@ struct trapframe *fp = arg; /* The interrupt is shared, so we have to make sure it's for us. */ - if (bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_SR) & 1) { + if (RD4(ST_SR) & ST_SR_PITS) hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); - } } void @@ -137,8 +150,7 @@ } rel_value = 32768 / hz; /* Disable all interrupts. */ - bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_IDR, 0xffffffff); + WR4(ST_IDR, 0xffffffff); /* The system timer shares the system irq (1) */ irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 1, 1, 1, RF_ACTIVE | RF_SHAREABLE); @@ -148,42 +160,45 @@ bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, clock_intr, NULL, &ih); - bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_PIMR, rel_value); - /* Real time counter increments every clock cycle. */ - bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_RTMR, 1); + WR4(ST_PIMR, rel_value); /* Enable PITS interrupts. */ - bus_space_write_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_IER, 1); + WR4(ST_IER, ST_SR_PITS); tc_init(&at91rm92timer_timecounter); } void DELAY(int n) { - uint32_t usec = 0; - uint32_t cur1, cur2, old, delta = 0; + uint32_t start, end, cur; - old = bus_space_read_4(timer_softc->sc_st, timer_softc->sc_sh, - TIMER_CRTR); - while (usec < n) { - do { - cur1 = bus_space_read_4(timer_softc->sc_st, - timer_softc->sc_sh, TIMER_CRTR); - cur2 = bus_space_read_4(timer_softc->sc_st, - timer_softc->sc_sh, TIMER_CRTR); - } while (cur1 != cur2); - if (old > cur1) - delta += (old + (0xfffff + 1 - cur1)); - else - delta += (cur1 - old); - usec += delta / 32768 * 1000000; - delta = 0; - + start = st_crtr(); + n = (n * 1000000) / 32768; + if (n <= 0) + n = 1; + end = (start + n) & ST_CRTR_MASK; + cur = start; + if (start > end) { + while (cur >= start || cur < end) + cur = st_crtr(); + } else { + while (cur < end) + cur = st_crtr(); + } +} - } +void +cpu_reset(void) +{ + /* + * Reset the CPU by programmig the watchdog timer to reset the + * CPU after 128 'slow' clocks, or about ~4ms. Loop until + * the reset happens for safety. + */ + WR4(ST_WDMR, ST_WDMR_RSTEN | 2); + WR4(ST_CR, ST_CR_WDRST); + while (1) + continue; } void From owner-p4-projects@FreeBSD.ORG Fri Jan 6 20:44:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9561B16A423; Fri, 6 Jan 2006 20:44:33 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42A2E16A41F for ; Fri, 6 Jan 2006 20:44:33 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E16143D67 for ; Fri, 6 Jan 2006 20:44:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06KiRkM042550 for ; Fri, 6 Jan 2006 20:44:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06KiR6f042547 for perforce@freebsd.org; Fri, 6 Jan 2006 20:44:27 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 20:44:27 GMT Message-Id: <200601062044.k06KiR6f042547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 20:44:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=89295 Change 89295 by imp@imp_Speedy on 2006/01/06 20:43:55 Minor tidy. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#11 edit .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#14 edit .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#11 (text+ko) ==== @@ -161,7 +161,7 @@ static int at91rm92_probe(device_t dev) { - device_set_desc(dev, "AT91 CPU"); + device_set_desc(dev, "AT91RM9200 device bus"); return (0); } ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#14 (text+ko) ==== @@ -594,7 +594,7 @@ WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg)); while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) continue; - val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE; + val = RD4(sc, ETH_MAN) & ETH_MAN_VALUE_MASK; return (val); } ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#4 (text+ko) ==== @@ -147,10 +147,10 @@ #define ETH_MAN_WRITE (1U << 28) #define ETH_MAN_PHYA_BIT 23 #define ETH_MAN_REGA_BIT 18 -#define ETH_MAN_VALUE 0xffffU +#define ETH_MAN_VALUE_MASK 0xffffU #define ETH_MAN_REG_WR(phy, reg, val) \ (ETH_MAN_BITS | ETH_MAN_WRITE | ((phy) << ETH_MAN_PHYA_BIT) | \ - ((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE)) + ((reg) << ETH_MAN_REGA_BIT) | ((val) & ETH_MAN_VALUE_MASK)) #define ETH_MAN_REG_RD(phy, reg) \ (ETH_MAN_BITS | ETH_MAN_READ | ((phy) << ETH_MAN_PHYA_BIT) | \ ((reg) << ETH_MAN_REGA_BIT)) From owner-p4-projects@FreeBSD.ORG Fri Jan 6 23:09:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48A0916A422; Fri, 6 Jan 2006 23:09:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EE6816A41F for ; Fri, 6 Jan 2006 23:09:12 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB28943D45 for ; Fri, 6 Jan 2006 23:09:11 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06N9BGs055433 for ; Fri, 6 Jan 2006 23:09:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06N9BO0055430 for perforce@freebsd.org; Fri, 6 Jan 2006 23:09:11 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 23:09:11 GMT Message-Id: <200601062309.k06N9BO0055430@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 23:09:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=89305 Change 89305 by imp@imp_Speedy on 2006/01/06 23:08:41 This stuff appears to be generic for all AT91 processors that FreeBSD is likely to support, so rename it from at91rm92 (which is a pain to type) to plain at91. File renaming will happen in a bit. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#12 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#6 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#4 edit .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92.c#12 (text+ko) ==== @@ -45,10 +45,10 @@ #include #include -static struct at91rm92_softc *at91rm92_softc; +static struct at91_softc *at91_softc; static int -at91rm92_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, +at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp) { vm_paddr_t pa, endpa; @@ -64,7 +64,7 @@ } static void -at91rm92_bs_unmap(void *t, bus_size_t size) +at91_bs_unmap(void *t, bus_size_t size) { vm_offset_t va, endva; @@ -76,7 +76,7 @@ } static int -at91rm92_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, +at91_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp) { @@ -87,14 +87,14 @@ bs_protos(generic); bs_protos(generic_armv4); -struct bus_space at91rm92_bs_tag = { +struct bus_space at91_bs_tag = { /* cookie */ (void *) 0, /* mapping/unmapping */ - at91rm92_bs_map, - at91rm92_bs_unmap, - at91rm92_bs_subregion, + at91_bs_map, + at91_bs_unmap, + at91_bs_subregion, /* allocation/deallocation */ NULL, @@ -159,14 +159,14 @@ }; static int -at91rm92_probe(device_t dev) +at91_probe(device_t dev) { device_set_desc(dev, "AT91RM9200 device bus"); return (0); } static void -at91rm92_identify(driver_t *drv, device_t parent) +at91_identify(driver_t *drv, device_t parent) { BUS_ADD_CHILD(parent, 0, "atmelarm", 0); @@ -188,11 +188,11 @@ extern void irq_entry(void); static void -at91rm92_add_child(device_t dev, int prio, const char *name, int unit, +at91_add_child(device_t dev, int prio, const char *name, int unit, bus_addr_t addr, bus_size_t size, int irq) { device_t kid; - struct at91rm92_ivar *ivar; + struct at91_ivar *ivar; kid = device_add_child_ordered(dev, prio, name, unit); if (kid == NULL) @@ -212,13 +212,13 @@ static int -at91rm92_attach(device_t dev) +at91_attach(device_t dev) { - struct at91rm92_softc *sc = device_get_softc(dev); + struct at91_softc *sc = device_get_softc(dev); int i; - at91rm92_softc = sc; - sc->sc_st = &at91rm92_bs_tag; + at91_softc = sc; + sc->sc_st = &at91_bs_tag; sc->sc_sh = AT91RM92_BASE; sc->dev = dev; if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_SYS_BASE, @@ -230,11 +230,11 @@ sc->sc_mem_rman.rm_descr = "AT91RM92 Memory"; if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0) - panic("at91rm92_attach: failed to set up IRQ rman"); + panic("at91_attach: failed to set up IRQ rman"); if (rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_mem_rman, 0xfff00000ul, 0xfffffffful) != 0) - panic("at91rm92_attach: failed to set up memory rman"); + panic("at91_attach: failed to set up memory rman"); for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR + @@ -255,35 +255,35 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IDCR, 0xffffffff); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_ICCR, 0xffffffff); - at91rm92_add_child(dev, 0, "at91rm92_timer", 0, 0, 0, 1); - at91rm92_add_child(dev, 10, "atudp", 0, AT91RM92_BASE + // UDP + at91_add_child(dev, 0, "at91rm92_timer", 0, 0, 0, 1); + at91_add_child(dev, 10, "atudp", 0, AT91RM92_BASE + // UDP AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); - at91rm92_add_child(dev, 10, "mci", 0, AT91RM92_BASE + // MCI + at91_add_child(dev, 10, "mci", 0, AT91RM92_BASE + // MCI AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI); - at91rm92_add_child(dev, 10, "twi", 0, AT91RM92_BASE + // TWI + at91_add_child(dev, 10, "twi", 0, AT91RM92_BASE + // TWI AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, AT91RM92_IRQ_TWI); - at91rm92_add_child(dev, 10, "ate", 0, AT91RM92_BASE + // EMAC + at91_add_child(dev, 10, "ate", 0, AT91RM92_BASE + // EMAC AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC); - at91rm92_add_child(dev, 10, "uart", 0, AT91RM92_BASE + // DBGU + at91_add_child(dev, 10, "uart", 0, AT91RM92_BASE + // DBGU AT91RM92_SYS_BASE + DBGU, DBGU_SIZE, AT91RM92_IRQ_SYSTEM); - at91rm92_add_child(dev, 10, "uart", 1, AT91RM92_BASE + // USART0 + at91_add_child(dev, 10, "uart", 1, AT91RM92_BASE + // USART0 AT91RM92_USART0_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART0); - at91rm92_add_child(dev, 10, "uart", 2, AT91RM92_BASE + // USART1 + at91_add_child(dev, 10, "uart", 2, AT91RM92_BASE + // USART1 AT91RM92_USART1_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART1); - at91rm92_add_child(dev, 10, "uart", 3, AT91RM92_BASE + // USART2 + at91_add_child(dev, 10, "uart", 3, AT91RM92_BASE + // USART2 AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART2); - at91rm92_add_child(dev, 10, "uart", 4, AT91RM92_BASE + // USART3 + at91_add_child(dev, 10, "uart", 4, AT91RM92_BASE + // USART3 AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3); - at91rm92_add_child(dev, 10, "ssc", 0, AT91RM92_BASE + // SSC0 + at91_add_child(dev, 10, "ssc", 0, AT91RM92_BASE + // SSC0 AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC0); - at91rm92_add_child(dev, 10, "ssc", 1, AT91RM92_BASE + // SSC1 + at91_add_child(dev, 10, "ssc", 1, AT91RM92_BASE + // SSC1 AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC1); - at91rm92_add_child(dev, 10, "ssc", 2, AT91RM92_BASE + // SSC2 + at91_add_child(dev, 10, "ssc", 2, AT91RM92_BASE + // SSC2 AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); - at91rm92_add_child(dev, 10, "spi", 0, AT91RM92_BASE + // SPI + at91_add_child(dev, 10, "spi", 0, AT91RM92_BASE + // SPI AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); // Not sure that the following belongs on this bus. - at91rm92_add_child(dev, 10, "ohci", 0, AT91RM92_BASE + // UHP + at91_add_child(dev, 10, "ohci", 0, AT91RM92_BASE + // UHP AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE, AT91RM92_IRQ_UHP); bus_generic_probe(dev); bus_generic_attach(dev); @@ -292,12 +292,12 @@ } static struct resource * -at91rm92_alloc_resource(device_t dev, device_t child, int type, int *rid, +at91_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { - struct at91rm92_softc *sc = device_get_softc(dev); + struct at91_softc *sc = device_get_softc(dev); struct resource_list_entry *rle; - struct at91rm92_ivar *ivar = device_get_ivars(child); + struct at91_ivar *ivar = device_get_ivars(child); struct resource_list *rl = &ivar->resources; if (device_get_parent(child) != dev) @@ -323,7 +323,7 @@ case SYS_RES_MEMORY: rle->res = rman_reserve_resource(&sc->sc_mem_rman, start, end, count, flags, child); - rman_set_bustag(rle->res, &at91rm92_bs_tag); + rman_set_bustag(rle->res, &at91_bs_tag); rman_set_bushandle(rle->res, start); break; } @@ -336,22 +336,22 @@ } static struct resource_list * -at91rm92_get_resource_list(device_t dev, device_t child) +at91_get_resource_list(device_t dev, device_t child) { - struct at91rm92_ivar *ivar; + struct at91_ivar *ivar; ivar = device_get_ivars(child); return (&(ivar->resources)); } static int -at91rm92_release_resource(device_t dev, device_t child, int type, +at91_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { struct resource_list *rl; struct resource_list_entry *rle; - rl = at91rm92_get_resource_list(dev, child); + rl = at91_get_resource_list(dev, child); if (rl == NULL) return (EINVAL); rle = resource_list_find(rl, type, rid); @@ -363,11 +363,11 @@ } static int -at91rm92_setup_intr(device_t dev, device_t child, +at91_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { - struct at91rm92_softc *sc = device_get_softc(dev); + struct at91_softc *sc = device_get_softc(dev); BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, cookiep); @@ -377,10 +377,10 @@ } static int -at91rm92_teardown_intr(device_t dev, device_t child, struct resource *res, +at91_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { - struct at91rm92_softc *sc = device_get_softc(dev); + struct at91_softc *sc = device_get_softc(dev); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IDCR, 1 << rman_get_start(res)); @@ -388,7 +388,7 @@ } static int -at91rm92_activate_resource(device_t bus, device_t child, int type, int rid, +at91_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { #if 0 @@ -407,9 +407,9 @@ } static int -at91rm92_print_child(device_t dev, device_t child) +at91_print_child(device_t dev, device_t child) { - struct at91rm92_ivar *ivars; + struct at91_ivar *ivars; struct resource_list *rl; int retval = 0; @@ -433,8 +433,8 @@ arm_mask_irq(uintptr_t nb) { - bus_space_write_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_sys_sh, IC_IDCR, 1 << nb); + bus_space_write_4(at91_softc->sc_st, + at91_softc->sc_sys_sh, IC_IDCR, 1 << nb); } @@ -445,13 +445,13 @@ int status; int irq; - irq = bus_space_read_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_sys_sh, IC_IVR); - status = bus_space_read_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_sys_sh, IC_ISR); + irq = bus_space_read_4(at91_softc->sc_st, + at91_softc->sc_sys_sh, IC_IVR); + status = bus_space_read_4(at91_softc->sc_st, + at91_softc->sc_sys_sh, IC_ISR); if (status == 0) { - bus_space_write_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_sys_sh, IC_EOICR, 1); + bus_space_write_4(at91_softc->sc_st, + at91_softc->sc_sys_sh, IC_EOICR, 1); return (-1); } return (irq); @@ -461,35 +461,35 @@ arm_unmask_irq(uintptr_t nb) { - bus_space_write_4(at91rm92_softc->sc_st, - at91rm92_softc->sc_sys_sh, IC_IECR, 1 << nb); + bus_space_write_4(at91_softc->sc_st, + at91_softc->sc_sys_sh, IC_IECR, 1 << nb); } -static device_method_t at91rm92_methods[] = { - DEVMETHOD(device_probe, at91rm92_probe), - DEVMETHOD(device_attach, at91rm92_attach), - DEVMETHOD(device_identify, at91rm92_identify), +static device_method_t at91_methods[] = { + DEVMETHOD(device_probe, at91_probe), + DEVMETHOD(device_attach, at91_attach), + DEVMETHOD(device_identify, at91_identify), - DEVMETHOD(bus_alloc_resource, at91rm92_alloc_resource), - DEVMETHOD(bus_setup_intr, at91rm92_setup_intr), - DEVMETHOD(bus_teardown_intr, at91rm92_teardown_intr), - DEVMETHOD(bus_activate_resource, at91rm92_activate_resource), + DEVMETHOD(bus_alloc_resource, at91_alloc_resource), + DEVMETHOD(bus_setup_intr, at91_setup_intr), + DEVMETHOD(bus_teardown_intr, at91_teardown_intr), + DEVMETHOD(bus_activate_resource, at91_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - DEVMETHOD(bus_get_resource_list,at91rm92_get_resource_list), + DEVMETHOD(bus_get_resource_list,at91_get_resource_list), DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), - DEVMETHOD(bus_release_resource, at91rm92_release_resource), - DEVMETHOD(bus_print_child, at91rm92_print_child), + DEVMETHOD(bus_release_resource, at91_release_resource), + DEVMETHOD(bus_print_child, at91_print_child), {0, 0}, }; -static driver_t at91rm92_driver = { +static driver_t at91_driver = { "atmelarm", - at91rm92_methods, - sizeof(struct at91rm92_softc), + at91_methods, + sizeof(struct at91_softc), }; -static devclass_t at91rm92_devclass; +static devclass_t at91_devclass; -DRIVER_MODULE(atmelarm, nexus, at91rm92_driver, at91rm92_devclass, 0, 0); +DRIVER_MODULE(atmelarm, nexus, at91_driver, at91_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#6 (text+ko) ==== @@ -86,7 +86,7 @@ static int at91rm92timer_attach(device_t dev) { - struct at91rm92_softc *sc = device_get_softc(device_get_parent(dev)); + struct at91_softc *sc = device_get_softc(device_get_parent(dev)); timer_softc = device_get_softc(dev); timer_softc->sc_st = sc->sc_st; ==== //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#4 (text+ko) ==== @@ -24,12 +24,12 @@ /* $FreeBSD$ */ -#ifndef _AT91RM92VAR_H_ -#define _AT91RM92VAR_H_ +#ifndef _AT91VAR_H_ +#define _AT91VAR_H_ #include -struct at91rm92_softc { +struct at91_softc { device_t dev; bus_space_tag_t sc_st; bus_space_handle_t sc_sh; @@ -38,9 +38,9 @@ struct rman sc_mem_rman; }; -struct at91rm92_ivar { +struct at91_ivar { struct resource_list resources; }; -#endif /* _AT91RM92VAR_H_ */ +#endif /* _AT91VAR_H_ */ ==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ bus_space_tag_t uart_bus_space_mem; extern struct uart_ops at91_usart_ops; -extern struct bus_space at91rm92_bs_tag; +extern struct bus_space at91_bs_tag; int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) @@ -57,7 +57,7 @@ { di->ops = at91_usart_ops; di->bas.chan = 0; - di->bas.bst = &at91rm92_bs_tag; + di->bas.bst = &at91_bs_tag; /* * XXX: Not pretty, but will work because we map VA == PA early * for the last 1MB of memory. @@ -80,7 +80,7 @@ if (uart_getenv(devtype, di) == 0) return (0); - uart_bus_space_io = &at91rm92_bs_tag; + uart_bus_space_io = &at91_bs_tag; uart_bus_space_mem = NULL; return (0); From owner-p4-projects@FreeBSD.ORG Fri Jan 6 23:21:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84BBD16A422; Fri, 6 Jan 2006 23:21:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3D53D16A41F for ; Fri, 6 Jan 2006 23:21:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA7DC43D45 for ; Fri, 6 Jan 2006 23:21:26 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06NLQC3055996 for ; Fri, 6 Jan 2006 23:21:26 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06NLQfL055993 for perforce@freebsd.org; Fri, 6 Jan 2006 23:21:26 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 23:21:26 GMT Message-Id: <200601062321.k06NLQfL055993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 23:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=89306 Change 89306 by imp@imp_Speedy on 2006/01/06 23:20:41 Move at91rm92.c -> at91.c Move at91rm92var.h -> at91var.h Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#1 add .. //depot/projects/arm/src/sys/arm/at91/at91rm92.c#13 delete .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#7 edit .. //depot/projects/arm/src/sys/arm/at91/at91rm92var.h#5 delete .. //depot/projects/arm/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #include #include #include -#include +#include static struct at91rm92timer_softc { bus_space_tag_t sc_st; ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#5 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD$ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard -arm/at91/at91rm92.c standard +arm/at91/at91.c standard arm/at91/at91rm92timer.c standard arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart From owner-p4-projects@FreeBSD.ORG Fri Jan 6 23:29:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8572116A422; Fri, 6 Jan 2006 23:29:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6086516A41F for ; Fri, 6 Jan 2006 23:29:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BC2143D45 for ; Fri, 6 Jan 2006 23:29:37 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06NTbbr056310 for ; Fri, 6 Jan 2006 23:29:37 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06NTahF056307 for perforce@freebsd.org; Fri, 6 Jan 2006 23:29:36 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 23:29:36 GMT Message-Id: <200601062329.k06NTahF056307@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 23:29:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=89307 Change 89307 by imp@imp_Speedy on 2006/01/06 23:28:42 This really controlls the System Timer (aka ST in the AT91 docs), so rename it as such. Althought it might make sense to combine the ST and TC code into one file... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92timer.c#8 delete .. //depot/projects/arm/src/sys/arm/at91/at91st.c#1 branch .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#6 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#6 (text+ko) ==== @@ -2,7 +2,7 @@ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard -arm/at91/at91rm92timer.c standard +arm/at91/at91st.c standard arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart From owner-p4-projects@FreeBSD.ORG Fri Jan 6 23:34:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61A9E16A423; Fri, 6 Jan 2006 23:34:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2283116A41F for ; Fri, 6 Jan 2006 23:34:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08BCC43D75 for ; Fri, 6 Jan 2006 23:34:43 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06NYhUI056519 for ; Fri, 6 Jan 2006 23:34:43 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06NYh3U056516 for perforce@freebsd.org; Fri, 6 Jan 2006 23:34:43 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 23:34:43 GMT Message-Id: <200601062334.k06NYh3U056516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89308 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 23:34:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=89308 Change 89308 by imp@imp_Speedy on 2006/01/06 23:34:40 cleanup driver names while we only have a few. Most atmel specific drivers will start at91_foo, where FOO is the name in the AT91xxxx data sheet. So far the only exceptions to this rule are uart, ohci and ate. ate maybe should be called at91_emac, but that's an insanely long name for an interface... Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/at91st.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91.c#2 (text+ko) ==== @@ -255,12 +255,12 @@ bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IDCR, 0xffffffff); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_ICCR, 0xffffffff); - at91_add_child(dev, 0, "at91rm92_timer", 0, 0, 0, 1); - at91_add_child(dev, 10, "atudp", 0, AT91RM92_BASE + // UDP + at91_add_child(dev, 0, "at91_st", 0, 0, 0, 1); + at91_add_child(dev, 10, "at91_udp", 0, AT91RM92_BASE + // UDP AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, AT91RM92_IRQ_UDP); - at91_add_child(dev, 10, "mci", 0, AT91RM92_BASE + // MCI + at91_add_child(dev, 10, "at91_mci", 0, AT91RM92_BASE + // MCI AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE, AT91RM92_IRQ_MCI); - at91_add_child(dev, 10, "twi", 0, AT91RM92_BASE + // TWI + at91_add_child(dev, 10, "at91_twi", 0, AT91RM92_BASE + // TWI AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE, AT91RM92_IRQ_TWI); at91_add_child(dev, 10, "ate", 0, AT91RM92_BASE + // EMAC AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE, AT91RM92_IRQ_EMAC); @@ -274,13 +274,13 @@ AT91RM92_USART2_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART2); at91_add_child(dev, 10, "uart", 4, AT91RM92_BASE + // USART3 AT91RM92_USART3_BASE, AT91RM92_USART_SIZE, AT91RM92_IRQ_USART3); - at91_add_child(dev, 10, "ssc", 0, AT91RM92_BASE + // SSC0 + at91_add_child(dev, 10, "at91_ssc", 0, AT91RM92_BASE + // SSC0 AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC0); - at91_add_child(dev, 10, "ssc", 1, AT91RM92_BASE + // SSC1 + at91_add_child(dev, 10, "at91_ssc", 1, AT91RM92_BASE + // SSC1 AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC1); - at91_add_child(dev, 10, "ssc", 2, AT91RM92_BASE + // SSC2 + at91_add_child(dev, 10, "at91_ssc", 2, AT91RM92_BASE + // SSC2 AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE, AT91RM92_IRQ_SSC2); - at91_add_child(dev, 10, "spi", 0, AT91RM92_BASE + // SPI + at91_add_child(dev, 10, "at91_spi", 0, AT91RM92_BASE + // SPI AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI); // Not sure that the following belongs on this bus. at91_add_child(dev, 10, "ohci", 0, AT91RM92_BASE + // UHP ==== //depot/projects/arm/src/sys/arm/at91/at91st.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include #include -static struct at91rm92timer_softc { +static struct at91st_softc { bus_space_tag_t sc_st; bus_space_handle_t sc_sh; device_t dev; @@ -66,10 +66,10 @@ return (cur1); } -static unsigned at91rm92timer_get_timecount(struct timecounter *tc); +static unsigned at91st_get_timecount(struct timecounter *tc); -static struct timecounter at91rm92timer_timecounter = { - at91rm92timer_get_timecount, /* get_timecount */ +static struct timecounter at91st_timecounter = { + at91st_get_timecount, /* get_timecount */ NULL, /* no poll_pps */ 0xfffffu, /* counter_mask */ 32768, /* frequency */ @@ -78,13 +78,13 @@ }; static int -at91rm92timer_probe(device_t dev) +at91st_probe(device_t dev) { return (0); } static int -at91rm92timer_attach(device_t dev) +at91st_attach(device_t dev) { struct at91_softc *sc = device_get_softc(device_get_parent(dev)); @@ -103,24 +103,23 @@ return (0); } -static device_method_t at91rm92timer_methods[] = { - DEVMETHOD(device_probe, at91rm92timer_probe), - DEVMETHOD(device_attach, at91rm92timer_attach), +static device_method_t at91st_methods[] = { + DEVMETHOD(device_probe, at91st_probe), + DEVMETHOD(device_attach, at91st_attach), {0, 0}, }; -static driver_t at91rm92timer_driver = { - "at91rm92_timer", - at91rm92timer_methods, - sizeof(struct at91rm92timer_softc), +static driver_t at91st_driver = { + "at91_st", + at91st_methods, + sizeof(struct at91st_softc), }; -static devclass_t at91rm92timer_devclass; +static devclass_t at91st_devclass; -DRIVER_MODULE(at91rm92_timer, atmelarm, at91rm92timer_driver, - at91rm92timer_devclass, 0, 0); +DRIVER_MODULE(at91_st, atmelarm, at91st_driver, at91st_devclass, 0, 0); static unsigned -at91rm92timer_get_timecount(struct timecounter *tc) +at91st_get_timecount(struct timecounter *tc) { return (st_crtr()); } @@ -164,7 +163,7 @@ /* Enable PITS interrupts. */ WR4(ST_IER, ST_SR_PITS); - tc_init(&at91rm92timer_timecounter); + tc_init(&at91st_timecounter); } void From owner-p4-projects@FreeBSD.ORG Fri Jan 6 23:54:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 702C516A422; Fri, 6 Jan 2006 23:54:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C8D016A420 for ; Fri, 6 Jan 2006 23:54:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A123743D48 for ; Fri, 6 Jan 2006 23:54:07 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k06Ns7EU057305 for ; Fri, 6 Jan 2006 23:54:07 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k06Ns7H4057302 for perforce@freebsd.org; Fri, 6 Jan 2006 23:54:07 GMT (envelope-from imp@freebsd.org) Date: Fri, 6 Jan 2006 23:54:07 GMT Message-Id: <200601062354.k06Ns7H4057302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2006 23:54:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=89309 Change 89309 by imp@imp_Speedy on 2006/01/06 23:53:59 Go ahead and list files for the various built-in devices that I'm planning on writing some kind of driver for in files.at91rm92. Atmel's product line has standardized asic blobs that get added to each SoC/MicroController that they produce, so we only need one driver for each of them. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#7 (text+ko) ==== @@ -7,3 +7,9 @@ arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart arm/at91/if_ate.c optional ate +arm/at91/at91_mci.c optional at91_mci +arm/at91/at91_ssc.c optional at91_ssc +arm/at91/at91_spi.c optional at91_spi +arm/at91/at91_twi.c optional at91_twi +arm/at91/at91_udp.c optional at91_udp +arm/at91/ohci_atmelarm.c optional ohci From owner-p4-projects@FreeBSD.ORG Sat Jan 7 00:01:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F83016A422; Sat, 7 Jan 2006 00:01:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2E0DA16A420 for ; Sat, 7 Jan 2006 00:01:17 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF2F243D46 for ; Sat, 7 Jan 2006 00:01:16 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0701Gja057638 for ; Sat, 7 Jan 2006 00:01:16 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0701GSq057635 for perforce@freebsd.org; Sat, 7 Jan 2006 00:01:16 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 00:01:16 GMT Message-Id: <200601070001.k0701GSq057635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89310 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 00:01:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=89310 Change 89310 by imp@imp_Speedy on 2006/01/07 00:00:37 Tidy up the CPU id message a little. This more closely matches i386, but I'm sure that additional tidying could be effective. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#5 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#5 (text+ko) ==== @@ -325,7 +325,7 @@ for (i = 0; cpuids[i].cpuid != 0; i++) if (cpuids[i].cpuid == (cpuid & CPU_ID_CPU_MASK)) { cpu_class = cpuids[i].cpu_class; - printf("%s %s (%s core)\n", + printf("CPU: %s %s (%s core)\n", cpuids[i].cpu_name, cpuids[i].cpu_steppings[cpuid & CPU_ID_REVISION_MASK], @@ -335,6 +335,7 @@ if (cpuids[i].cpuid == 0) printf("unknown CPU (ID = 0x%x)\n", cpuid); + printf(" "); switch (cpu_class) { case CPU_CLASS_ARM6: case CPU_CLASS_ARM7: @@ -374,24 +375,24 @@ if (ctrl & CPU_CONTROL_BPRD_ENABLE) printf(" branch prediction enabled"); + printf("\n"); /* Print cache info. */ if (arm_picache_line_size == 0 && arm_pdcache_line_size == 0) return; if (arm_pcache_unified) { - printf("%dKB/%dB %d-way %s unified cache\n", + printf(" %dKB/%dB %d-way %s unified cache\n", arm_pdcache_size / 1024, arm_pdcache_line_size, arm_pdcache_ways, wtnames[arm_pcache_type]); } else { - printf("%dKB/%dB %d-way Instruction cache\n", + printf(" %dKB/%dB %d-way Instruction cache\n", arm_picache_size / 1024, arm_picache_line_size, arm_picache_ways); - printf("%dKB/%dB %d-way %s Data cache\n", + printf(" %dKB/%dB %d-way %s Data cache\n", arm_pdcache_size / 1024, arm_pdcache_line_size, arm_pdcache_ways, wtnames[arm_pcache_type]); } - printf("\n"); } From owner-p4-projects@FreeBSD.ORG Sat Jan 7 00:03:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3977A16A422; Sat, 7 Jan 2006 00:03:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 135AB16A41F for ; Sat, 7 Jan 2006 00:03:20 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD21C43D45 for ; Sat, 7 Jan 2006 00:03:19 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0703JKB057717 for ; Sat, 7 Jan 2006 00:03:19 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0703J06057714 for perforce@freebsd.org; Sat, 7 Jan 2006 00:03:19 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 00:03:19 GMT Message-Id: <200601070003.k0703J06057714@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 00:03:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=89311 Change 89311 by imp@imp_Speedy on 2006/01/07 00:02:51 Reminder to self: do the math first. DELAY has a granularity of ~30.5us, not 7.8125ms. Fix comment to reflect this. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#15 (text+ko) ==== @@ -590,7 +590,7 @@ if (phy != 0) return (0xffff); sc = device_get_softc(dev); - DELAY(1); /* Hangs w/o this delay really 7.812ms atm */ + DELAY(1); /* Hangs w/o this delay really 30.5us atm */ WR4(sc, ETH_MAN, ETH_MAN_REG_RD(phy, reg)); while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) continue; From owner-p4-projects@FreeBSD.ORG Sat Jan 7 01:56:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D46CB16A422; Sat, 7 Jan 2006 01:56:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 948A116A41F for ; Sat, 7 Jan 2006 01:56:37 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 430E443D46 for ; Sat, 7 Jan 2006 01:56:37 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k071ubxt070225 for ; Sat, 7 Jan 2006 01:56:37 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k071uahr070222 for perforce@freebsd.org; Sat, 7 Jan 2006 01:56:36 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 7 Jan 2006 01:56:36 GMT Message-Id: <200601070156.k071uahr070222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 89314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 01:56:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=89314 Change 89314 by kmacy@kmacy:freebsd7_xen3 on 2006/01/07 01:56:08 update to event channel management to handle physical irqs this another small piece for dom0 support Affected files ... .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/evtchn.c#2 edit Differences ... ==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/evtchn.c#2 (text+ko) ==== @@ -3,7 +3,8 @@ * * Communication via Xen event channels. * - * Copyright (c) 2002-2004, K A Fraser + * Copyright (c) 2002-2005, K A Fraser + * Copyright (c) 2005-2006 Kip Macy */ #include #include @@ -24,6 +25,47 @@ +/* linux helper functions that got sucked in + * rename and move XXX + */ + + +#define BITS_PER_LONG 32 +#define NR_CPUS MAX_VIRT_CPUS + +#define BITS_TO_LONGS(bits) \ + (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) +#define DECLARE_BITMAP(name,bits) \ + unsigned long name[BITS_TO_LONGS(bits)] +typedef struct { DECLARE_BITMAP(bits, NR_CPUS); } xen_cpumask_t; +static inline int find_first_bit(const unsigned long *addr, unsigned size) +{ + int d0, d1; + int res; + + /* This looks at memory. Mark it volatile to tell gcc not to move it around */ + __asm__ __volatile__( + "xorl %%eax,%%eax\n\t" + "repe; scasl\n\t" + "jz 1f\n\t" + "leal -4(%%edi),%%edi\n\t" + "bsfl (%%edi),%%eax\n" + "1:\tsubl %%ebx,%%edi\n\t" + "shll $3,%%edi\n\t" + "addl %%edi,%%eax" + :"=a" (res), "=&c" (d0), "=&D" (d1) + :"1" ((size + 31) >> 5), "2" (addr), "b" (addr) : "memory"); + return res; +} + +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) +#define first_cpu(src) __first_cpu(&(src), NR_CPUS) +static inline int __first_cpu(const xen_cpumask_t *srcp, int nbits) +{ + return min_t(int, nbits, find_first_bit(srcp->bits, nbits)); +} + static inline unsigned long __ffs(unsigned long word) { __asm__("bsfl %1,%0" @@ -33,7 +75,24 @@ } static struct mtx irq_mapping_update_lock; +static struct xenpic *xp; +struct xenpic_intsrc { + struct intsrc xp_intsrc; + uint8_t xp_vector; + boolean_t xp_masked; +}; + +struct xenpic { + struct pic *xp_dynirq_pic; + struct pic *xp_pirq_pic; + uint16_t xp_numintr; + struct xenpic_intsrc xp_pins[0]; +}; + + + + #define TODO printf("%s: not implemented!\n", __func__) /* IRQ <-> event-channel mappings. */ @@ -62,12 +121,13 @@ #endif DEFINE_PER_CPU(int, ipi_to_irq[NR_IPIS]); +/* Bitmap indicating which PIRQs require Xen to be notified on unmask. */ +static unsigned long pirq_needs_unmask_notify[NR_PIRQS/sizeof(unsigned long)]; + /* Reference counts for bindings to IRQs. */ static int irq_bindcount[NR_IRQS]; #define VALID_EVTCHN(_chn) ((_chn) != 0) -#define BITS_PER_LONG 32 -#define NR_CPUS MAX_VIRT_CPUS #ifdef CONFIG_SMP @@ -179,7 +239,7 @@ { int irq; - mtx_lock(&irq_mapping_update_lock); + mtx_lock_spin(&irq_mapping_update_lock); if ((irq = evtchn_to_irq[evtchn]) == -1) { irq = find_unbound_irq(); @@ -188,9 +248,10 @@ } irq_bindcount[irq]++; + intr_register_source(&xp->xp_pins[irq].xp_intsrc); + + mtx_unlock_spin(&irq_mapping_update_lock); - mtx_unlock(&irq_mapping_update_lock); - return irq; } @@ -200,7 +261,7 @@ evtchn_op_t op; int evtchn, irq; - mtx_lock(&irq_mapping_update_lock); + mtx_lock_spin(&irq_mapping_update_lock); if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1) { op.cmd = EVTCHNOP_bind_virq; @@ -221,7 +282,7 @@ irq_bindcount[irq]++; - mtx_unlock(&irq_mapping_update_lock); + mtx_unlock_spin(&irq_mapping_update_lock); return irq; } @@ -232,7 +293,7 @@ evtchn_op_t op; int evtchn, irq; - mtx_lock(&irq_mapping_update_lock); + mtx_lock_spin(&irq_mapping_update_lock); if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1) { op.u.bind_ipi.vcpu = cpu; @@ -251,7 +312,7 @@ irq_bindcount[irq]++; - mtx_unlock(&irq_mapping_update_lock); + mtx_unlock_spin(&irq_mapping_update_lock); return irq; } @@ -263,7 +324,7 @@ evtchn_op_t op = { .cmd = EVTCHNOP_close }; int evtchn = evtchn_from_irq(irq); - mtx_lock(&irq_mapping_update_lock); + mtx_lock_spin(&irq_mapping_update_lock); if ((--irq_bindcount[irq] == 0) && VALID_EVTCHN(evtchn)) { op.u.close.port = evtchn; @@ -287,12 +348,9 @@ irq_info[irq] = IRQ_UNBOUND; } - mtx_unlock(&irq_mapping_update_lock); + mtx_unlock_spin(&irq_mapping_update_lock); } - - - int bind_evtchn_to_irqhandler(unsigned int evtchn, const char *devname, @@ -304,6 +362,7 @@ int retval; irq = bind_evtchn_to_irq(evtchn); + intr_register_source(&xp->xp_pins[irq].xp_intsrc); retval = intr_add_handler(devname, irq, handler, arg, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); @@ -324,6 +383,7 @@ int retval; irq = bind_virq_to_irq(virq, cpu); + intr_register_source(&xp->xp_pins[irq].xp_intsrc); retval = intr_add_handler(devname, irq, handler, NULL, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); @@ -353,9 +413,6 @@ return irq; } - - - void unbind_from_irqhandler(unsigned int irq, void *dev_id) { #ifdef notyet @@ -371,11 +428,11 @@ evtchn_op_t op = { .cmd = EVTCHNOP_bind_vcpu }; int evtchn; - mtx_lock(&irq_mapping_update_lock); + mtx_lock_spin(&irq_mapping_update_lock); evtchn = evtchn_from_irq(irq); if (!VALID_EVTCHN(evtchn)) { - mtx_unlock(&irq_mapping_update_lock); + mtx_unlock_spin(&irq_mapping_update_lock); return; } @@ -391,30 +448,17 @@ if (HYPERVISOR_event_channel_op(&op) >= 0) bind_evtchn_to_cpu(evtchn, tcpu); - mtx_unlock(&irq_mapping_update_lock); + mtx_unlock_spin(&irq_mapping_update_lock); - /* - * Now send the new target processor a NOP IPI. When this returns, it - * will check for any pending interrupts, and so service any that got - * delivered to the wrong processor by mistake. - * - * XXX: The only time this is called with interrupts disabled is from - * the hotplug/hotunplug path. In that case, all cpus are stopped with - * interrupts disabled, and the missed interrupts will be picked up - * when they start again. This is kind of a hack. - */ -#if 0 - if (!irqs_disabled()) - smp_call_function(do_nothing_function, NULL, 0, 0); -#endif } -static void set_affinity_irq(unsigned irq, cpumask_t dest) +static void set_affinity_irq(unsigned irq, xen_cpumask_t dest) { unsigned tcpu = first_cpu(dest); rebind_irq_to_cpu(irq, tcpu); } #endif + /* * Interface to generic handling in intr_machdep.c */ @@ -423,114 +467,129 @@ /*------------ interrupt handling --------------------------------------*/ #define TODO printf("%s: not implemented!\n", __func__) - struct mtx xenpic_lock; + +static void xenpic_dynirq_enable_source(struct intsrc *isrc); +static void xenpic_dynirq_disable_source(struct intsrc *isrc, int); +static void xenpic_dynirq_eoi_source(struct intsrc *isrc); +static void xenpic_dynirq_enable_intr(struct intsrc *isrc); -struct xenpic_intsrc { - struct intsrc xp_intsrc; - uint8_t xp_vector; - boolean_t xp_masked; -}; +static void xenpic_pirq_enable_source(struct intsrc *isrc); +static void xenpic_pirq_disable_source(struct intsrc *isrc, int); +static void xenpic_pirq_eoi_source(struct intsrc *isrc); +static void xenpic_pirq_enable_intr(struct intsrc *isrc); -struct xenpic { - struct pic xp_pic; /* this MUST be first */ - uint16_t xp_numintr; - struct xenpic_intsrc xp_pins[0]; -}; -static void xenpic_enable_dynirq_source(struct intsrc *isrc); -static void xenpic_disable_dynirq_source(struct intsrc *isrc, int); -static void xenpic_eoi_source(struct intsrc *isrc); -static void xenpic_enable_dynirq_intr(struct intsrc *isrc); static int xenpic_vector(struct intsrc *isrc); static int xenpic_source_pending(struct intsrc *isrc); static void xenpic_suspend(struct intsrc *isrc); static void xenpic_resume(struct intsrc *isrc); -struct pic xenpic_template = { - xenpic_enable_dynirq_source, - xenpic_disable_dynirq_source, - xenpic_eoi_source, - xenpic_enable_dynirq_intr, - xenpic_vector, - xenpic_source_pending, - xenpic_suspend, - xenpic_resume +struct pic xenpic_dynirq_template = { + xenpic_dynirq_enable_source, + xenpic_dynirq_disable_source, + xenpic_dynirq_eoi_source, + xenpic_dynirq_enable_intr, + xenpic_vector, + xenpic_source_pending, + xenpic_suspend, + xenpic_resume +}; + +struct pic xenpic_pirq_template = { + xenpic_pirq_enable_source, + xenpic_pirq_disable_source, + xenpic_pirq_eoi_source, + xenpic_pirq_enable_intr, + xenpic_vector, + xenpic_source_pending, + xenpic_suspend, + xenpic_resume }; void -xenpic_enable_dynirq_source(struct intsrc *isrc) +xenpic_dynirq_enable_source(struct intsrc *isrc) { unsigned int irq; struct xenpic_intsrc *xp; xp = (struct xenpic_intsrc *)isrc; - + + mtx_lock_spin(&irq_mapping_update_lock); if (xp->xp_masked) { irq = xenpic_vector(isrc); unmask_evtchn(evtchn_from_irq(irq)); xp->xp_masked = FALSE; } + mtx_unlock_spin(&irq_mapping_update_lock); } static void -xenpic_disable_dynirq_source(struct intsrc *isrc, int foo) +xenpic_dynirq_disable_source(struct intsrc *isrc, int foo) { unsigned int irq; struct xenpic_intsrc *xp; xp = (struct xenpic_intsrc *)isrc; + mtx_lock_spin(&irq_mapping_update_lock); if (!xp->xp_masked) { irq = xenpic_vector(isrc); mask_evtchn(evtchn_from_irq(irq)); - clear_evtchn(evtchn_from_irq(irq)); xp->xp_masked = TRUE; - } - + } + mtx_unlock_spin(&irq_mapping_update_lock); } static void -xenpic_enable_dynirq_intr(struct intsrc *isrc) +xenpic_dynirq_enable_intr(struct intsrc *isrc) { unsigned int irq; - + mtx_lock_spin(&irq_mapping_update_lock); irq = xenpic_vector(isrc); unmask_evtchn(evtchn_from_irq(irq)); + mtx_unlock_spin(&irq_mapping_update_lock); } static void -xenpic_eoi_source(struct intsrc *isrc) +xenpic_dynirq_eoi_source(struct intsrc *isrc) { - unsigned int irq = xenpic_vector(isrc); + unsigned int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); unmask_evtchn(evtchn_from_irq(irq)); + mtx_unlock_spin(&irq_mapping_update_lock); } static int xenpic_vector(struct intsrc *isrc) { - struct xenpic_intsrc *pin = (struct xenpic_intsrc *)isrc; + struct xenpic_intsrc *pin; + + pin = (struct xenpic_intsrc *)isrc; + return (pin->xp_vector); } static int xenpic_source_pending(struct intsrc *isrc) { - TODO; - return 0; + TODO; + return 0; } static void xenpic_suspend(struct intsrc *isrc) { - TODO; + TODO; } static void xenpic_resume(struct intsrc *isrc) { - TODO; + TODO; } @@ -541,143 +600,160 @@ if (VALID_EVTCHN(evtchn)) notify_remote_via_evtchn(evtchn); } -#ifdef CONFIG_PHYSDEV + /* required for support of physical devices */ static inline void pirq_unmask_notify(int pirq) { - physdev_op_t op; - if ( unlikely(test_bit(pirq, &pirq_needs_unmask_notify[0])) ) - { - op.cmd = PHYSDEVOP_IRQ_UNMASK_NOTIFY; - (void)HYPERVISOR_physdev_op(&op); - } + physdev_op_t op; + if (unlikely(test_bit(pirq, &pirq_needs_unmask_notify[0]))) { + op.cmd = PHYSDEVOP_IRQ_UNMASK_NOTIFY; + (void)HYPERVISOR_physdev_op(&op); + } } static inline void pirq_query_unmask(int pirq) { - physdev_op_t op; - op.cmd = PHYSDEVOP_IRQ_STATUS_QUERY; - op.u.irq_status_query.irq = pirq; - (void)HYPERVISOR_physdev_op(&op); - clear_bit(pirq, &pirq_needs_unmask_notify[0]); - if ( op.u.irq_status_query.flags & PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY ) - set_bit(pirq, &pirq_needs_unmask_notify[0]); + physdev_op_t op; + op.cmd = PHYSDEVOP_IRQ_STATUS_QUERY; + op.u.irq_status_query.irq = pirq; + (void)HYPERVISOR_physdev_op(&op); + clear_bit(pirq, &pirq_needs_unmask_notify[0]); + if ( op.u.irq_status_query.flags & PHYSDEVOP_IRQ_NEEDS_UNMASK_NOTIFY ) + set_bit(pirq, &pirq_needs_unmask_notify[0]); } /* * On startup, if there is no action associated with the IRQ then we are * probing. In this case we should not share with others as it will confuse us. */ -#define probing_irq(_irq) (irq_desc[(_irq)].action == NULL) +#define probing_irq(_irq) (intr_lookup_source(irq) == NULL) -static unsigned int startup_pirq(unsigned int irq) +static void +xenpic_pirq_enable_intr(struct intsrc *isrc) { - evtchn_op_t op; - int evtchn; + evtchn_op_t op; + int evtchn; + unsigned int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); + evtchn = evtchn_from_irq(irq); - op.cmd = EVTCHNOP_bind_pirq; - op.u.bind_pirq.pirq = irq; - /* NB. We are happy to share unless we are probing. */ - op.u.bind_pirq.flags = probing_irq(irq) ? 0 : BIND_PIRQ__WILL_SHARE; - if ( HYPERVISOR_event_channel_op(&op) != 0 ) - { - if ( !probing_irq(irq) ) /* Some failures are expected when probing. */ - printk(KERN_INFO "Failed to obtain physical IRQ %d\n", irq); - return 0; - } - evtchn = op.u.bind_pirq.port; + if (VALID_EVTCHN(evtchn)) + goto out; - pirq_query_unmask(irq_to_pirq(irq)); + op.cmd = EVTCHNOP_bind_pirq; + op.u.bind_pirq.pirq = irq; + /* NB. We are happy to share unless we are probing. */ + op.u.bind_pirq.flags = probing_irq(irq) ? 0 : BIND_PIRQ__WILL_SHARE; + + if (HYPERVISOR_event_channel_op(&op) != 0) { + if (!probing_irq(irq)) /* Some failures are expected when probing. */ + printf("Failed to obtain physical IRQ %d\n", irq); + mtx_unlock_spin(&irq_mapping_update_lock); + return; + } + evtchn = op.u.bind_pirq.port; - evtchn_to_irq[evtchn] = irq; - evtchn_from_irq(irq) = evtchn; + pirq_query_unmask(irq_to_pirq(irq)); - unmask_evtchn(evtchn); - pirq_unmask_notify(irq_to_pirq(irq)); + bind_evtchn_to_cpu(evtchn, 0); + evtchn_to_irq[evtchn] = irq; + irq_info[irq] = mk_irq_info(IRQT_PIRQ, irq, evtchn); - return 0; + out: + unmask_evtchn(evtchn); + pirq_unmask_notify(irq_to_pirq(irq)); + mtx_unlock_spin(&irq_mapping_update_lock); } -static void shutdown_pirq(unsigned int irq) +#if 0 +static void +xenpic_pirq_disable_intr(struct intsrc *isrc) { - evtchn_op_t op; - int evtchn = evtchn_from_irq(irq); + evtchn_op_t op; + unsigned int irq; + int evtchn; + + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); + evtchn = evtchn_from_irq(irq); - if ( !VALID_EVTCHN(evtchn) ) - return; + if (!VALID_EVTCHN(evtchn)) + goto done; + + mask_evtchn(evtchn); - mask_evtchn(evtchn); + op.cmd = EVTCHNOP_close; + op.u.close.port = evtchn; + PANIC_IF(HYPERVISOR_event_channel_op(&op) != 0); - op.cmd = EVTCHNOP_close; - op.u.close.dom = DOMID_SELF; - op.u.close.port = evtchn; - if ( HYPERVISOR_event_channel_op(&op) != 0 ) - panic("Failed to unbind physical IRQ %d\n", irq); - - evtchn_to_irq[evtchn] = -1; - evtchn_from_irq(irq) = -1; + bind_evtchn_to_cpu(evtchn, 0); + evtchn_to_irq[evtchn] = -1; + irq_info[irq] = IRQ_UNBOUND; + done: + mtx_unlock_spin(&irq_mapping_update_lock); } +#endif -static void enable_pirq(unsigned int irq) +static void +xenpic_pirq_enable_source(struct intsrc *isrc) { - int evtchn = evtchn_from_irq(irq); - if ( !VALID_EVTCHN(evtchn) ) - return; - unmask_evtchn(evtchn); - pirq_unmask_notify(irq_to_pirq(irq)); + int evtchn; + unsigned int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); + evtchn = evtchn_from_irq(irq); + + if (!VALID_EVTCHN(evtchn)) + goto done; + + unmask_evtchn(evtchn); + pirq_unmask_notify(irq_to_pirq(irq)); + done: + mtx_unlock_spin(&irq_mapping_update_lock); } -static void disable_pirq(unsigned int irq) +static void +xenpic_pirq_disable_source(struct intsrc *isrc, int eoi) { - int evtchn = evtchn_from_irq(irq); - if ( !VALID_EVTCHN(evtchn) ) - return; - mask_evtchn(evtchn); -} + int evtchn; + unsigned int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); + evtchn = evtchn_from_irq(irq); -static void ack_pirq(unsigned int irq) -{ - int evtchn = evtchn_from_irq(irq); - if ( !VALID_EVTCHN(evtchn) ) - return; - mask_evtchn(evtchn); - clear_evtchn(evtchn); -} + if (!VALID_EVTCHN(evtchn)) + goto done; -static void end_pirq(unsigned int irq) -{ - int evtchn = evtchn_from_irq(irq); - if ( !VALID_EVTCHN(evtchn) ) - return; - if ( !(irq_desc[irq].status & IRQ_DISABLED) ) - { - unmask_evtchn(evtchn); - pirq_unmask_notify(irq_to_pirq(irq)); - } + mask_evtchn(evtchn); + done: + mtx_unlock_spin(&irq_mapping_update_lock); } -static struct hw_interrupt_type pirq_type = { - "Phys-irq", - startup_pirq, - shutdown_pirq, - enable_pirq, - disable_pirq, - ack_pirq, - end_pirq, - NULL -}; -#endif -#if 0 static void -misdirect_interrupt(void *sc) +xenpic_pirq_eoi_source(struct intsrc *isrc) { -} + int evtchn; + unsigned int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + irq = xenpic_vector(isrc); + evtchn = evtchn_from_irq(irq); + if (!VALID_EVTCHN(evtchn)) + goto done; -#endif + unmask_evtchn(evtchn); + pirq_unmask_notify(irq_to_pirq(irq)); + done: + mtx_unlock_spin(&irq_mapping_update_lock); +} void mask_evtchn(int port) @@ -717,8 +793,6 @@ } } - - void irq_resume(void) { evtchn_op_t op; @@ -798,8 +872,7 @@ evtchn_init(void *dummy __unused) { int i, cpu; - struct xenpic *xp; - struct xenpic_intsrc *pin; + struct xenpic_intsrc *pin, *tpin; /* No VIRQ or IPI bindings. */ for (cpu = 0; cpu < NR_CPUS; cpu++) { @@ -819,27 +892,27 @@ for (i = 0; i < NR_IRQS; i++) irq_info[i] = IRQ_UNBOUND; - xp = malloc(sizeof(struct xenpic) + NR_DYNIRQS*sizeof(struct xenpic_intsrc), M_DEVBUF, M_WAITOK); - xp->xp_pic = xenpic_template; - xp->xp_numintr = NR_DYNIRQS; - bzero(xp->xp_pins, sizeof(struct xenpic_intsrc) * NR_DYNIRQS); + xp = malloc(sizeof(struct xenpic) + NR_IRQS*sizeof(struct xenpic_intsrc), + M_DEVBUF, M_WAITOK); + + xp->xp_dynirq_pic = &xenpic_dynirq_template; + xp->xp_pirq_pic = &xenpic_pirq_template; + xp->xp_numintr = NR_IRQS; + bzero(xp->xp_pins, sizeof(struct xenpic_intsrc) * NR_IRQS); - for (i = 0, pin = xp->xp_pins; i < NR_DYNIRQS; i++, pin++) { + for (i = 0,pin = xp->xp_pins; i < NR_DYNIRQS; i++) { /* Dynamic IRQ space is currently unbound. Zero the refcnts. */ irq_bindcount[dynirq_to_irq(i)] = 0; - - pin->xp_intsrc.is_pic = (struct pic *)xp; - pin->xp_vector = i; - intr_register_source(&pin->xp_intsrc); + + tpin = &pin[dynirq_to_irq(i)]; + tpin->xp_intsrc.is_pic = xp->xp_dynirq_pic; + tpin->xp_vector = dynirq_to_irq(i); } - /* We don't currently have any support for physical devices in XenoFreeBSD - * so leaving this out for the moment for the sake of expediency. - */ -#ifdef notyet - /* Phys IRQ space is statically bound (1:1 mapping). Nail refcnts. */ - for (i = 0; i < NR_PIRQS; i++) - { - irq_bindcount[pirq_to_irq(i)] = 1; + + + for (i = 0, pin = xp->xp_pins; i < NR_PIRQS; i++) { + /* Dynamic IRQ space is currently unbound. Zero the refcnts. */ + irq_bindcount[pirq_to_irq(i)] = 0; #ifdef RTC_IRQ /* If not domain 0, force our RTC driver to fail its probe. */ @@ -847,21 +920,18 @@ !(xen_start_info->flags & SIF_INITDOMAIN)) continue; #endif - - irq_desc[pirq_to_irq(i)].status = IRQ_DISABLED; - irq_desc[pirq_to_irq(i)].action = NULL; - irq_desc[pirq_to_irq(i)].depth = 1; - irq_desc[pirq_to_irq(i)].handler = &pirq_type; + tpin = &pin[pirq_to_irq(i)]; + tpin->xp_intsrc.is_pic = xp->xp_pirq_pic; + tpin->xp_vector = pirq_to_irq(i); } -#endif } SYSINIT(evtchn_init, SI_SUB_INTR, SI_ORDER_ANY, evtchn_init, NULL); /* - * xenpic_lock: in order to allow an interrupt to occur in a critical + * irq_mapping_update_lock: in order to allow an interrupt to occur in a critical * section, to set pcpu->ipending (etc...) properly, we * must be able to get the icu lock, so it can't be * under witness. */ -MTX_SYSINIT(irq_mapping_update_lock, &irq_mapping_update_lock, "xp", MTX_DEF|MTX_NOWITNESS); +MTX_SYSINIT(irq_mapping_update_lock, &irq_mapping_update_lock, "xp", MTX_SPIN); From owner-p4-projects@FreeBSD.ORG Sat Jan 7 02:37:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFA0916A422; Sat, 7 Jan 2006 02:37:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EBBD16A41F for ; Sat, 7 Jan 2006 02:37:27 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2898A43D45 for ; Sat, 7 Jan 2006 02:37:27 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k072bRW1072152 for ; Sat, 7 Jan 2006 02:37:27 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k072bQXv072149 for perforce@freebsd.org; Sat, 7 Jan 2006 02:37:26 GMT (envelope-from wsalamon@computer.org) Date: Sat, 7 Jan 2006 02:37:26 GMT Message-Id: <200601070237.k072bQXv072149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 89316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 02:37:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=89316 Change 89316 by wsalamon@gretsch on 2006/01/07 02:37:24 Change the names of the audit sources to match the renaming done previously. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/conf/files#10 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/conf/files#10 (text+ko) ==== @@ -1846,10 +1846,10 @@ security/audit/audit_arg.c optional audit security/audit/audit_syscalls.c standard security/audit/audit_trigger.c optional audit -security/audit/kern_audit.c optional audit -security/audit/kern_bsm_audit.c optional audit -security/audit/kern_bsm_klib.c optional audit -security/audit/kern_bsm_token.c optional audit +security/audit/audit.c optional audit +security/audit/audit_bsm.c optional audit +security/audit/audit_bsm_klib.c optional audit +security/audit/audit_bsm_token.c optional audit security/mac/mac_inet.c optional mac inet security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac From owner-p4-projects@FreeBSD.ORG Sat Jan 7 04:05:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A50D16A43C; Sat, 7 Jan 2006 04:05:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB86916A4E9 for ; Sat, 7 Jan 2006 04:05:24 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54E8843D46 for ; Sat, 7 Jan 2006 04:05:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0745D8s075892 for ; Sat, 7 Jan 2006 04:05:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0745DG7075889 for perforce@freebsd.org; Sat, 7 Jan 2006 04:05:13 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 04:05:13 GMT Message-Id: <200601070405.k0745DG7075889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 04:05:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=89318 Change 89318 by imp@imp_hammer on 2006/01/07 04:04:47 Move the ST register definitions into at91streg.h Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#12 edit .. //depot/projects/arm/src/sys/arm/at91/at91streg.h#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91rm92reg.h#12 (text+ko) ==== @@ -270,25 +270,6 @@ #define AT91RM92_ST_BASE 0xffffd00 #define AT91RM92_ST_SIZE 0x100 -#define ST_CR 0x00 /* Control register */ -#define ST_CR_WDRST (1U << 0) /* WDRST: Watchdog Timer Restart */ -#define ST_PIMR 0x04 /* Period interval mode register */ -#define ST_WDMR 0x08 /* Watchdog mode register */ -#define ST_WDMR_EXTEN (1U << 17) /* EXTEN: External Signal Assert Enable */ -#define ST_WDMR_RSTEN (1U << 16) /* RSTEN: Reset Enable */ -#define ST_RTMR 0x0c /* Real-time mode register */ -#define ST_SR 0x10 /* Status register */ -#define ST_SR_PITS (1U << 0) /* PITS: Period Interval Timer Status */ -#define ST_SR_WDOVF (1U << 1) /* WDOVF: Watchdog Overflow */ -#define ST_SR_RTTINC (1U << 2) /* RTTINC: Real-time Timer Increment */ -#define ST_SR_ALMS (1U << 3) /* ALMS: Alarm Status */ -#define ST_IER 0x14 /* Interrupt enable register */ -#define ST_IDR 0x18 /* Interrupt disable register */ -#define ST_IMR 0x1c /* Interrupt mask register */ -#define ST_RTAR 0x20 /* Real-time alarm register */ -#define ST_CRTR 0x24 /* Current real-time register */ -#define ST_CRTR_MASK 0xfffff /* 20-bit counter */ - #define AT91RM92_SPI_BASE 0xffe0000 #define AT91RM92_SPI_SIZE 0x4000 #define AT91RM92_SPI_PDC 0xffe0100 From owner-p4-projects@FreeBSD.ORG Sat Jan 7 04:16:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0099616A422; Sat, 7 Jan 2006 04:16:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C513416A41F for ; Sat, 7 Jan 2006 04:16:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5929D43D45 for ; Sat, 7 Jan 2006 04:16:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k074GeUF076726 for ; Sat, 7 Jan 2006 04:16:40 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k074Gd3L076723 for perforce@freebsd.org; Sat, 7 Jan 2006 04:16:39 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 04:16:39 GMT Message-Id: <200601070416.k074Gd3L076723@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 04:16:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=89319 Change 89319 by imp@imp_plunger on 2006/01/07 04:15:39 Include at91streg.h Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91st.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91st.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include static struct at91st_softc { @@ -80,6 +81,8 @@ static int at91st_probe(device_t dev) { + + device_set_desc(dev, "ST"); return (0); } From owner-p4-projects@FreeBSD.ORG Sat Jan 7 07:45:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 230E216A423; Sat, 7 Jan 2006 07:45:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D769216A41F for ; Sat, 7 Jan 2006 07:45:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8937143D46 for ; Sat, 7 Jan 2006 07:45:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k077jtVr093800 for ; Sat, 7 Jan 2006 07:45:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k077jtZG093797 for perforce@freebsd.org; Sat, 7 Jan 2006 07:45:55 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 07:45:55 GMT Message-Id: <200601070745.k077jtZG093797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 07:45:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=89328 Change 89328 by imp@imp_plunger on 2006/01/07 07:45:21 Looks like the other arm ports use the cpu_driver.[ch] convention, so use that rather than cpudriver. Sorry for the churn. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/arm/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/arm/src/sys/arm/at91/at91st.c#4 delete .. //depot/projects/arm/src/sys/arm/at91/at91streg.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 7 07:46:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C249E16A496; Sat, 7 Jan 2006 07:46:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 991E016A496 for ; Sat, 7 Jan 2006 07:46:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49A3243D45 for ; Sat, 7 Jan 2006 07:46:57 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k077kv5U093859 for ; Sat, 7 Jan 2006 07:46:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k077kuVQ093856 for perforce@freebsd.org; Sat, 7 Jan 2006 07:46:57 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 07:46:57 GMT Message-Id: <200601070746.k077kuVQ093856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 07:46:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=89329 Change 89329 by imp@imp_plunger on 2006/01/07 07:46:05 missed one. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_usartreg.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jan 7 07:49:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5C0E16A422; Sat, 7 Jan 2006 07:49:08 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7BB0516A41F for ; Sat, 7 Jan 2006 07:49:08 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17B6643D64 for ; Sat, 7 Jan 2006 07:49:01 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k077n1Se093938 for ; Sat, 7 Jan 2006 07:49:01 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k077n1ae093931 for perforce@freebsd.org; Sat, 7 Jan 2006 07:49:01 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 07:49:01 GMT Message-Id: <200601070749.k077n1ae093931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 07:49:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=89330 Change 89330 by imp@imp_plunger on 2006/01/07 07:48:24 Adapt to new file names Affected files ... .. //depot/projects/arm/src/sys/arm/at91/at91_st.c#2 edit .. //depot/projects/arm/src/sys/arm/at91/at91usartreg.h#4 delete .. //depot/projects/arm/src/sys/arm/at91/files.at91rm92#8 edit .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/at91_st.c#2 (text+ko) ==== @@ -42,8 +42,8 @@ #include #include #include -#include #include +#include static struct at91st_softc { bus_space_tag_t sc_st; ==== //depot/projects/arm/src/sys/arm/at91/files.at91rm92#8 (text+ko) ==== @@ -2,7 +2,7 @@ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91.c standard -arm/at91/at91st.c standard +arm/at91/at91_st.c standard arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include "uart_if.h" From owner-p4-projects@FreeBSD.ORG Sat Jan 7 13:44:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B7CA16A422; Sat, 7 Jan 2006 13:44:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A8BD16A41F for ; Sat, 7 Jan 2006 13:44:57 +0000 (GMT) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C39843D45 for ; Sat, 7 Jan 2006 13:44:56 +0000 (GMT) (envelope-from bz@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 k07DiuoJ022208 for ; Sat, 7 Jan 2006 13:44:56 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k07DiP2w022195 for perforce@freebsd.org; Sat, 7 Jan 2006 13:44:25 GMT (envelope-from bz@freebsd.org) Date: Sat, 7 Jan 2006 13:44:25 GMT Message-Id: <200601071344.k07DiP2w022195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 89333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 13:44:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=89333 Change 89333 by bz@bz_dopt_ah on 2006/01/07 13:42:36 IFC @89327 Note: still need to catch up with lots of changes to make the tree compile again. Affected files ... .. //depot/projects/s390/MAINTAINERS#13 integrate .. //depot/projects/s390/Makefile#12 integrate .. //depot/projects/s390/Makefile.inc1#21 integrate .. //depot/projects/s390/ObsoleteFiles.inc#2 integrate .. //depot/projects/s390/UPDATING#14 integrate .. //depot/projects/s390/bin/cp/cp.c#8 integrate .. //depot/projects/s390/bin/cp/extern.h#6 integrate .. //depot/projects/s390/bin/cp/utils.c#7 integrate .. //depot/projects/s390/bin/csh/config_p.h#2 integrate .. //depot/projects/s390/bin/date/date.1#6 integrate .. //depot/projects/s390/bin/kenv/kenv.1#4 integrate .. //depot/projects/s390/bin/kenv/kenv.c#4 integrate .. //depot/projects/s390/bin/ls/ls.1#7 integrate .. //depot/projects/s390/bin/ls/ls.c#8 integrate .. //depot/projects/s390/bin/ls/util.c#4 integrate .. //depot/projects/s390/bin/mv/mv.c#4 integrate .. //depot/projects/s390/bin/rm/rm.1#5 integrate .. //depot/projects/s390/bin/rm/rm.c#5 integrate .. //depot/projects/s390/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/s390/bin/sh/alias.c#4 integrate .. //depot/projects/s390/bin/sh/builtins.def#5 integrate .. //depot/projects/s390/bin/sh/eval.c#5 integrate .. //depot/projects/s390/bin/sh/eval.h#4 integrate .. //depot/projects/s390/bin/sh/exec.c#5 integrate .. //depot/projects/s390/bin/sh/exec.h#4 integrate .. //depot/projects/s390/bin/sh/expand.c#8 integrate .. //depot/projects/s390/bin/sh/histedit.c#5 integrate .. //depot/projects/s390/bin/sh/jobs.c#8 integrate .. //depot/projects/s390/bin/sh/memalloc.c#7 integrate .. //depot/projects/s390/bin/sh/memalloc.h#3 integrate .. //depot/projects/s390/bin/sh/miscbltin.c#4 integrate .. //depot/projects/s390/bin/sh/options.c#3 integrate .. //depot/projects/s390/bin/sh/output.c#5 integrate .. //depot/projects/s390/bin/sh/sh.1#10 integrate .. //depot/projects/s390/bin/sh/show.c#5 integrate .. //depot/projects/s390/bin/sh/trap.c#4 integrate .. //depot/projects/s390/bin/sh/var.c#6 integrate .. //depot/projects/s390/contrib/amd/amd/amd.8#5 integrate .. //depot/projects/s390/contrib/bc/bc/main.c#3 integrate .. //depot/projects/s390/contrib/bind9/CHANGES#2 integrate .. //depot/projects/s390/contrib/bind9/FAQ#2 integrate .. //depot/projects/s390/contrib/bind9/FAQ.xml#1 branch .. //depot/projects/s390/contrib/bind9/FREEBSD-Upgrade#2 integrate .. //depot/projects/s390/contrib/bind9/FREEBSD-Xlist#2 integrate .. //depot/projects/s390/contrib/bind9/README#2 integrate .. //depot/projects/s390/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signkey.8#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signkey.c#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signkey.html#2 delete .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/aclconf.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch .. //depot/projects/s390/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/nsupdate/nsupdate.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/s390/contrib/bind9/config.threads.in#1 branch .. //depot/projects/s390/contrib/bind9/configure.in#2 integrate .. //depot/projects/s390/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/Bv9ARM.pdf#1 branch .. //depot/projects/s390/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/doc/arm/isc.color.gif#2 delete .. //depot/projects/s390/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#2 delete .. //depot/projects/s390/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#2 delete .. //depot/projects/s390/contrib/bind9/doc/arm/validate.sh.in#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-09.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-00.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-06.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-02.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-01.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-04.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-08.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-04.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-04.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-04.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#2 delete .. //depot/projects/s390/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/s390/contrib/bind9/doc/rfc/index#2 integrate .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc3757.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc3901.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc4025.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc4033.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc4034.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc4035.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc4074.txt#1 branch .. //depot/projects/s390/contrib/bind9/doc/rfc/rfc4159.txt#1 branch .. //depot/projects/s390/contrib/bind9/lib/bind/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/api#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/config.h.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/configure#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/dst/dst_api.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/dst/hmac_link.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/dst/md5.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/dst/md5_dgst.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/dst/support.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/include/isc/eventlib.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/include/resolv.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/include/resolv_mt.h#1 branch .. //depot/projects/s390/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/inet/inet_ntop.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/inet/inet_pton.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/inet/nsap_addr.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/irs/dns_ho.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/irs/gethostent_r.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/irs/getnetent_r.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/irs/hesiod.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/isc/ev_connects.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/isc/ev_files.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/isc/eventlib.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/isc/eventlib_p.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/isc/memcluster.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/nameser/ns_parse.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/nameser/ns_verify.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/port_after.h.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/port_before.h.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/mtctxres.c#1 branch .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_comp.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_debug.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_init.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_send.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/pthreads/mutex.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/quota.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/result.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/rwlock.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/entropy.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/ifiter_ioctl.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/ifiter_sysctl.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/net.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/os.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isc/unix/stdtime.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/s390/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/Makefile.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/api#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/getaddrinfo.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/getipnode.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/include/lwres/platform.h.in#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/include/lwres/stdlib.h#1 branch .. //depot/projects/s390/contrib/bind9/lib/lwres/lwconfig.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/lwinetntop.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/lwinetpton.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_buffer.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_buffer.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_buffer.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_config.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_config.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_config.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_context.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_context.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_context.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gabn.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gabn.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gabn.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gai_strerror.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gai_strerror.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gethostent.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gethostent.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gethostent.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getipnode.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getipnode.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getipnode.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getnameinfo.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getnameinfo.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gnba.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gnba.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_gnba.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_hstrerror.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_hstrerror.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_hstrerror.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_inetntop.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_inetntop.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_inetntop.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_noop.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_noop.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_noop.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_packet.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_packet.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_packet.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_resutil.3#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_resutil.docbook#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/man/lwres_resutil.html#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/print.c#2 integrate .. //depot/projects/s390/contrib/bind9/lib/lwres/strtoul.c#1 branch .. //depot/projects/s390/contrib/bind9/make/rules.in#2 integrate .. //depot/projects/s390/contrib/bind9/version#2 integrate .. //depot/projects/s390/contrib/bsnmp/FREEBSD-Xlist#2 integrate .. //depot/projects/s390/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/s390/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/s390/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 integrate .. //depot/projects/s390/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/s390/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_ntp/BEGEMOT-NTP-MIB.txt#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmp_ntp/snmp_ntp.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/.gdbinit#2 delete .. //depot/projects/s390/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/trans_udp.c#2 integrate .. //depot/projects/s390/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/s390/contrib/cpio/ABOUT-NLS#1 branch .. //depot/projects/s390/contrib/cpio/AUTHORS#1 branch .. //depot/projects/s390/contrib/cpio/COPYING#2 integrate .. //depot/projects/s390/contrib/cpio/COPYING.LIB#2 delete .. //depot/projects/s390/contrib/cpio/ChangeLog#2 integrate .. //depot/projects/s390/contrib/cpio/FREEBSD-upgrade#3 integrate .. //depot/projects/s390/contrib/cpio/INSTALL#1 branch .. //depot/projects/s390/contrib/cpio/NEWS#2 integrate .. //depot/projects/s390/contrib/cpio/README#2 integrate .. //depot/projects/s390/contrib/cpio/THANKS#1 branch .. //depot/projects/s390/contrib/cpio/TODO#1 branch .. //depot/projects/s390/contrib/cpio/alloca.c#2 delete .. //depot/projects/s390/contrib/cpio/copyin.c#2 delete .. //depot/projects/s390/contrib/cpio/copyout.c#2 delete .. //depot/projects/s390/contrib/cpio/copypass.c#3 delete .. //depot/projects/s390/contrib/cpio/cpio.1#2 delete .. //depot/projects/s390/contrib/cpio/cpio.h#2 delete .. //depot/projects/s390/contrib/cpio/cpio.texi#2 delete .. //depot/projects/s390/contrib/cpio/cpiohdr.h#2 delete .. //depot/projects/s390/contrib/cpio/defer.c#2 delete .. //depot/projects/s390/contrib/cpio/defer.h#2 delete .. //depot/projects/s390/contrib/cpio/dirname.c#2 delete .. //depot/projects/s390/contrib/cpio/doc/cpio.1#1 branch .. //depot/projects/s390/contrib/cpio/doc/cpio.texi#1 branch .. //depot/projects/s390/contrib/cpio/dstring.c#2 delete .. //depot/projects/s390/contrib/cpio/dstring.h#2 delete .. //depot/projects/s390/contrib/cpio/error.c#2 delete .. //depot/projects/s390/contrib/cpio/extern.h#2 delete .. //depot/projects/s390/contrib/cpio/filemode.c#2 delete .. //depot/projects/s390/contrib/cpio/filetypes.h#2 delete .. //depot/projects/s390/contrib/cpio/global.c#2 delete .. //depot/projects/s390/contrib/cpio/idcache.c#2 delete .. //depot/projects/s390/contrib/cpio/lib/alloca_.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-ba.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-eexst.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-fmtstream.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-fmtstream.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-fs-xinl.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-help.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-namefrob.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-parse.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-pv.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-pvh.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp-xinl.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/argp.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/basename.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/dirname.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/dirname.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/error.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/error.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/exit.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/exitfail.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/exitfail.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/full-write.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/full-write.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/getopt.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/getopt1.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/getopt_.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/getopt_int.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/gettext.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/localedir.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/mempcpy.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/mempcpy.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/rmt.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/rtapelib.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/safe-read.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/safe-read.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/safe-write.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/safe-write.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/savedir.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/savedir.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/strcase.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/strchrnul.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/strchrnul.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/stripslash.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/strndup.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/strndup.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/strnlen.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/system.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/unlocked-io.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/xalloc-die.c#1 branch .. //depot/projects/s390/contrib/cpio/lib/xalloc.h#1 branch .. //depot/projects/s390/contrib/cpio/lib/xmalloc.c#1 branch .. //depot/projects/s390/contrib/cpio/main.c#2 delete .. //depot/projects/s390/contrib/cpio/makepath.c#2 delete .. //depot/projects/s390/contrib/cpio/rmt.h#2 delete .. //depot/projects/s390/contrib/cpio/rtapelib.c#2 delete .. //depot/projects/s390/contrib/cpio/safe-stat.h#2 delete .. //depot/projects/s390/contrib/cpio/src/copyin.c#1 branch .. //depot/projects/s390/contrib/cpio/src/copyout.c#1 branch .. //depot/projects/s390/contrib/cpio/src/copypass.c#1 branch .. //depot/projects/s390/contrib/cpio/src/cpio.h#1 branch .. //depot/projects/s390/contrib/cpio/src/cpiohdr.h#1 branch .. //depot/projects/s390/contrib/cpio/src/defer.c#1 branch .. //depot/projects/s390/contrib/cpio/src/defer.h#1 branch .. //depot/projects/s390/contrib/cpio/src/dstring.c#1 branch .. //depot/projects/s390/contrib/cpio/src/dstring.h#1 branch .. //depot/projects/s390/contrib/cpio/src/extern.h#1 branch .. //depot/projects/s390/contrib/cpio/src/filemode.c#1 branch .. //depot/projects/s390/contrib/cpio/src/filetypes.h#1 branch .. //depot/projects/s390/contrib/cpio/src/global.c#1 branch .. //depot/projects/s390/contrib/cpio/src/idcache.c#1 branch .. //depot/projects/s390/contrib/cpio/src/main.c#1 branch .. //depot/projects/s390/contrib/cpio/src/makepath.c#1 branch .. //depot/projects/s390/contrib/cpio/src/safe-stat.h#1 branch .. //depot/projects/s390/contrib/cpio/src/tar.c#1 branch .. //depot/projects/s390/contrib/cpio/src/tar.h#1 branch .. //depot/projects/s390/contrib/cpio/src/tarhdr.h#1 branch .. //depot/projects/s390/contrib/cpio/src/userspec.c#1 branch .. //depot/projects/s390/contrib/cpio/src/util.c#1 branch .. //depot/projects/s390/contrib/cpio/stripslash.c#2 delete .. //depot/projects/s390/contrib/cpio/system.h#2 delete .. //depot/projects/s390/contrib/cpio/tar.c#3 delete .. //depot/projects/s390/contrib/cpio/tar.h#2 delete .. //depot/projects/s390/contrib/cpio/tarhdr.h#2 delete .. //depot/projects/s390/contrib/cpio/userspec.c#2 delete .. //depot/projects/s390/contrib/cpio/util.c#2 delete .. //depot/projects/s390/contrib/cpio/version.c#2 delete .. //depot/projects/s390/contrib/cpio/xmalloc.c#2 delete .. //depot/projects/s390/contrib/cpio/xstrdup.c#2 delete .. //depot/projects/s390/contrib/cvs/src/cvsbug.in#4 integrate .. //depot/projects/s390/contrib/gcc/c-decl.c#7 integrate .. //depot/projects/s390/contrib/gcc/config/freebsd-spec.h#8 integrate .. //depot/projects/s390/contrib/groff/COPYING#2 integrate .. //depot/projects/s390/contrib/groff/ChangeLog#4 integrate .. //depot/projects/s390/contrib/groff/ChangeLog.115#1 branch .. //depot/projects/s390/contrib/groff/ChangeLog.116#1 branch .. //depot/projects/s390/contrib/groff/ChangeLog.117#1 branch .. //depot/projects/s390/contrib/groff/ChangeLog.118#1 branch .. //depot/projects/s390/contrib/groff/FDL#2 integrate .. //depot/projects/s390/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/s390/contrib/groff/INSTALL#4 integrate .. //depot/projects/s390/contrib/groff/INSTALL.gen#3 integrate .. //depot/projects/s390/contrib/groff/LICENSE#1 branch .. //depot/projects/s390/contrib/groff/MANIFEST#3 integrate .. //depot/projects/s390/contrib/groff/MORE.STUFF#3 integrate .. //depot/projects/s390/contrib/groff/Makefile#2 integrate .. //depot/projects/s390/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/s390/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/s390/contrib/groff/Makefile.cpg#3 integrate .. //depot/projects/s390/contrib/groff/Makefile.in#4 integrate .. //depot/projects/s390/contrib/groff/Makefile.init#2 integrate .. //depot/projects/s390/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/NEWS#4 integrate .. //depot/projects/s390/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/s390/contrib/groff/PROJECTS#2 integrate .. //depot/projects/s390/contrib/groff/README#3 integrate .. //depot/projects/s390/contrib/groff/README.MinGW#1 branch .. //depot/projects/s390/contrib/groff/README.WIN32#2 delete .. //depot/projects/s390/contrib/groff/REVISION#4 integrate .. //depot/projects/s390/contrib/groff/TODO#2 integrate .. //depot/projects/s390/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/s390/contrib/groff/configure#4 integrate .. //depot/projects/s390/contrib/groff/configure.ac#4 integrate .. //depot/projects/s390/contrib/groff/contrib/eqn2graph/eqn2graph.man#2 integrate .. //depot/projects/s390/contrib/groff/contrib/eqn2graph/eqn2graph.sh#2 integrate .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/ChangeLog#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/Makefile.sub#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/README#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/gdiffmk.man#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/gdiffmk.sh#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/file1#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/file2#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/runtests.in#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/test_baseline#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/test_baseline10#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/test_baseline6#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/test_baseline7#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/test_baseline8#1 branch .. //depot/projects/s390/contrib/groff/contrib/gdiffmk/tests/test_baseline9#1 branch .. //depot/projects/s390/contrib/groff/contrib/grap2graph/Makefile.sub#1 branch .. //depot/projects/s390/contrib/groff/contrib/grap2graph/grap2graph.man#1 branch .. //depot/projects/s390/contrib/groff/contrib/grap2graph/grap2graph.sh#1 branch .. //depot/projects/s390/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/s390/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/s390/contrib/groff/contrib/groffer/README#2 integrate .. //depot/projects/s390/contrib/groff/contrib/groffer/README_SH#1 branch .. //depot/projects/s390/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/s390/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/s390/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/s390/contrib/groff/contrib/groffer/groffer2.sh#1 branch .. //depot/projects/s390/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/s390/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/s390/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/s390/contrib/groff/contrib/mm/mmroff.pl#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/TODO#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/copyright#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/examples/README.mom#2 delete .. //depot/projects/s390/contrib/groff/contrib/mom/examples/README.txt#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/examples/elvis_syntax.new#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/examples/macros.mom#2 delete .. //depot/projects/s390/contrib/groff/contrib/mom/examples/sample_docs.mom#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/examples/typeset.mom#3 delete .. //depot/projects/s390/contrib/groff/contrib/mom/examples/typesetting.mom#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/examples/typewrite.mom#2 delete .. //depot/projects/s390/contrib/groff/contrib/mom/groff_mom.man#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/appendices.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/color.html#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/cover.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/definitions.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/headfootpage.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/letters.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/macrolist.html#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/rectoverso.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/refer.html#1 branch .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/typemacdoc.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/momdoc/using.html#2 integrate .. //depot/projects/s390/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/s390/contrib/groff/contrib/pdfmark/ChangeLog#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/Makefile.sub#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/PROBLEMS#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/README#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/TODO#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/cover.ms#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/pdfmark.ms#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/pdfmark.tmac#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/pdfroff.man#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/pdfroff.sh#1 branch .. //depot/projects/s390/contrib/groff/contrib/pdfmark/spdf.tmac#1 branch .. //depot/projects/s390/contrib/groff/contrib/pic2graph/pic2graph.man#2 integrate .. //depot/projects/s390/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/s390/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/s390/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/s390/contrib/groff/doc/fdl.texi#2 integrate .. //depot/projects/s390/contrib/groff/doc/fixinfo.sh#1 branch .. //depot/projects/s390/contrib/groff/doc/groff#3 integrate .. //depot/projects/s390/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/s390/contrib/groff/doc/groff-10#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-11#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/s390/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/s390/contrib/groff/doc/groff-4#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-5#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-6#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-7#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-8#3 delete .. //depot/projects/s390/contrib/groff/doc/groff-9#3 delete .. //depot/projects/s390/contrib/groff/doc/groff.css#1 branch .. //depot/projects/s390/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/s390/contrib/groff/doc/meref.me#3 integrate .. //depot/projects/s390/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/s390/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/s390/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/s390/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/s390/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/s390/contrib/groff/font/devhtml/Makefile.sub#3 integrate .. //depot/projects/s390/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/AB#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/ABI#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/AI#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/AR#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/Makefile.sub#2 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/SYMBOL#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/TNRB#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/TNRBI#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/TNRI#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/TNRR#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/WINGDINGS#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/generate/Makefile#3 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/generate/special.awk#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/generate/symbol.map#1 branch .. //depot/projects/s390/contrib/groff/font/devlj4/generate/text.map#4 integrate .. //depot/projects/s390/contrib/groff/font/devlj4/generate/wingdings.map#1 branch .. //depot/projects/s390/contrib/groff/font/devps/AB#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/ABI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/AI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/AR#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HB#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HNB#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HNBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HNI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HNR#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/HR#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/NB#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/NBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/NI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/NR#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/PB#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/PBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/PI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/PR#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/S#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/s390/contrib/groff/font/devps/TB#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/TBI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/TI#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/TR#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/generate/Makefile#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/generate/afmname#2 integrate .. //depot/projects/s390/contrib/groff/font/devps/generate/textmap#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/prologue.ps#4 integrate .. //depot/projects/s390/contrib/groff/font/devps/symbolmap#4 integrate .. //depot/projects/s390/contrib/groff/font/devutf8/NOTES#4 integrate .. //depot/projects/s390/contrib/groff/font/devutf8/R.proto#4 integrate .. //depot/projects/s390/contrib/groff/install-sh#2 integrate .. //depot/projects/s390/contrib/groff/man/ditroff.man#2 integrate .. //depot/projects/s390/contrib/groff/man/groff.man#4 integrate .. //depot/projects/s390/contrib/groff/man/groff_char.man#4 integrate .. //depot/projects/s390/contrib/groff/man/groff_diff.man#3 integrate .. //depot/projects/s390/contrib/groff/man/groff_font.man#4 integrate .. //depot/projects/s390/contrib/groff/man/groff_out.man#5 integrate .. //depot/projects/s390/contrib/groff/man/groff_tmac.man#3 integrate .. //depot/projects/s390/contrib/groff/man/roff.man#4 integrate .. //depot/projects/s390/contrib/groff/mkinstalldirs#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grodvi/dvi.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grodvi/grodvi.man#4 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/grohtml.man#3 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/html-table.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/html-table.h#3 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/html-text.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/html-text.h#4 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/html.h#3 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/output.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grohtml/post-html.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grolbp/lbp.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grolbp/lbp.h#4 integrate .. //depot/projects/s390/contrib/groff/src/devices/grolj4/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/devices/grolj4/grolj4.man#3 integrate .. //depot/projects/s390/contrib/groff/src/devices/grolj4/lj4.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grolj4/lj4_font.man#1 branch .. //depot/projects/s390/contrib/groff/src/devices/grops/grops.man#4 integrate .. //depot/projects/s390/contrib/groff/src/devices/grops/ps.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grops/ps.h#4 integrate .. //depot/projects/s390/contrib/groff/src/devices/grops/psrm.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/grotty/grotty.man#5 integrate .. //depot/projects/s390/contrib/groff/src/devices/grotty/tty.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/devices/xditview/ChangeLog#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/DESC.in#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/Dvi.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/Dvi.h#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/DviP.h#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/FontMap#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/GXditview.ad#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/Makefile.sub#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/Menu.h#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/README#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/TODO#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/ad2c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/device.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/device.h#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/draw.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/font.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray1.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray2.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray3.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray4.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray5.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray6.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray7.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gray8.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/gxditview.man#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/lex.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/page.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/parse.c#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/xdit.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/xdit_mask.bm#1 branch .. //depot/projects/s390/contrib/groff/src/devices/xditview/xditview.c#1 branch .. //depot/projects/s390/contrib/groff/src/include/DviChar.h#1 branch .. //depot/projects/s390/contrib/groff/src/include/Makefile.sub#3 integrate .. //depot/projects/s390/contrib/groff/src/include/XFontName.h#1 branch .. //depot/projects/s390/contrib/groff/src/include/assert.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/cmap.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/color.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/config.hin#3 integrate .. //depot/projects/s390/contrib/groff/src/include/cset.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/device.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/driver.h#4 integrate .. //depot/projects/s390/contrib/groff/src/include/errarg.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/error.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/font.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/geometry.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/getopt_int.h#1 branch .. //depot/projects/s390/contrib/groff/src/include/gettext.h#1 branch .. //depot/projects/s390/contrib/groff/src/include/groff-getopt.h#2 delete .. //depot/projects/s390/contrib/groff/src/include/html-strings.h#4 integrate .. //depot/projects/s390/contrib/groff/src/include/htmlhint.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/index.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/lib.h#4 integrate .. //depot/projects/s390/contrib/groff/src/include/macropath.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/nonposix.h#4 integrate .. //depot/projects/s390/contrib/groff/src/include/paper.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/posix.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/printer.h#4 integrate .. //depot/projects/s390/contrib/groff/src/include/ptable.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/refid.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/relocate.h#1 branch .. //depot/projects/s390/contrib/groff/src/include/search.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/searchpath.h#2 integrate .. //depot/projects/s390/contrib/groff/src/include/stringclass.h#3 integrate .. //depot/projects/s390/contrib/groff/src/include/symbol.h#1 branch .. //depot/projects/s390/contrib/groff/src/include/unicode.h#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libbib/common.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libbib/index.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libbib/linear.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libbib/map.c#3 integrate .. //depot/projects/s390/contrib/groff/src/libs/libbib/search.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libdriver/input.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libdriver/printer.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/assert.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/change_lf.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/cmap.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/color.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/cset.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/device.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/errarg.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/error.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/fatal.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/fmod.c#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/font.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/fontfile.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/geometry.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/getcwd.c#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/glyphuni.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/htmlhint.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/hypot.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/iftoa.c#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/invalid.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/itoa.c#3 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/lf.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/macropath.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/matherr.c#3 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/maxfilename.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/maxpathname.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/mksdir.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/mkstemp.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/nametoindex.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/new.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/paper.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/progname.c#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/progname.cpp#2 delete .. //depot/projects/s390/contrib/groff/src/libs/libgroff/ptable.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/quotearg.c#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/relocate.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/searchpath.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/spawnvp.c#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/strcasecmp.c#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/strerror.c#3 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/string.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/strsave.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/strtol.c#3 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/symbol.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/tmpfile.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/tmpname.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/libs/libgroff/unicode.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/uniglyph.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libgroff/uniuni.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libxutil/DviChar.c#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libxutil/Makefile.sub#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libxutil/XFontName.c#1 branch .. //depot/projects/s390/contrib/groff/src/libs/libxutil/xmalloc.c#1 branch .. //depot/projects/s390/contrib/groff/src/preproc/eqn/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/box.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/box.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/delim.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/eqn.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/eqn.man#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/eqn.y#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/lex.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/limit.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/list.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/main.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/mark.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/neqn.sh#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/other.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/over.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/pbox.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/pile.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/script.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/special.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/sqrt.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/eqn/text.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/grn/gprint.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/grn/grn.man#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/grn/hdb.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/grn/hgraph.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/grn/hpoint.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/grn/main.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/html/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/html/pre-html.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/html/pre-html.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/html/pushback.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/html/pushback.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/TODO#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/common.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/common.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/lex.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/main.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/object.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/object.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/output.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/pic.h#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/pic.man#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/pic.y#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/position.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/tex.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/pic/troff.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/command.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/command.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/label.y#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/ref.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/ref.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/refer.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/refer.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/refer.man#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/token.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/refer/token.h#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/soelim/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/soelim/soelim.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/soelim/soelim.man#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/tbl/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/preproc/tbl/main.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/tbl/table.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/preproc/tbl/table.h#3 integrate .. //depot/projects/s390/contrib/groff/src/preproc/tbl/tbl.man#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/groff/groff.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/groff/groff.man#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/groff/pipeline.c#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/groff/pipeline.h#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/grog/grog.pl#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/grog/grog.sh#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/nroff/Makefile.sub#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/nroff/nroff.man#5 integrate .. //depot/projects/s390/contrib/groff/src/roff/nroff/nroff.sh#6 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/Makefile.sub#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/charinfo.h#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/column.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/dictionary.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/dictionary.h#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/div.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/div.h#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/env.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/env.h#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/glyphuni.cpp#2 delete .. //depot/projects/s390/contrib/groff/src/roff/troff/hvunits.h#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/input.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/input.h#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/mtsm.cpp#1 branch .. //depot/projects/s390/contrib/groff/src/roff/troff/mtsm.h#1 branch .. //depot/projects/s390/contrib/groff/src/roff/troff/node.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/node.h#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/number.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/reg.cpp#2 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/reg.h#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/request.h#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/symbol.cpp#2 delete .. //depot/projects/s390/contrib/groff/src/roff/troff/symbol.h#3 delete .. //depot/projects/s390/contrib/groff/src/roff/troff/token.h#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/troff.h#3 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/troff.man#4 integrate .. //depot/projects/s390/contrib/groff/src/roff/troff/unicode.cpp#2 delete .. //depot/projects/s390/contrib/groff/src/roff/troff/unicode.h#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 7 20:05:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0594816A422; Sat, 7 Jan 2006 20:05:36 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D04CB16A41F for ; Sat, 7 Jan 2006 20:05:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8912F43D45 for ; Sat, 7 Jan 2006 20:05:35 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k07K5ZHS045533 for ; Sat, 7 Jan 2006 20:05:35 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k07K5ZI7045530 for perforce@freebsd.org; Sat, 7 Jan 2006 20:05:35 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 20:05:35 GMT Message-Id: <200601072005.k07K5ZI7045530@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 20:05:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=89344 Change 89344 by imp@imp_plunger on 2006/01/07 20:05:32 Attempt to create a atestart routine. Start to bring in the busdma goo too. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#16 (text+ko) ==== @@ -61,6 +61,8 @@ #include "miibus_if.h" +#define ATE_MAX_TX_BUFFERS 2 /* We have ping-pong tx buffers */ + struct ate_softc { struct ifnet *ifp; /* ifnet pointer */ @@ -71,6 +73,9 @@ struct resource *irq_res; /* IRQ resource */ struct resource *mem_res; /* Memory resource */ struct callout tick_ch; /* Tick callout */ + bus_dma_tag_t mtag; /* bus dma tag for mbufs */ + bus_dmamap_t tx_map[ATE_MAX_TX_BUFFERS]; + int txcur; /* current tx map pointer */ // XXX bogus int intr; @@ -208,7 +213,7 @@ ate_activate(device_t dev) { struct ate_softc *sc; - int rid; + int rid, err, i; sc = device_get_softc(dev); rid = 0; @@ -221,6 +226,26 @@ RF_ACTIVE); if (sc->mem_res == NULL) goto errout; + + /* + * Allocate DMA tags and maps + */ + err = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, + busdma_lock_mutex, &sc->sc_mtx, &sc->mtag); + if (err != 0) + goto errout; + for (i = 0; i < ATE_MAX_TX_BUFFERS; i++) { + err = bus_dmamap_create(sc->mtag, 0, &sc->tx_map[i]); + if (err != 0) + goto errout; + } + + /* + * Allocate our Rx buffers. This chip has a rx structure that's filled + * in -- later XXX + */ + return (0); errout:; ate_deactivate(dev); @@ -233,6 +258,39 @@ struct ate_softc *sc; sc = device_get_softc(dev); + /* XXX teardown busdma junk, below from fxp -- customize */ +#if 0 + if (sc->fxp_mtag) { + for (i = 0; i < FXP_NRFABUFS; i++) { + rxp = &sc->fxp_desc.rx_list[i]; + if (rxp->rx_mbuf != NULL) { + bus_dmamap_sync(sc->fxp_mtag, rxp->rx_map, + BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->fxp_mtag, rxp->rx_map); + m_freem(rxp->rx_mbuf); + } + bus_dmamap_destroy(sc->fxp_mtag, rxp->rx_map); + } + bus_dmamap_destroy(sc->fxp_mtag, sc->spare_map); + for (i = 0; i < FXP_NTXCB; i++) { + txp = &sc->fxp_desc.tx_list[i]; + if (txp->tx_mbuf != NULL) { + bus_dmamap_sync(sc->fxp_mtag, txp->tx_map, + BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->fxp_mtag, txp->tx_map); + m_freem(txp->tx_mbuf); + } + bus_dmamap_destroy(sc->fxp_mtag, txp->tx_map); + } + bus_dma_tag_destroy(sc->fxp_mtag); + } + if (sc->fxp_stag) + bus_dma_tag_destroy(sc->fxp_stag); + if (sc->cbl_tag) + bus_dma_tag_destroy(sc->cbl_tag); + if (sc->mcs_tag) + bus_dma_tag_destroy(sc->mcs_tag); +#endif if (sc->intrhand) bus_teardown_intr(dev, sc->irq_res, sc->intrhand); sc->intrhand = 0; @@ -324,7 +382,8 @@ * once a second is often enough. Some don't map well to * the dot3Stats mib, so for those we just count them as general * errors. Stats for iframes, ibutes, oframes and obytes are - * collected elsewhere. + * collected elsewhere. These registers zero on a read to prevent + * races. */ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); @@ -346,12 +405,6 @@ RD4(sc, ETH_USF); /* - * Note: I think there's a race btn the use of the stats above and - * clearing them here. The datasheet is a bit vague on the topic. - */ - WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_CSR); - - /* * Schedule another timeout one second from now. */ callout_reset(&sc->tick_ch, hz, ate_tick, sc); @@ -397,6 +450,8 @@ WR4(sc, ETH_CFG, RD4(sc, ETH_CFG) & ~ETH_CFG_RMII); #endif + WR4(sc, ETH_CTL, RD4(sc, ETH_CTL) | ETH_CTL_TE); + /* XXX need to setup multicast filters */ /* XXX need to setup rx buffers and assoc structures */ /* XXX need to enable appropriate interrupt masks */ @@ -421,11 +476,64 @@ atestart_locked(struct ifnet *ifp) { struct ate_softc *sc = ifp->if_softc; + struct mbuf *m; + bus_dma_segment_t segs[1]; + int nseg; ATE_ASSERT_LOCKED(sc); - if (sc->ifp->if_drv_flags & IFF_DRV_OACTIVE) + if (ifp->if_drv_flags & IFF_DRV_OACTIVE) + return; + +outloop:; + /* XXX ed checks to see if there are buffered packets and an idle + * transmitter and kicks something if so. This shouldn't happen + * for this device, and I note it here only in passing + */ + + /* + * check to see if there's room to put another packet into the + * xmit queue. The EMAC chip has a ping-pong buffer for xmit + * packets. We use OACTIVE to indicate "we can stuff more into + * our buffers (clear) or not (set)." + */ + if (!(RD4(sc, ETH_TSR) & ETH_TSR_BNQ)) { + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + return; + } + IFQ_DRV_DEQUEUE(&ifp->if_snd, m); + if (m == 0) { + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; return; - /* XXX deque packets and transmit */ + } + + m = m_pullup(m, m_length(m, NULL)); + if (bus_dmamap_load_mbuf_sg(sc->mtag, sc->tx_map[sc->txcur], m, segs, + &nseg, 0) != 0) { + m_free(m); + goto outloop; + } + bus_dmamap_sync(sc->mtag, sc->tx_map[sc->txcur], BUS_DMASYNC_PREWRITE); + sc->txcur++; + if (sc->txcur >= ATE_MAX_TX_BUFFERS) + sc->txcur = 0; + + /* + * tell the hardware to xmit the packet. + */ + WR4(sc, ETH_TAR, segs[0].ds_addr); + WR4(sc, ETH_TCR, segs[0].ds_len); + + /* + * Tap off here if there is a bpf listener. + */ + BPF_MTAP(ifp, m); + + m_freem(m); + + /* + * Loop back to the top to possibly buffer more packets + */ + goto outloop; } static void From owner-p4-projects@FreeBSD.ORG Sat Jan 7 20:08:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5001E16A427; Sat, 7 Jan 2006 20:08:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0CFD016A423 for ; Sat, 7 Jan 2006 20:08:40 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1DBD43D45 for ; Sat, 7 Jan 2006 20:08:39 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k07K8dYB045724 for ; Sat, 7 Jan 2006 20:08:39 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k07K8dK2045721 for perforce@freebsd.org; Sat, 7 Jan 2006 20:08:39 GMT (envelope-from imp@freebsd.org) Date: Sat, 7 Jan 2006 20:08:39 GMT Message-Id: <200601072008.k07K8dK2045721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 89345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 20:08:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=89345 Change 89345 by imp@imp_plunger on 2006/01/07 20:07:47 Just realized that this isn't quite right, add a comment to that effect so I don't forget. Affected files ... .. //depot/projects/arm/src/sys/arm/at91/if_ate.c#17 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/if_ate.c#17 (text+ko) ==== @@ -523,6 +523,10 @@ WR4(sc, ETH_TAR, segs[0].ds_addr); WR4(sc, ETH_TCR, segs[0].ds_len); + /* XXX the following is wrong, we need to keep track of the mbuf and + * only free it when the ISR fires indicating xmit complete. + */ + /* * Tap off here if there is a bpf listener. */