Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 1 Jan 2004 21:28:39 -0800 (PST)
From:      Warner Losh <imp@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 44668 for review
Message-ID:  <200401020528.i025SdSV068682@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=44668

Change 44668 by imp@imp_pacopaco on 2004/01/01 21:28:31

	IFC @44666

Affected files ...

.. //depot/projects/power/sys/alpha/alpha/db_trace.c#3 integrate
.. //depot/projects/power/sys/alpha/alpha/dump_machdep.c#2 integrate
.. //depot/projects/power/sys/alpha/alpha/elf_machdep.c#3 integrate
.. //depot/projects/power/sys/alpha/alpha/mp_machdep.c#3 integrate
.. //depot/projects/power/sys/alpha/alpha/vm_machdep.c#3 integrate
.. //depot/projects/power/sys/alpha/conf/GENERIC#4 integrate
.. //depot/projects/power/sys/alpha/conf/GENERIC.hints#2 integrate
.. //depot/projects/power/sys/alpha/include/ioctl_bt848.h#2 integrate
.. //depot/projects/power/sys/alpha/include/kse.h#2 delete
.. //depot/projects/power/sys/alpha/linux/linux_proto.h#3 integrate
.. //depot/projects/power/sys/alpha/linux/linux_syscall.h#3 integrate
.. //depot/projects/power/sys/alpha/linux/linux_sysent.c#3 integrate
.. //depot/projects/power/sys/alpha/linux/linux_sysvec.c#3 integrate
.. //depot/projects/power/sys/alpha/linux/syscalls.conf#2 integrate
.. //depot/projects/power/sys/alpha/linux/syscalls.master#3 integrate
.. //depot/projects/power/sys/alpha/osf1/osf1_proto.h#3 integrate
.. //depot/projects/power/sys/alpha/osf1/osf1_syscall.h#3 integrate
.. //depot/projects/power/sys/alpha/osf1/osf1_sysent.c#3 integrate
.. //depot/projects/power/sys/alpha/osf1/syscalls.conf#2 integrate
.. //depot/projects/power/sys/alpha/osf1/syscalls.master#3 integrate
.. //depot/projects/power/sys/alpha/pci/apecs.c#3 integrate
.. //depot/projects/power/sys/amd64/acpica/madt.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/amd64-gdbstub.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/amd64_mem.c#4 integrate
.. //depot/projects/power/sys/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/power/sys/amd64/amd64/critical.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/elf_machdep.c#3 integrate
.. //depot/projects/power/sys/amd64/amd64/fpu.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/power/sys/amd64/amd64/mem.c#3 integrate
.. //depot/projects/power/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/power/sys/amd64/amd64/mptable.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/power/sys/amd64/amd64/pmap.c#5 integrate
.. //depot/projects/power/sys/amd64/amd64/vm_machdep.c#4 integrate
.. //depot/projects/power/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/power/sys/amd64/ia32/ia32_sigtramp.S#1 branch
.. //depot/projects/power/sys/amd64/include/apicreg.h#2 integrate
.. //depot/projects/power/sys/amd64/include/cpufunc.h#3 integrate
.. //depot/projects/power/sys/amd64/include/critical.h#2 integrate
.. //depot/projects/power/sys/amd64/include/kse.h#2 delete
.. //depot/projects/power/sys/amd64/include/mutex.h#2 integrate
.. //depot/projects/power/sys/amd64/include/param.h#3 integrate
.. //depot/projects/power/sys/amd64/include/pcvt_ioctl.h#1 branch
.. //depot/projects/power/sys/amd64/include/runq.h#2 integrate
.. //depot/projects/power/sys/amd64/include/vmparam.h#4 integrate
.. //depot/projects/power/sys/amd64/pci/pci_bus.c#4 integrate
.. //depot/projects/power/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/power/sys/boot/Makefile#2 integrate
.. //depot/projects/power/sys/boot/efi/include/efiapi.h#2 integrate
.. //depot/projects/power/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/power/sys/boot/ficl/loader.c#2 integrate
.. //depot/projects/power/sys/boot/ficl/powerpc/sysdep.c#1 branch
.. //depot/projects/power/sys/boot/ficl/powerpc/sysdep.h#1 branch
.. //depot/projects/power/sys/boot/i386/Makefile#2 integrate
.. //depot/projects/power/sys/boot/i386/boot0/Makefile#2 integrate
.. //depot/projects/power/sys/boot/i386/boot0/boot0.s#3 integrate
.. //depot/projects/power/sys/boot/i386/boot0/boot0sio.s#1 branch
.. //depot/projects/power/sys/boot/i386/boot0sio/Makefile#1 branch
.. //depot/projects/power/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/power/sys/boot/ia64/libski/acpi_stub.c#2 integrate
.. //depot/projects/power/sys/boot/ofw/common/main.c#2 integrate
.. //depot/projects/power/sys/boot/ofw/libofw/devicename.c#2 integrate
.. //depot/projects/power/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate
.. //depot/projects/power/sys/boot/ofw/libofw/libofw.h#2 integrate
.. //depot/projects/power/sys/boot/ofw/libofw/ofw_copy.c#2 integrate
.. //depot/projects/power/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/power/sys/boot/powerpc/loader/Makefile#2 integrate
.. //depot/projects/power/sys/boot/powerpc/loader/conf.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/power/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/power/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/power/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/power/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/power/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/power/sys/compat/freebsd32/freebsd32_util.h#2 integrate
.. //depot/projects/power/sys/compat/freebsd32/syscalls.conf#2 integrate
.. //depot/projects/power/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/power/sys/compat/ia32/ia32_sigtramp.S#2 delete
.. //depot/projects/power/sys/compat/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/power/sys/compat/ia32/ia32_util.h#3 integrate
.. //depot/projects/power/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/power/sys/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/power/sys/compat/ndis/cfg_var.h#1 branch
.. //depot/projects/power/sys/compat/ndis/hal_var.h#1 branch
.. //depot/projects/power/sys/compat/ndis/kern_ndis.c#1 branch
.. //depot/projects/power/sys/compat/ndis/ndis_var.h#1 branch
.. //depot/projects/power/sys/compat/ndis/ntoskrnl_var.h#1 branch
.. //depot/projects/power/sys/compat/ndis/pe_var.h#1 branch
.. //depot/projects/power/sys/compat/ndis/resource_var.h#1 branch
.. //depot/projects/power/sys/compat/ndis/subr_hal.c#1 branch
.. //depot/projects/power/sys/compat/ndis/subr_ndis.c#1 branch
.. //depot/projects/power/sys/compat/ndis/subr_ntoskrnl.c#1 branch
.. //depot/projects/power/sys/compat/ndis/subr_pe.c#1 branch
.. //depot/projects/power/sys/compat/svr4/svr4_proto.h#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_syscall.h#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_syscallnames.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_sysent.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_sysvec.c#3 integrate
.. //depot/projects/power/sys/compat/svr4/syscalls.conf#2 integrate
.. //depot/projects/power/sys/compat/svr4/syscalls.master#2 integrate
.. //depot/projects/power/sys/conf/Makefile.alpha#2 integrate
.. //depot/projects/power/sys/conf/Makefile.powerpc#2 integrate
.. //depot/projects/power/sys/conf/NOTES#5 integrate
.. //depot/projects/power/sys/conf/files#5 integrate
.. //depot/projects/power/sys/conf/files.amd64#4 integrate
.. //depot/projects/power/sys/conf/files.i386#3 integrate
.. //depot/projects/power/sys/conf/files.ia64#4 integrate
.. //depot/projects/power/sys/conf/files.pc98#3 integrate
.. //depot/projects/power/sys/conf/kern.mk#3 integrate
.. //depot/projects/power/sys/conf/kern.post.mk#4 integrate
.. //depot/projects/power/sys/conf/kern.pre.mk#4 integrate
.. //depot/projects/power/sys/conf/kmod.mk#4 integrate
.. //depot/projects/power/sys/conf/ldscript.i386#3 integrate
.. //depot/projects/power/sys/conf/majors#5 integrate
.. //depot/projects/power/sys/conf/newvers.sh#3 integrate
.. //depot/projects/power/sys/conf/options#5 integrate
.. //depot/projects/power/sys/conf/options.i386#4 integrate
.. //depot/projects/power/sys/conf/options.pc98#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acconfig.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acdisasm.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acenv.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acevents.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acexcep.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acglobal.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acmacros.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acobject.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acstruct.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/actbl.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/actbl1.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/actbl2.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/actypes.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/acutils.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dbcmds.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dbdisply.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dbexec.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dbfileio.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dbstats.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dbutils.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dmobject.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dmresrc.c#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dmresrcl.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dsfield.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dsinit.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dsmethod.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dsmthdat.c#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dsopcode.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dsutils.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dswexec.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dswload.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dswscope.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/dswstate.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/evgpe.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/evgpeblk.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/evregion.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/evrgnini.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/evxfregn.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exconfig.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/excreate.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exdump.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exfield.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exfldio.c#4 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exmisc.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exmutex.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exoparg1.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exoparg3.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exprep.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exregion.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exresnte.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exresolv.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exresop.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exstore.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exstoren.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exsystem.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exutils.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/hwacpi.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/hwregs.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/hwsleep.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsaccess.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsalloc.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsdump.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsinit.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsobject.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nssearch.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsutils.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/nsxfname.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/osunixxf.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/psargs.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/psparse.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/psxface.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rsaddr.c#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rscalc.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rscreate.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rsdump.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rsirq.c#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rslist.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbconvrt.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbget.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbgetall.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbinstal.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbrsdt.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbxface.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/tbxfroot.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/utalloc.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/utdebug.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/utdelete.c#3 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/uteval.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/utglobal.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/utobject.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/ath/ah.h#4 integrate
.. //depot/projects/power/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#4 integrate
.. //depot/projects/power/sys/contrib/dev/ath/version.h#4 integrate
.. //depot/projects/power/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate
.. //depot/projects/power/sys/dev/aac/aac_cam.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi.c#8 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_cmbat.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pcib.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_thermal.c#4 integrate
.. //depot/projects/power/sys/dev/acpica/acpivar.h#6 integrate
.. //depot/projects/power/sys/dev/acpica/madt.h#2 delete
.. //depot/projects/power/sys/dev/aic7xxx/ahc_eisa.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/ahc_pci.c#5 integrate
.. //depot/projects/power/sys/dev/aic7xxx/ahd_pci.c#5 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7770.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx.seq#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx.h#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx.seq#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic_osm_lib.c#1 branch
.. //depot/projects/power/sys/dev/aic7xxx/aic_osm_lib.h#1 branch
.. //depot/projects/power/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate
.. //depot/projects/power/sys/dev/an/if_aironet_ieee.h#2 integrate
.. //depot/projects/power/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/power/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/power/sys/dev/an/if_an_pccard.c#3 integrate
.. //depot/projects/power/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/power/sys/dev/an/if_anreg.h#3 integrate
.. //depot/projects/power/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/power/sys/dev/ata/ata-isa.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/power/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cam.c#4 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cd.c#5 integrate
.. //depot/projects/power/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/power/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/power/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/power/sys/dev/bktr/bktr_audio.c#2 integrate
.. //depot/projects/power/sys/dev/bktr/bktr_card.c#2 integrate
.. //depot/projects/power/sys/dev/bktr/bktr_core.c#4 integrate
.. //depot/projects/power/sys/dev/bktr/bktr_i2c.c#2 integrate
.. //depot/projects/power/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/power/sys/dev/bktr/bktr_tuner.c#2 integrate
.. //depot/projects/power/sys/dev/bktr/ioctl_bt848.h#1 branch
.. //depot/projects/power/sys/dev/bktr/ioctl_meteor.h#1 branch
.. //depot/projects/power/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/power/sys/dev/ciss/ciss.c#4 integrate
.. //depot/projects/power/sys/dev/ciss/cissreg.h#2 integrate
.. //depot/projects/power/sys/dev/cx/cronyxfw.h#1 branch
.. //depot/projects/power/sys/dev/cx/csigma.c#1 branch
.. //depot/projects/power/sys/dev/cx/csigmafw.h#1 branch
.. //depot/projects/power/sys/dev/cx/cxddk.c#1 branch
.. //depot/projects/power/sys/dev/cx/cxddk.h#1 branch
.. //depot/projects/power/sys/dev/cx/cxreg.h#1 branch
.. //depot/projects/power/sys/dev/cx/if_cx.c#1 branch
.. //depot/projects/power/sys/dev/cx/machdep.h#1 branch
.. //depot/projects/power/sys/dev/cx/ng_cx.h#1 branch
.. //depot/projects/power/sys/dev/dgb/dgb.c#2 delete
.. //depot/projects/power/sys/dev/dgb/dgbios.h#2 delete
.. //depot/projects/power/sys/dev/dgb/dgfep.h#2 delete
.. //depot/projects/power/sys/dev/dgb/dgreg.h#2 delete
.. //depot/projects/power/sys/dev/drm/drm_bufs.h#4 integrate
.. //depot/projects/power/sys/dev/drm/drm_dma.h#3 integrate
.. //depot/projects/power/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/power/sys/dev/ed/if_ed_pccard.c#4 integrate
.. //depot/projects/power/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/power/sys/dev/en/midway.c#3 integrate
.. //depot/projects/power/sys/dev/fatm/if_fatm.c#3 integrate
.. //depot/projects/power/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/power/sys/dev/firewire/fwohci.c#4 integrate
.. //depot/projects/power/sys/dev/firewire/sbp.h#3 integrate
.. //depot/projects/power/sys/dev/firewire/sbp_targ.c#3 integrate
.. //depot/projects/power/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/power/sys/dev/gfb/gfb_pci.c#3 integrate
.. //depot/projects/power/sys/dev/hatm/if_hatm_intr.c#4 integrate
.. //depot/projects/power/sys/dev/hea/eni.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni.h#2 delete
.. //depot/projects/power/sys/dev/hea/eni_buffer.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_globals.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_if.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_init.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_intr.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_receive.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_stats.h#2 delete
.. //depot/projects/power/sys/dev/hea/eni_suni.h#2 delete
.. //depot/projects/power/sys/dev/hea/eni_transmit.c#2 delete
.. //depot/projects/power/sys/dev/hea/eni_var.h#2 delete
.. //depot/projects/power/sys/dev/hea/eni_vcm.c#2 delete
.. //depot/projects/power/sys/dev/hea/hea_freebsd.c#2 delete
.. //depot/projects/power/sys/dev/hea/hea_freebsd.h#2 delete
.. //depot/projects/power/sys/dev/hea/hea_pci.c#2 delete
.. //depot/projects/power/sys/dev/hifn/hifn7751.c#3 integrate
.. //depot/projects/power/sys/dev/idt/idt.c#3 integrate
.. //depot/projects/power/sys/dev/idt/idt_harp.c#2 integrate
.. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#1 branch
.. //depot/projects/power/sys/dev/if_ndis/if_ndisvar.h#1 branch
.. //depot/projects/power/sys/dev/iicbus/if_ic.c#3 integrate
.. //depot/projects/power/sys/dev/ips/ips_commands.c#4 integrate
.. //depot/projects/power/sys/dev/led/led.c#3 integrate
.. //depot/projects/power/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/power/sys/dev/lmc/if_lmc.c#2 delete
.. //depot/projects/power/sys/dev/lmc/if_lmc_common.c#2 delete
.. //depot/projects/power/sys/dev/lmc/if_lmc_fbsd3.c#2 delete
.. //depot/projects/power/sys/dev/lmc/if_lmc_media.c#2 delete
.. //depot/projects/power/sys/dev/lmc/if_lmcioctl.h#2 delete
.. //depot/projects/power/sys/dev/lmc/if_lmcvar.h#2 delete
.. //depot/projects/power/sys/dev/lnc/if_lnc.c#3 integrate
.. //depot/projects/power/sys/dev/md/md.c#4 integrate
.. //depot/projects/power/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/power/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/power/sys/dev/nge/if_nge.c#3 integrate
.. //depot/projects/power/sys/dev/ofw/ofw_disk.c#3 integrate
.. //depot/projects/power/sys/dev/owi/if_owi.c#4 integrate
.. //depot/projects/power/sys/dev/pccard/pccarddevs#5 integrate
.. //depot/projects/power/sys/dev/pccard/pccarddevs.h#5 integrate
.. //depot/projects/power/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/power/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/power/sys/dev/ppbus/if_plip.c#3 integrate
.. //depot/projects/power/sys/dev/puc/pucdata.c#4 integrate
.. //depot/projects/power/sys/dev/raidframe/rf_freebsdkintf.c#3 integrate
.. //depot/projects/power/sys/dev/ray/if_ray.c#3 integrate
.. //depot/projects/power/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/power/sys/dev/sio/sio.c#4 integrate
.. //depot/projects/power/sys/dev/sio/sio_ebus.c#2 integrate
.. //depot/projects/power/sys/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/power/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/power/sys/dev/sn/if_sn.c#4 integrate
.. //depot/projects/power/sys/dev/sound/pcm/channel.c#4 integrate
.. //depot/projects/power/sys/dev/sound/pcm/sndstat.c#2 integrate
.. //depot/projects/power/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/power/sys/dev/stg/tmc18c30.c#2 integrate
.. //depot/projects/power/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/power/sys/dev/twe/twe.c#2 integrate
.. //depot/projects/power/sys/dev/twe/twe_compat.h#2 integrate
.. //depot/projects/power/sys/dev/twe/twe_freebsd.c#2 integrate
.. //depot/projects/power/sys/dev/twe/twe_tables.h#2 integrate
.. //depot/projects/power/sys/dev/twe/tweio.h#2 integrate
.. //depot/projects/power/sys/dev/twe/twereg.h#3 integrate
.. //depot/projects/power/sys/dev/twe/twevar.h#2 integrate
.. //depot/projects/power/sys/dev/tx/if_tx.c#3 integrate
.. //depot/projects/power/sys/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/power/sys/dev/usb/if_aue.c#4 integrate
.. //depot/projects/power/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/power/sys/dev/usb/if_cue.c#5 integrate
.. //depot/projects/power/sys/dev/usb/if_rue.c#4 integrate
.. //depot/projects/power/sys/dev/usb/ohci.c#4 integrate
.. //depot/projects/power/sys/dev/usb/ohci_pci.c#4 integrate
.. //depot/projects/power/sys/dev/usb/ohcivar.h#2 integrate
.. //depot/projects/power/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs.h#4 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs_data.h#4 integrate
.. //depot/projects/power/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/power/sys/dev/vinum/vinum.c#2 integrate
.. //depot/projects/power/sys/dev/vinum/vinumconfig.c#3 integrate
.. //depot/projects/power/sys/dev/vinum/vinumrevive.c#3 integrate
.. //depot/projects/power/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/power/sys/dev/wi/if_wi_pccard.c#3 integrate
.. //depot/projects/power/sys/dev/wi/if_wireg.h#2 integrate
.. //depot/projects/power/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/power/sys/dev/xe/if_xe.c#4 integrate
.. //depot/projects/power/sys/fs/msdosfs/bootsect.h#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/bpb.h#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/direntry.h#3 integrate
.. //depot/projects/power/sys/fs/msdosfs/fat.h#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_conv.c#3 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_denode.c#3 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_iconv.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfsmount.h#3 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_subr.c#3 integrate
.. //depot/projects/power/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/nwfs/nwfs_vfsops.c#3 integrate
.. //depot/projects/power/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_ctl.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_ioctl.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_rlimit.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_type.c#2 integrate
.. //depot/projects/power/sys/fs/pseudofs/pseudofs.c#2 integrate
.. //depot/projects/power/sys/fs/pseudofs/pseudofs.h#2 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_vfsops.c#4 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_vnops.c#3 integrate
.. //depot/projects/power/sys/fs/udf/udf_vnops.c#4 integrate
.. //depot/projects/power/sys/geom/geom.h#3 integrate
.. //depot/projects/power/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/power/sys/geom/geom_dump.c#2 integrate
.. //depot/projects/power/sys/geom/geom_event.c#4 integrate
.. //depot/projects/power/sys/geom/geom_io.c#3 integrate
.. //depot/projects/power/sys/geom/geom_pc98.c#2 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_wakecode.S#4 integrate
.. //depot/projects/power/sys/i386/acpica/madt.c#2 integrate
.. //depot/projects/power/sys/i386/conf/GENERIC#4 integrate
.. //depot/projects/power/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/power/sys/i386/i386/apic_vector.s#2 integrate
.. //depot/projects/power/sys/i386/i386/elf_machdep.c#3 integrate
.. //depot/projects/power/sys/i386/i386/local_apic.c#2 integrate
.. //depot/projects/power/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/power/sys/i386/i386/mp_machdep.c#6 integrate
.. //depot/projects/power/sys/i386/i386/mptable.c#2 integrate
.. //depot/projects/power/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/power/sys/i386/i386/vm_machdep.c#4 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_proto.h#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/syscalls.conf#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/syscalls.isc#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/syscalls.isc.conf#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/syscalls.master#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/syscalls.xenix#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate
.. //depot/projects/power/sys/i386/include/apicreg.h#2 integrate
.. //depot/projects/power/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/power/sys/i386/include/cronyx.h#2 delete
.. //depot/projects/power/sys/i386/include/cserial.h#1 branch
.. //depot/projects/power/sys/i386/include/ioctl_bt848.h#2 integrate
.. //depot/projects/power/sys/i386/include/kse.h#2 delete
.. //depot/projects/power/sys/i386/include/pcvt_ioctl.h#2 integrate
.. //depot/projects/power/sys/i386/include/sf_buf.h#2 integrate
.. //depot/projects/power/sys/i386/include/smp.h#3 integrate
.. //depot/projects/power/sys/i386/isa/cronyx.c#2 delete
.. //depot/projects/power/sys/i386/isa/cx.c#3 delete
.. //depot/projects/power/sys/i386/isa/cxreg.h#2 delete
.. //depot/projects/power/sys/i386/isa/cy.c#4 integrate
.. //depot/projects/power/sys/i386/isa/if_cx.c#3 delete
.. //depot/projects/power/sys/i386/isa/loran.c#2 delete
.. //depot/projects/power/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/power/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/power/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/power/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/power/sys/i386/linux/syscalls.conf#2 integrate
.. //depot/projects/power/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/power/sys/i386/pci/pci_cfgreg.c#4 integrate
.. //depot/projects/power/sys/ia64/acpica/OsdEnvironment.c#2 integrate
.. //depot/projects/power/sys/ia64/acpica/madt.c#2 integrate
.. //depot/projects/power/sys/ia64/ia32/Makefile#2 delete
.. //depot/projects/power/sys/ia64/ia32/ia32.h#2 delete
.. //depot/projects/power/sys/ia64/ia32/ia32_misc.c#2 delete
.. //depot/projects/power/sys/ia64/ia32/ia32_proto.h#3 delete
.. //depot/projects/power/sys/ia64/ia32/ia32_signal.c#1 branch
.. //depot/projects/power/sys/ia64/ia32/ia32_sigtramp.c#1 branch
.. //depot/projects/power/sys/ia64/ia32/ia32_syscall.h#3 delete
.. //depot/projects/power/sys/ia64/ia32/ia32_sysent.c#3 delete
.. //depot/projects/power/sys/ia64/ia32/ia32_sysvec.c#3 delete
.. //depot/projects/power/sys/ia64/ia32/ia32_util.h#2 delete
.. //depot/projects/power/sys/ia64/ia32/syscalls.conf#2 delete
.. //depot/projects/power/sys/ia64/ia32/syscalls.master#3 delete
.. //depot/projects/power/sys/ia64/ia64/dump_machdep.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/elf_machdep.c#4 integrate
.. //depot/projects/power/sys/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/power/sys/ia64/ia64/trap.c#5 integrate
.. //depot/projects/power/sys/ia64/ia64/vm_machdep.c#5 integrate
.. //depot/projects/power/sys/ia64/include/cpufunc.h#2 integrate
.. //depot/projects/power/sys/ia64/include/ioctl_bt848.h#2 delete
.. //depot/projects/power/sys/ia64/include/ioctl_meteor.h#2 delete
.. //depot/projects/power/sys/ia64/include/kse.h#2 delete
.. //depot/projects/power/sys/ia64/include/runq.h#2 integrate
.. //depot/projects/power/sys/ia64/include/ucontext.h#3 integrate
.. //depot/projects/power/sys/isa/psm.c#3 integrate
.. //depot/projects/power/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/power/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/power/sys/kern/kern_clock.c#3 integrate
.. //depot/projects/power/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/power/sys/kern/kern_event.c#4 integrate
.. //depot/projects/power/sys/kern/kern_exec.c#4 integrate
.. //depot/projects/power/sys/kern/kern_prot.c#5 integrate
.. //depot/projects/power/sys/kern/kern_sig.c#5 integrate
.. //depot/projects/power/sys/kern/kern_subr.c#3 integrate
.. //depot/projects/power/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/power/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/power/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/power/sys/kern/makesyscalls.sh#2 integrate
.. //depot/projects/power/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/power/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/power/sys/kern/subr_mbpool.c#2 integrate
.. //depot/projects/power/sys/kern/subr_mbuf.c#3 integrate
.. //depot/projects/power/sys/kern/subr_prf.c#2 integrate
.. //depot/projects/power/sys/kern/subr_smp.c#5 integrate
.. //depot/projects/power/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/power/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/power/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/power/sys/kern/syscalls.c#4 integrate
.. //depot/projects/power/sys/kern/syscalls.master#4 integrate
.. //depot/projects/power/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/power/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/power/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/power/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/power/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/power/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/power/sys/kern/vfs_vnops.c#3 integrate
.. //depot/projects/power/sys/libkern/iconv_xlat16.c#2 integrate
.. //depot/projects/power/sys/modules/Makefile#5 integrate
.. //depot/projects/power/sys/modules/acpi/Makefile#4 integrate
.. //depot/projects/power/sys/modules/acpi/acpi/Makefile#1 branch
.. //depot/projects/power/sys/modules/cam/Makefile#2 integrate
.. //depot/projects/power/sys/modules/crypto/Makefile#2 integrate
.. //depot/projects/power/sys/modules/cx/Makefile#1 branch
.. //depot/projects/power/sys/modules/hea/Makefile#2 delete
.. //depot/projects/power/sys/modules/if_ndis/Makefile#1 branch
.. //depot/projects/power/sys/modules/ndis/Makefile#1 branch
.. //depot/projects/power/sys/modules/raidframe/Makefile#2 integrate
.. //depot/projects/power/sys/modules/sio/Makefile#1 branch
.. //depot/projects/power/sys/modules/ukbd/Makefile#2 integrate
.. //depot/projects/power/sys/net/bpf.c#4 integrate
.. //depot/projects/power/sys/net/bpf.h#4 integrate
.. //depot/projects/power/sys/net/bridge.c#4 integrate
.. //depot/projects/power/sys/net/if.c#5 integrate
.. //depot/projects/power/sys/net/if_disc.c#4 integrate
.. //depot/projects/power/sys/net/if_ef.c#3 integrate
.. //depot/projects/power/sys/net/if_faith.c#4 integrate
.. //depot/projects/power/sys/net/if_gif.c#3 integrate
.. //depot/projects/power/sys/net/if_gre.c#3 integrate
.. //depot/projects/power/sys/net/if_gre.h#2 integrate
.. //depot/projects/power/sys/net/if_loop.c#5 integrate
.. //depot/projects/power/sys/net/if_stf.c#4 integrate
.. //depot/projects/power/sys/net/if_tun.c#5 integrate
.. //depot/projects/power/sys/net/if_var.h#5 integrate
.. //depot/projects/power/sys/net/route.c#5 integrate
.. //depot/projects/power/sys/net80211/ieee80211_radiotap.h#2 integrate
.. //depot/projects/power/sys/netgraph/atm/ng_atm.c#3 integrate
.. //depot/projects/power/sys/netgraph/atm/ngatmbase.c#2 integrate
.. //depot/projects/power/sys/netgraph/atm/sscfu/ng_sscfu.c#2 integrate
.. //depot/projects/power/sys/netgraph/atm/uni/ng_uni.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_base.c#4 integrate
.. //depot/projects/power/sys/netgraph/ng_bridge.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_eiface.h#3 integrate
.. //depot/projects/power/sys/netgraph/ng_etf.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_ether.h#2 integrate
.. //depot/projects/power/sys/netgraph/ng_iface.c#3 integrate
.. //depot/projects/power/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/power/sys/netgraph/ng_parse.c#2 integrate
.. //depot/projects/power/sys/netgraph/ng_parse.h#3 integrate
.. //depot/projects/power/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/power/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/power/sys/netinet/in.c#3 integrate
.. //depot/projects/power/sys/netinet/ip_dummynet.c#6 integrate
.. //depot/projects/power/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/power/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_mroute.c#5 integrate
.. //depot/projects/power/sys/netinet/tcp_hostcache.c#3 integrate
.. //depot/projects/power/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/power/sys/netinet6/in6_src.c#5 integrate
.. //depot/projects/power/sys/netinet6/ip6_fw.c#4 integrate
.. //depot/projects/power/sys/netinet6/ip6_mroute.c#4 integrate
.. //depot/projects/power/sys/netinet6/ip6_output.c#6 integrate
.. //depot/projects/power/sys/netinet6/nd6.c#5 integrate
.. //depot/projects/power/sys/netipsec/ipsec_mbuf.c#3 integrate
.. //depot/projects/power/sys/netkey/key.c#6 integrate
.. //depot/projects/power/sys/nfs4client/nfs4_idmap.c#2 integrate
.. //depot/projects/power/sys/nfsserver/nfs_srvsubs.c#2 integrate
.. //depot/projects/power/sys/opencrypto/crmbuf.c#2 delete
.. //depot/projects/power/sys/opencrypto/cryptodev.h#2 integrate
.. //depot/projects/power/sys/opencrypto/cryptosoft.c#2 integrate
.. //depot/projects/power/sys/pc98/conf/NOTES#3 integrate
.. //depot/projects/power/sys/pc98/pc98/sio.c#4 integrate
.. //depot/projects/power/sys/pc98/pc98/sio_cbus.c#2 integrate
.. //depot/projects/power/sys/pci/cy_pci.c#2 integrate
.. //depot/projects/power/sys/pci/if_dc.c#6 integrate
.. //depot/projects/power/sys/pci/if_dcreg.h#4 integrate
.. //depot/projects/power/sys/pci/if_pcn.c#3 integrate
.. //depot/projects/power/sys/pci/if_rl.c#4 integrate
.. //depot/projects/power/sys/pci/if_sf.c#3 integrate
.. //depot/projects/power/sys/pci/if_sis.c#5 integrate
.. //depot/projects/power/sys/pci/if_sisreg.h#3 integrate
.. //depot/projects/power/sys/pci/if_sk.c#5 integrate
.. //depot/projects/power/sys/pci/if_ste.c#3 integrate
.. //depot/projects/power/sys/pci/if_tl.c#3 integrate
.. //depot/projects/power/sys/pci/if_vr.c#3 integrate
.. //depot/projects/power/sys/pci/if_wb.c#3 integrate
.. //depot/projects/power/sys/pci/if_xl.c#5 integrate
.. //depot/projects/power/sys/pci/meteor.c#2 delete
.. //depot/projects/power/sys/pci/meteor_reg.h#2 delete
.. //depot/projects/power/sys/powerpc/include/cpufunc.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/kse.h#2 delete
.. //depot/projects/power/sys/powerpc/include/powerpc.h#2 integrate
.. //depot/projects/power/sys/powerpc/powermac/ata_macio.c#3 integrate
.. //depot/projects/power/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/elf_machdep.c#3 integrate
.. //depot/projects/power/sys/powerpc/powerpc/machdep.c#4 integrate
.. //depot/projects/power/sys/powerpc/powerpc/ofw_machdep.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/pmap.c#3 integrate
.. //depot/projects/power/sys/powerpc/powerpc/vm_machdep.c#3 integrate
.. //depot/projects/power/sys/security/mac/mac_net.c#4 integrate
.. //depot/projects/power/sys/security/mac/mac_process.c#4 integrate
.. //depot/projects/power/sys/security/mac_biba/mac_biba.c#3 integrate
.. //depot/projects/power/sys/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/power/sys/security/mac_mls/mac_mls.c#3 integrate
.. //depot/projects/power/sys/security/mac_partition/mac_partition.c#3 integrate
.. //depot/projects/power/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/power/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/power/sys/sparc64/include/kse.h#2 delete
.. //depot/projects/power/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/power/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/db_trace.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/dump_machdep.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/elf_machdep.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/mp_machdep.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/ofw_machdep.c#3 integrate
.. //depot/projects/power/sys/sparc64/sparc64/vm_machdep.c#3 integrate
.. //depot/projects/power/sys/sys/_null.h#1 branch
.. //depot/projects/power/sys/sys/copyright.h#2 integrate
.. //depot/projects/power/sys/sys/iconv.h#4 integrate
.. //depot/projects/power/sys/sys/imgact_elf.h#2 integrate
.. //depot/projects/power/sys/sys/ioctl_bt848.h#2 delete
.. //depot/projects/power/sys/sys/ioctl_meteor.h#2 delete
.. //depot/projects/power/sys/sys/kse.h#2 integrate
.. //depot/projects/power/sys/sys/mac.h#4 integrate
.. //depot/projects/power/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/power/sys/sys/mbuf.h#6 integrate
.. //depot/projects/power/sys/sys/param.h#4 integrate
.. //depot/projects/power/sys/sys/proc.h#5 integrate
.. //depot/projects/power/sys/sys/sf_buf.h#2 integrate
.. //depot/projects/power/sys/sys/smp.h#3 integrate
.. //depot/projects/power/sys/sys/socket.h#3 integrate
.. //depot/projects/power/sys/sys/stddef.h#2 integrate
.. //depot/projects/power/sys/sys/syscall.h#4 integrate
.. //depot/projects/power/sys/sys/syscall.mk#4 integrate
.. //depot/projects/power/sys/sys/sysproto.h#4 integrate
.. //depot/projects/power/sys/sys/systm.h#3 integrate
.. //depot/projects/power/sys/sys/uio.h#3 integrate
.. //depot/projects/power/sys/sys/umtx.h#2 integrate
.. //depot/projects/power/sys/sys/vnode.h#5 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/power/sys/vm/swap_pager.c#5 integrate
.. //depot/projects/power/sys/vm/uma_core.c#5 integrate
.. //depot/projects/power/sys/vm/uma_int.h#3 integrate
.. //depot/projects/power/sys/vm/vm_fault.c#4 integrate
.. //depot/projects/power/sys/vm/vm_kern.c#4 integrate
.. //depot/projects/power/sys/vm/vm_map.c#4 integrate
.. //depot/projects/power/sys/vm/vm_mmap.c#4 integrate
.. //depot/projects/power/sys/vm/vm_object.c#5 integrate
.. //depot/projects/power/sys/vm/vm_page.c#4 integrate

Differences ...

==== //depot/projects/power/sys/alpha/alpha/db_trace.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.16 2003/11/29 11:57:02 jeff Exp $ */
+/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.17 2003/12/23 02:36:41 peter Exp $ */
 /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */
 
 /*-
@@ -99,7 +99,7 @@
 	{ (uintptr_t)&XentSys,		"syscall" },
 	{ (uintptr_t)&XentUna,		"unaligned access fault" },
 	{ (uintptr_t)&XentRestart,	"console restart" },
-	{ NULL }
+	{ 0, NULL }
 };
 
 
@@ -180,7 +180,7 @@
 {
 	int i;
 
-	for (i = 0; special_symbols[i].ss_val != NULL; ++i)
+	for (i = 0; special_symbols[i].ss_val != 0; ++i)
 		if (v == special_symbols[i].ss_val)
 			return 1;
 	return 0;
@@ -339,7 +339,7 @@
 		if (sym_is_trapsymbol(symval)) {
 			tf = (struct trapframe *)frame;
 
-			for (i = 0; special_symbols[i].ss_val != NULL; ++i)
+			for (i = 0; special_symbols[i].ss_val != 0; ++i)
 				if (symval == special_symbols[i].ss_val)
 					db_printf("--- %s",
 					    special_symbols[i].ss_note);

==== //depot/projects/power/sys/alpha/alpha/dump_machdep.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.6 2003/12/23 02:36:41 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,7 +88,7 @@
 
 	dumplo = di->mediaoffset + di->mediasize - Maxmem * (off_t)PAGE_SIZE;
 	dumplo -= sizeof kdh * 2;
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing header (%d)\n", i);
 	dumplo += sizeof kdh;
@@ -111,7 +111,7 @@
 			printf(" %d", count / (1024 * 1024 / PAGE_SIZE));
 			mb = i;
 		}
-		i = di->dumper(di->priv, va, NULL, dumplo, left * PAGE_SIZE);
+		i = di->dumper(di->priv, va, 0, dumplo, left * PAGE_SIZE);
 		if (i)
 			break;
 		count += left;
@@ -120,10 +120,10 @@
 	}
 	if (i) 
 		printf("\nDump failed writing data (%d)\n", i);
-	i = di->dumper(di->priv, &kdh, NULL, dumplo, sizeof kdh);
+	i = di->dumper(di->priv, &kdh, 0, dumplo, sizeof kdh);
 	if (i)
 		printf("\nDump failed writing trailer (%d)\n", i);
-	di->dumper(di->priv, NULL, NULL, 0, 0);  /* tell them we are done */
+	di->dumper(di->priv, NULL, 0, 0, 0);  /* tell them we are done */
 	printf("\nDump complete\n");
 	return;
 }

==== //depot/projects/power/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.16 2003/09/25 01:10:22 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.17 2003/12/23 02:42:38 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -81,15 +81,31 @@
 						ELFOSABI_FREEBSD,
 						EM_ALPHA,
 						"FreeBSD",
-						"",
+						NULL,
 						"/libexec/ld-elf.so.1",
-						&elf64_freebsd_sysvec
+						&elf64_freebsd_sysvec,
+						NULL,
 					  };
 
 SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
 	(sysinit_cfunc_t) elf64_insert_brand_entry,
 	&freebsd_brand_info);
 
+static Elf64_Brandinfo freebsd_brand_oinfo = {
+						ELFOSABI_FREEBSD,
+						EM_ALPHA,
+						"FreeBSD",
+						NULL,
+						"/usr/libexec/ld-elf.so.1",
+						&elf64_freebsd_sysvec,
+						NULL,
+					  };
+
+SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,
+	(sysinit_cfunc_t) elf64_insert_brand_entry,
+	&freebsd_brand_oinfo);
+
+
 /* Process one elf relocation with addend. */
 static int
 elf_reloc_internal(linker_file_t lf, const void *data, int type, int local)

==== //depot/projects/power/sys/alpha/alpha/mp_machdep.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -339,7 +339,6 @@
 			continue;
 		mp_maxid = i;
 	}
-	mp_maxid++;
 }
 
 int

==== //depot/projects/power/sys/alpha/alpha/vm_machdep.c#3 (text+ko) ====

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.96 2003/11/16 23:40:05 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -415,6 +415,7 @@
 	mtx_lock(&sf_freelist.sf_lock);
 	while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
 		sf_buf_alloc_want++;
+		mbstat.sf_allocwait++;
 		error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
 		    "sfbufa", 0);
 		sf_buf_alloc_want--;
@@ -428,6 +429,8 @@
 	if (sf != NULL) {
 		SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list);
 		sf->m = m;
+		nsfbufsused++;
+		nsfbufspeak = imax(nsfbufspeak, nsfbufsused);
 	}
 	mtx_unlock(&sf_freelist.sf_lock);
 	return (sf);
@@ -457,6 +460,7 @@
 	sf->m = NULL;
 	mtx_lock(&sf_freelist.sf_lock);
 	SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
+	nsfbufsused--;
 	if (sf_buf_alloc_want > 0)
 		wakeup_one(&sf_freelist);
 	mtx_unlock(&sf_freelist.sf_lock);

==== //depot/projects/power/sys/alpha/conf/GENERIC#4 (text+ko) ====

@@ -12,13 +12,13 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files. 
-# If you are in doubt as to the purpose or necessity of a line, check first 
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.164 2003/11/13 02:04:34 jeff Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.165 2003/12/08 05:20:34 obrien Exp $
 
 machine		alpha
 cpu		EV4
@@ -62,7 +62,7 @@
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
-options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI 
+options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
 options 	KTRACE			#ktrace(1) syscall trace support
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
@@ -111,8 +111,10 @@
 device		pass		# Passthrough device (direct SCSI access)
 device		ses		# SCSI Environmental Services (and SAF-TE)
 
+# RAID controllers interfaced to the SCSI subsystem
+device		amr		# AMI MegaRAID
+
 # RAID controllers
-device		amr		# AMI MegaRAID
 device		mlx		# Mylex DAC960 family
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
@@ -139,12 +141,12 @@
 device		lpt		# Printer
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
- 
+
 # If you've got a "dumb" serial or parallel PCI card that is
 # supported by the puc(4) glue driver, uncomment the following
 # line to enable it (connects to the sio and/or ppc drivers):
 #device         puc
- 
+
 # PCI Ethernet NICs.
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		txp		# 3Com 3cR990 (``Typhoon'')

==== //depot/projects/power/sys/alpha/conf/GENERIC.hints#2 (text+ko) ====

@@ -1,10 +1,11 @@
-# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.7 2003/12/05 00:57:11 des Exp $
 hint.fdc.0.at="isa"
 hint.fdc.0.port="0x3F0"
 hint.fdc.0.irq="6"
 hint.fdc.0.drq="2"
 hint.fd.0.at="fdc0"
 hint.fd.0.drive="0"
+hint.fd.0.flags="4"
 hint.ata.0.at="isa"
 hint.ata.0.port="0x1F0"
 hint.ata.0.irq="14"

==== //depot/projects/power/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ====

@@ -1,298 +1,38 @@
-/*
- * extensions to ioctl_meteor.h for the bt848 cards
+/*-
+ * Copyright (c) 2003 David O'Brien
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.2 2000/10/27 07:07:24 roger Exp $
+ * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $
  */
 
-#ifndef  _MACHINE_IOCTL_BT848_H_
-#define  _MACHINE_IOCTL_BT848_H_
+#ifndef	_MACHINE_IOCTL_BT848_H_
+#define	_MACHINE_IOCTL_BT848_H_
 
-/*
- * frequency sets
- */
-#define CHNLSET_NABCST		1
-#define CHNLSET_CABLEIRC	2
-#define CHNLSET_CABLEHRC	3
-#define CHNLSET_WEUROPE		4
-#define CHNLSET_JPNBCST         5
-#define CHNLSET_JPNCABLE        6

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401020528.i025SdSV068682>