PERFORCE change 40222 for review
John Baldwin
jhb at FreeBSD.org
Wed Oct 22 17:41:09 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=40222
Change 40222 by jhb at jhb_laptop on 2003/10/22 17:40:24
IFC @40211.
Warner, you may want to sanity check my merges in pci.c, but I
think they are correct.
Affected files ...
.. //depot/projects/power/sys/alpha/alpha/elf_machdep.c#2 integrate
.. //depot/projects/power/sys/alpha/alpha/machdep.c#2 integrate
.. //depot/projects/power/sys/alpha/alpha/pmap.c#2 integrate
.. //depot/projects/power/sys/alpha/alpha/promcons.c#2 integrate
.. //depot/projects/power/sys/alpha/alpha/trap.c#2 integrate
.. //depot/projects/power/sys/alpha/conf/GENERIC#2 integrate
.. //depot/projects/power/sys/alpha/include/bus.h#2 integrate
.. //depot/projects/power/sys/alpha/include/elf.h#2 integrate
.. //depot/projects/power/sys/alpha/include/pmap.h#2 integrate
.. //depot/projects/power/sys/alpha/linux/linux_sysvec.c#2 integrate
.. //depot/projects/power/sys/alpha/osf1/osf1_sysvec.c#2 integrate
.. //depot/projects/power/sys/alpha/tlsb/zs_tlsb.c#2 integrate
.. //depot/projects/power/sys/amd64/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/amd64_mem.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/busdma_machdep.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/exception.S#2 integrate
.. //depot/projects/power/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/support.S#2 integrate
.. //depot/projects/power/sys/amd64/amd64/trap.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/tsc.c#2 integrate
.. //depot/projects/power/sys/amd64/amd64/uma_machdep.c#1 branch
.. //depot/projects/power/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/power/sys/amd64/ia32/ia32_syscall.c#2 integrate
.. //depot/projects/power/sys/amd64/include/acpica_machdep.h#2 integrate
.. //depot/projects/power/sys/amd64/include/bus_amd64.h#2 integrate
.. //depot/projects/power/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/power/sys/amd64/include/cpu.h#2 integrate
.. //depot/projects/power/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/power/sys/amd64/include/endian.h#2 integrate
.. //depot/projects/power/sys/amd64/include/frame.h#2 integrate
.. //depot/projects/power/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/power/sys/amd64/include/md_var.h#2 integrate
.. //depot/projects/power/sys/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/power/sys/amd64/include/pmap.h#2 integrate
.. //depot/projects/power/sys/amd64/include/segments.h#2 integrate
.. //depot/projects/power/sys/amd64/include/signal.h#2 integrate
.. //depot/projects/power/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/power/sys/amd64/include/ucontext.h#2 integrate
.. //depot/projects/power/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/power/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/power/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/power/sys/arm/include/elf.h#2 integrate
.. //depot/projects/power/sys/boot/forth/beastie.4th#2 integrate
.. //depot/projects/power/sys/boot/i386/libi386/comconsole.c#2 integrate
.. //depot/projects/power/sys/boot/pc98/libpc98/comconsole.c#2 integrate
.. //depot/projects/power/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_all.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_sa.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_targ_bh.c#2 integrate
.. //depot/projects/power/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/power/sys/coda/coda_subr.c#2 integrate
.. //depot/projects/power/sys/coda/coda_vfsops.c#2 integrate
.. //depot/projects/power/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/power/sys/compat/ia32/ia32_util.h#2 integrate
.. //depot/projects/power/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/power/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/power/sys/compat/linux/linux_misc.c#2 integrate
.. //depot/projects/power/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/power/sys/compat/linux/linux_uid16.c#2 integrate
.. //depot/projects/power/sys/compat/pecoff/imgact_pecoff.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_filio.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_signal.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_sysvec.c#2 integrate
.. //depot/projects/power/sys/compat/svr4/svr4_util.h#2 integrate
.. //depot/projects/power/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/power/sys/conf/NOTES#2 integrate
.. //depot/projects/power/sys/conf/files#2 integrate
.. //depot/projects/power/sys/conf/files.amd64#2 integrate
.. //depot/projects/power/sys/conf/files.ia64#2 integrate
.. //depot/projects/power/sys/conf/kmod.mk#2 integrate
.. //depot/projects/power/sys/conf/ldscript.i386#2 integrate
.. //depot/projects/power/sys/conf/majors#2 integrate
.. //depot/projects/power/sys/conf/options#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/exfldio.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rsaddr.c#2 integrate
.. //depot/projects/power/sys/contrib/dev/acpica/rsirq.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/Makefile#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_step.h#1 branch
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate
.. //depot/projects/power/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate
.. //depot/projects/power/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate
.. //depot/projects/power/sys/contrib/ngatm/FREEBSD-upgrade#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/misc/unimsg_common.c#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/saal_sscop.c#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/sscfu.h#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/sscfudef.h#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/sscfupriv.h#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/sscop.h#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/sscopdef.h#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/saal/sscoppriv.h#1 branch
.. //depot/projects/power/sys/contrib/ngatm/netnatm/unimsg.h#1 branch
.. //depot/projects/power/sys/crypto/blowfish/bf_ecb.c#1 branch
.. //depot/projects/power/sys/crypto/blowfish/blowfish.h#2 integrate
.. //depot/projects/power/sys/crypto/cast128/cast128.c#2 integrate
.. //depot/projects/power/sys/crypto/cast128/cast128.h#2 integrate
.. //depot/projects/power/sys/crypto/cast128/cast128_subkey.h#2 delete
.. //depot/projects/power/sys/crypto/cast128/cast128sb.h#1 branch
.. //depot/projects/power/sys/crypto/rijndael/Makefile#1 branch
.. //depot/projects/power/sys/crypto/rijndael/boxes-fst.dat#2 delete
.. //depot/projects/power/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate
.. //depot/projects/power/sys/crypto/rijndael/rijndael-alg-fst.h#2 integrate
.. //depot/projects/power/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate
.. //depot/projects/power/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate
.. //depot/projects/power/sys/crypto/rijndael/rijndael_local.h#2 integrate
.. //depot/projects/power/sys/crypto/rijndael/test00.c#1 branch
.. //depot/projects/power/sys/ddb/db_elf.c#2 integrate
.. //depot/projects/power/sys/dev/aac/aac.c#2 integrate
.. //depot/projects/power/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/power/sys/dev/aac/aacreg.h#2 integrate
.. //depot/projects/power/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/Osd/OsdSynch.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_acad.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_button.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_cmbat.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_pci.c#3 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_resource.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/power/sys/dev/acpica/acpiio.h#2 integrate
.. //depot/projects/power/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/power/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate
.. //depot/projects/power/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/power/sys/dev/amr/amr_disk.c#2 integrate
.. //depot/projects/power/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/power/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/asr/asr.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-all.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-chipset.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-disk.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/power/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/power/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/power/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/power/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/power/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/power/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/power/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/power/sys/dev/cardbus/cardbus_cis.c#2 integrate
.. //depot/projects/power/sys/dev/cardbus/cardbus_cis.h#2 integrate
.. //depot/projects/power/sys/dev/ciss/ciss.c#2 integrate
.. //depot/projects/power/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/power/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/power/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/power/sys/dev/ed/if_ed_isa.c#2 integrate
.. //depot/projects/power/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/ed/if_edreg.h#2 integrate
.. //depot/projects/power/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/power/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/power/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/power/sys/dev/ep/if_ep.c#2 integrate
.. //depot/projects/power/sys/dev/ep/if_ep_eisa.c#2 integrate
.. //depot/projects/power/sys/dev/ep/if_ep_isa.c#2 integrate
.. //depot/projects/power/sys/dev/ep/if_ep_mca.c#2 integrate
.. //depot/projects/power/sys/dev/ep/if_ep_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/ep/if_epreg.h#2 integrate
.. //depot/projects/power/sys/dev/ep/if_epvar.h#2 integrate
.. //depot/projects/power/sys/dev/exca/exca.c#2 integrate
.. //depot/projects/power/sys/dev/fb/fb.c#2 integrate
.. //depot/projects/power/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/power/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/firewire.h#2 integrate
.. //depot/projects/power/sys/dev/firewire/firewirereg.h#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwcrom.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwdev.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwmem.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwmem.h#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwohci.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwohcireg.h#2 integrate
.. //depot/projects/power/sys/dev/firewire/fwphyreg.h#1 branch
.. //depot/projects/power/sys/dev/firewire/if_fwe.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/sbp.c#2 integrate
.. //depot/projects/power/sys/dev/firewire/sbp.h#1 branch
.. //depot/projects/power/sys/dev/firewire/sbp_targ.c#1 branch
.. //depot/projects/power/sys/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/power/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/power/sys/dev/hifn/hifn7751reg.h#2 integrate
.. //depot/projects/power/sys/dev/hifn/hifn7751var.h#2 integrate
.. //depot/projects/power/sys/dev/ic/ns16550.h#2 integrate
.. //depot/projects/power/sys/dev/iir/iir.c#2 integrate
.. //depot/projects/power/sys/dev/iir/iir.h#2 integrate
.. //depot/projects/power/sys/dev/iir/iir_ctrl.c#2 integrate
.. //depot/projects/power/sys/dev/iir/iir_pci.c#2 integrate
.. //depot/projects/power/sys/dev/ips/ips_commands.c#2 integrate
.. //depot/projects/power/sys/dev/ips/ips_disk.c#2 integrate
.. //depot/projects/power/sys/dev/isp/isp.c#2 integrate
.. //depot/projects/power/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/power/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/power/sys/dev/isp/isp_inline.h#2 integrate
.. //depot/projects/power/sys/dev/isp/isp_target.c#2 integrate
.. //depot/projects/power/sys/dev/isp/isp_target.h#2 integrate
.. //depot/projects/power/sys/dev/isp/isp_tpublic.h#2 integrate
.. //depot/projects/power/sys/dev/isp/ispvar.h#2 integrate
.. //depot/projects/power/sys/dev/kbd/atkbd.c#2 integrate
.. //depot/projects/power/sys/dev/kbd/kbd.c#2 integrate
.. //depot/projects/power/sys/dev/kbd/kbdreg.h#2 integrate
.. //depot/projects/power/sys/dev/matcd/matcd.c#2 integrate
.. //depot/projects/power/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/power/sys/dev/md/md.c#2 integrate
.. //depot/projects/power/sys/dev/mii/brgphy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/power/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/power/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/power/sys/dev/nmdm/nmdm.c#2 integrate
.. //depot/projects/power/sys/dev/null/null.c#2 integrate
.. //depot/projects/power/sys/dev/ofw/ofw_console.c#2 integrate
.. //depot/projects/power/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/power/sys/dev/ofw/openfirmio.c#2 integrate
.. //depot/projects/power/sys/dev/owi/if_owi.c#2 integrate
.. //depot/projects/power/sys/dev/pccard/card_if.m#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccard.c#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccard_cis.c#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccard_cis.h#1 branch
.. //depot/projects/power/sys/dev/pccard/pccard_cis_quirks.c#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccarddevs#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccarddevs.h#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccardreg.h#2 integrate
.. //depot/projects/power/sys/dev/pccard/pccardvar.h#2 integrate
.. //depot/projects/power/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/power/sys/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/power/sys/dev/pci/pci_private.h#3 integrate
.. //depot/projects/power/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/power/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/power/sys/dev/pci/pcivar.h#3 integrate
.. //depot/projects/power/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/power/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/power/sys/dev/puc/pucvar.h#2 integrate
.. //depot/projects/power/sys/dev/raidframe/rf_decluster.c#2 integrate
.. //depot/projects/power/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate
.. //depot/projects/power/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/power/sys/dev/sab/sab.c#2 integrate
.. //depot/projects/power/sys/dev/scd/scd.c#2 integrate
.. //depot/projects/power/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/power/sys/dev/sio/sio_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/sio/sioreg.h#2 integrate
.. //depot/projects/power/sys/dev/sound/isa/mpu.c#2 integrate
.. //depot/projects/power/sys/dev/sound/isa/uartsio.c#2 integrate
.. //depot/projects/power/sys/dev/sound/pci/au88x0.c#2 integrate
.. //depot/projects/power/sys/dev/sound/pci/au88x0.h#2 integrate
.. //depot/projects/power/sys/dev/sound/pci/ich.c#2 integrate
.. //depot/projects/power/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/power/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/power/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_bus_acpi.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_bus_ebus.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_bus_isa.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_bus_pccard.c#1 branch
.. //depot/projects/power/sys/dev/uart/uart_bus_pci.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_bus_puc.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu.h#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu_alpha.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu_amd64.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu_i386.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu_ia64.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu_pc98.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_cpu_sparc64.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_dev_i8251.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_if.m#2 integrate
.. //depot/projects/power/sys/dev/uart/uart_tty.c#2 integrate
.. //depot/projects/power/sys/dev/usb/if_aue.c#2 integrate
.. //depot/projects/power/sys/dev/usb/if_auereg.h#2 integrate
.. //depot/projects/power/sys/dev/usb/if_cue.c#2 integrate
.. //depot/projects/power/sys/dev/usb/if_cuereg.h#2 integrate
.. //depot/projects/power/sys/dev/usb/if_kue.c#2 integrate
.. //depot/projects/power/sys/dev/usb/if_kuereg.h#2 integrate
.. //depot/projects/power/sys/dev/usb/if_rue.c#2 integrate
.. //depot/projects/power/sys/dev/usb/if_ruereg.h#2 integrate
.. //depot/projects/power/sys/dev/usb/ubsa.c#2 integrate
.. //depot/projects/power/sys/dev/usb/ufm.c#2 integrate
.. //depot/projects/power/sys/dev/usb/ugen.c#2 integrate
.. //depot/projects/power/sys/dev/usb/uhid.c#2 integrate
.. //depot/projects/power/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/power/sys/dev/usb/ulpt.c#2 integrate
.. //depot/projects/power/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/power/sys/dev/usb/ums.c#2 integrate
.. //depot/projects/power/sys/dev/usb/usb.c#2 integrate
.. //depot/projects/power/sys/dev/usb/usb_mem.c#2 integrate
.. //depot/projects/power/sys/dev/usb/usb_port.h#2 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs.h#2 integrate
.. //depot/projects/power/sys/dev/usb/usbdevs_data.h#2 integrate
.. //depot/projects/power/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/power/sys/dev/vinum/vinumconfig.c#2 integrate
.. //depot/projects/power/sys/dev/vinum/vinumrequest.c#2 integrate
.. //depot/projects/power/sys/dev/vinum/vinumrevive.c#2 integrate
.. //depot/projects/power/sys/dev/vinum/vinumvar.h#2 integrate
.. //depot/projects/power/sys/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/xe/if_xe.c#2 integrate
.. //depot/projects/power/sys/dev/xe/if_xe_pccard.c#2 integrate
.. //depot/projects/power/sys/dev/xe/if_xereg.h#2 integrate
.. //depot/projects/power/sys/dev/xe/if_xevar.h#2 integrate
.. //depot/projects/power/sys/dev/zs/zs.c#2 integrate
.. //depot/projects/power/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/hpfs/hpfs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_iconv.c#1 branch
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs.h#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_iconv.c#1 branch
.. //depot/projects/power/sys/fs/ntfs/ntfs_subr.c#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_subr.h#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/ntfs/ntfsmount.h#2 integrate
.. //depot/projects/power/sys/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/power/sys/fs/nwfs/nwfs_node.c#2 integrate
.. //depot/projects/power/sys/fs/nwfs/nwfs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_dbregs.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_fpregs.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_map.c#2 integrate
.. //depot/projects/power/sys/fs/procfs/procfs_regs.c#2 integrate
.. //depot/projects/power/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate
.. //depot/projects/power/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_io.c#2 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/power/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/specfs/spec_vnops.c#2 integrate
.. //depot/projects/power/sys/fs/udf/udf_vnops.c#2 integrate
.. //depot/projects/power/sys/geom/bde/g_bde.h#2 integrate
.. //depot/projects/power/sys/geom/bde/g_bde_lock.c#2 integrate
.. //depot/projects/power/sys/geom/geom.h#2 integrate
.. //depot/projects/power/sys/geom/geom_ctl.c#2 integrate
.. //depot/projects/power/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/power/sys/geom/geom_disk.c#2 integrate
.. //depot/projects/power/sys/geom/geom_event.c#2 integrate
.. //depot/projects/power/sys/geom/geom_fox.c#2 integrate
.. //depot/projects/power/sys/geom/geom_io.c#2 integrate
.. //depot/projects/power/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_bmap.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_inode.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/power/sys/gnu/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_machdep.c#2 integrate
.. //depot/projects/power/sys/i386/acpica/acpi_wakeup.c#2 integrate
.. //depot/projects/power/sys/i386/bios/smapi.c#2 integrate
.. //depot/projects/power/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/power/sys/i386/conf/NOTES#2 integrate
.. //depot/projects/power/sys/i386/i386/bios.c#2 integrate
.. //depot/projects/power/sys/i386/i386/elan-mmcr.c#2 integrate
.. //depot/projects/power/sys/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/power/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/power/sys/i386/i386/i686_mem.c#2 integrate
.. //depot/projects/power/sys/i386/i386/locore.s#2 integrate
.. //depot/projects/power/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/power/sys/i386/i386/mp_machdep.c#2 integrate
.. //depot/projects/power/sys/i386/i386/mpboot.s#2 integrate
.. //depot/projects/power/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/power/sys/i386/i386/support.s#2 integrate
.. //depot/projects/power/sys/i386/i386/swtch.s#2 integrate
.. //depot/projects/power/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/power/sys/i386/i386/tsc.c#2 integrate
.. //depot/projects/power/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_signal.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_util.c#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/ibcs2_util.h#2 integrate
.. //depot/projects/power/sys/i386/ibcs2/imgact_coff.c#2 integrate
.. //depot/projects/power/sys/i386/include/bus_at386.h#2 integrate
.. //depot/projects/power/sys/i386/include/bus_pc98.h#2 integrate
.. //depot/projects/power/sys/i386/include/clock.h#2 integrate
.. //depot/projects/power/sys/i386/include/elf.h#2 integrate
.. //depot/projects/power/sys/i386/include/endian.h#2 integrate
.. //depot/projects/power/sys/i386/include/md_var.h#2 integrate
.. //depot/projects/power/sys/i386/include/pcb.h#2 integrate
.. //depot/projects/power/sys/i386/include/pci_cfgreg.h#2 integrate
.. //depot/projects/power/sys/i386/include/pmap.h#2 integrate
.. //depot/projects/power/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/power/sys/i386/isa/apic_vector.s#2 integrate
.. //depot/projects/power/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/power/sys/i386/isa/cy.c#2 integrate
.. //depot/projects/power/sys/i386/isa/isa_compat.c#2 integrate
.. //depot/projects/power/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate
.. //depot/projects/power/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/power/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/power/sys/ia64/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/pmap.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/ssc.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/syscall.S#2 integrate
.. //depot/projects/power/sys/ia64/ia64/trap.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/uma_machdep.c#1 branch
.. //depot/projects/power/sys/ia64/ia64/unwind.c#2 integrate
.. //depot/projects/power/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/power/sys/ia64/include/bus.h#2 integrate
.. //depot/projects/power/sys/ia64/include/cpu.h#2 integrate
.. //depot/projects/power/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/power/sys/ia64/include/pmap.h#2 integrate
.. //depot/projects/power/sys/ia64/include/proc.h#2 integrate
.. //depot/projects/power/sys/ia64/include/varargs.h#2 integrate
.. //depot/projects/power/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/power/sys/isa/fd.c#2 integrate
.. //depot/projects/power/sys/isa/vga_isa.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_iconv.c#1 branch
.. //depot/projects/power/sys/isofs/cd9660/cd9660_lookup.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_mount.h#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_node.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_rrip.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_util.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/cd9660_vnops.c#2 integrate
.. //depot/projects/power/sys/isofs/cd9660/iso.h#2 integrate
.. //depot/projects/power/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/power/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/power/sys/kern/init_main.c#2 integrate
.. //depot/projects/power/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/power/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/power/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/power/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/power/sys/kern/kern_event.c#2 integrate
.. //depot/projects/power/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/power/sys/kern/kern_idle.c#2 integrate
.. //depot/projects/power/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/power/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/power/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/power/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/power/sys/kern/kern_physio.c#2 integrate
.. //depot/projects/power/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/power/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/power/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/power/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/power/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/power/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/power/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/power/sys/kern/kern_sysctl.c#2 integrate
.. //depot/projects/power/sys/kern/kern_xxx.c#2 integrate
.. //depot/projects/power/sys/kern/linker_if.m#2 integrate
.. //depot/projects/power/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/power/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/power/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/power/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/power/sys/kern/subr_disk.c#2 integrate
.. //depot/projects/power/sys/kern/subr_kobj.c#2 integrate
.. //depot/projects/power/sys/kern/subr_mbuf.c#2 integrate
.. //depot/projects/power/sys/kern/subr_smp.c#2 integrate
.. //depot/projects/power/sys/kern/subr_witness.c#2 integrate
.. //depot/projects/power/sys/kern/subr_xxx.c#2 delete
.. //depot/projects/power/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/power/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/power/sys/kern/sys_process.c#2 integrate
.. //depot/projects/power/sys/kern/syscalls.c#2 integrate
.. //depot/projects/power/sys/kern/syscalls.master#2 integrate
.. //depot/projects/power/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/power/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/power/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/power/sys/kern/tty_cons.c#2 integrate
.. //depot/projects/power/sys/kern/tty_pty.c#2 integrate
.. //depot/projects/power/sys/kern/tty_tty.c#2 integrate
.. //depot/projects/power/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/power/sys/kern/uipc_socket2.c#2 integrate
.. //depot/projects/power/sys/kern/uipc_syscalls.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_aio.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_init.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_syscalls.c#2 integrate
.. //depot/projects/power/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/power/sys/libkern/iconv.c#2 integrate
.. //depot/projects/power/sys/libkern/iconv_converter_if.m#2 integrate
.. //depot/projects/power/sys/libkern/iconv_xlat.c#2 integrate
.. //depot/projects/power/sys/libkern/iconv_xlat16.c#1 branch
.. //depot/projects/power/sys/modules/Makefile#2 integrate
.. //depot/projects/power/sys/modules/bridge/Makefile#2 integrate
.. //depot/projects/power/sys/modules/cd9660/Makefile#2 integrate
.. //depot/projects/power/sys/modules/cd9660_iconv/Makefile#1 branch
.. //depot/projects/power/sys/modules/firewire/Makefile#2 integrate
.. //depot/projects/power/sys/modules/firewire/sbp/Makefile#2 integrate
.. //depot/projects/power/sys/modules/firewire/sbp_targ/Makefile#1 branch
.. //depot/projects/power/sys/modules/ipfilter/Makefile#2 integrate
.. //depot/projects/power/sys/modules/libiconv/Makefile#2 integrate
.. //depot/projects/power/sys/modules/msdosfs/Makefile#2 integrate
.. //depot/projects/power/sys/modules/msdosfs_iconv/Makefile#1 branch
.. //depot/projects/power/sys/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/h4/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/hci/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/l2cap/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/socket/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate
.. //depot/projects/power/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate
.. //depot/projects/power/sys/modules/ntfs/Makefile#2 integrate
.. //depot/projects/power/sys/modules/ntfs_iconv/Makefile#1 branch
.. //depot/projects/power/sys/modules/uart/Makefile#2 integrate
.. //depot/projects/power/sys/net/bpf.c#2 integrate
.. //depot/projects/power/sys/net/bpf.h#2 integrate
.. //depot/projects/power/sys/net/bridge.c#2 integrate
.. //depot/projects/power/sys/net/if.c#2 integrate
.. //depot/projects/power/sys/net/if.h#2 integrate
.. //depot/projects/power/sys/net/if_disc.c#2 integrate
.. //depot/projects/power/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/power/sys/net/if_faith.c#2 integrate
.. //depot/projects/power/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/power/sys/net/if_loop.c#2 integrate
.. //depot/projects/power/sys/net/if_stf.c#2 integrate
.. //depot/projects/power/sys/net/if_tun.c#2 integrate
.. //depot/projects/power/sys/net/if_tunvar.h#2 integrate
.. //depot/projects/power/sys/net/if_var.h#2 integrate
.. //depot/projects/power/sys/net/net_osdep.c#2 integrate
.. //depot/projects/power/sys/net/net_osdep.h#2 integrate
.. //depot/projects/power/sys/net/netisr.c#2 integrate
.. //depot/projects/power/sys/net/pfil.c#2 integrate
.. //depot/projects/power/sys/net/pfil.h#2 integrate
.. //depot/projects/power/sys/net/pfkeyv2.h#2 integrate
.. //depot/projects/power/sys/net/radix.c#2 integrate
.. //depot/projects/power/sys/net/route.c#2 integrate
.. //depot/projects/power/sys/net/route.h#2 integrate
.. //depot/projects/power/sys/net/rtsock.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_crypto.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/power/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_misc.h#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate
.. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate
.. //depot/projects/power/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/power/sys/netgraph/ng_message.h#2 integrate
.. //depot/projects/power/sys/netinet/icmp6.h#2 integrate
.. //depot/projects/power/sys/netinet/if_atm.c#2 integrate
.. //depot/projects/power/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/power/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/power/sys/netinet/in_gif.h#2 integrate
.. //depot/projects/power/sys/netinet/in_pcb.c#2 integrate
.. //depot/projects/power/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/power/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/power/sys/netinet/ip6.h#2 integrate
.. //depot/projects/power/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/power/sys/netinet/ip_flow.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/power/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/power/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/power/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/power/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/power/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/power/sys/netinet6/ah.h#2 integrate
.. //depot/projects/power/sys/netinet6/ah6.h#2 integrate
.. //depot/projects/power/sys/netinet6/ah_aesxcbcmac.c#1 branch
.. //depot/projects/power/sys/netinet6/ah_aesxcbcmac.h#1 branch
.. //depot/projects/power/sys/netinet6/ah_core.c#2 integrate
.. //depot/projects/power/sys/netinet6/ah_input.c#2 integrate
.. //depot/projects/power/sys/netinet6/ah_output.c#2 integrate
.. //depot/projects/power/sys/netinet6/dest6.c#2 integrate
.. //depot/projects/power/sys/netinet6/esp.h#2 integrate
.. //depot/projects/power/sys/netinet6/esp_aesctr.c#1 branch
.. //depot/projects/power/sys/netinet6/esp_aesctr.h#1 branch
.. //depot/projects/power/sys/netinet6/esp_core.c#2 integrate
.. //depot/projects/power/sys/netinet6/esp_input.c#2 integrate
.. //depot/projects/power/sys/netinet6/esp_output.c#2 integrate
.. //depot/projects/power/sys/netinet6/esp_rijndael.c#2 integrate
.. //depot/projects/power/sys/netinet6/esp_rijndael.h#2 integrate
.. //depot/projects/power/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/power/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6.h#2 integrate
.. //depot/projects/power/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_gif.h#2 integrate
.. //depot/projects/power/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_prefix.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/power/sys/netinet6/in6_var.h#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_fw.c#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_fw.h#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_id.c#1 branch
.. //depot/projects/power/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/power/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/power/sys/netinet6/ip6protosw.h#2 integrate
.. //depot/projects/power/sys/netinet6/ipcomp_core.c#2 integrate
.. //depot/projects/power/sys/netinet6/ipcomp_input.c#2 integrate
.. //depot/projects/power/sys/netinet6/ipsec.c#2 integrate
.. //depot/projects/power/sys/netinet6/ipsec.h#2 integrate
.. //depot/projects/power/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/power/sys/netinet6/mld6_var.h#2 integrate
.. //depot/projects/power/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/power/sys/netinet6/nd6.h#2 integrate
.. //depot/projects/power/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/power/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/power/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/power/sys/netinet6/route6.c#2 integrate
.. //depot/projects/power/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/power/sys/netinet6/scope6_var.h#2 integrate
.. //depot/projects/power/sys/netinet6/udp6_output.c#2 integrate
.. //depot/projects/power/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/power/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/power/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/power/sys/netipsec/ipsec_input.c#2 integrate
.. //depot/projects/power/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/power/sys/netipsec/ipsec_osdep.h#1 branch
.. //depot/projects/power/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/power/sys/netipsec/key.c#2 integrate
.. //depot/projects/power/sys/netipsec/key_debug.c#2 integrate
.. //depot/projects/power/sys/netipsec/keydb.h#2 integrate
.. //depot/projects/power/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/power/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/power/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/power/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/power/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/power/sys/netkey/key.c#2 integrate
.. //depot/projects/power/sys/netkey/key_debug.c#2 integrate
.. //depot/projects/power/sys/netkey/key_debug.h#2 integrate
.. //depot/projects/power/sys/netkey/key_var.h#2 integrate
.. //depot/projects/power/sys/netkey/keysock.c#2 integrate
.. //depot/projects/power/sys/netncp/ncp_mod.c#2 integrate
.. //depot/projects/power/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/power/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/power/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs_node.c#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/power/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/power/sys/nfsserver/nfs_syscalls.c#2 integrate
.. //depot/projects/power/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/power/sys/pc98/i386/busiosubr.c#2 integrate
.. //depot/projects/power/sys/pc98/i386/machdep.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/clock.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/fd.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/pc98gdc.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/sio.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/wd.c#2 integrate
.. //depot/projects/power/sys/pc98/pc98/wd_cd.c#2 integrate
.. //depot/projects/power/sys/pccard/pcic.c#2 integrate
.. //depot/projects/power/sys/pccard/pcic_pci.c#2 integrate
.. //depot/projects/power/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/power/sys/pci/agp_intel.c#2 integrate
.. //depot/projects/power/sys/pci/if_dc.c#2 integrate
.. //depot/projects/power/sys/pci/if_dcreg.h#2 integrate
.. //depot/projects/power/sys/pci/if_rlreg.h#2 integrate
.. //depot/projects/power/sys/pci/if_sis.c#2 integrate
.. //depot/projects/power/sys/pci/if_sk.c#2 integrate
.. //depot/projects/power/sys/pci/if_skreg.h#2 integrate
.. //depot/projects/power/sys/pci/if_ti.c#2 integrate
.. //depot/projects/power/sys/pci/if_xl.c#2 integrate
.. //depot/projects/power/sys/pci/if_xlreg.h#2 integrate
.. //depot/projects/power/sys/pci/yukonreg.h#1 branch
.. //depot/projects/power/sys/posix4/ksched.c#2 integrate
.. //depot/projects/power/sys/powerpc/include/cpu.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/param.h#2 integrate
.. //depot/projects/power/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/power/sys/powerpc/powermac/ata_macio.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/elf_machdep.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/power/sys/powerpc/powerpc/pmap.c#2 integrate
.. //depot/projects/power/sys/powerpc/psim/ata_iobus.c#2 integrate
.. //depot/projects/power/sys/security/mac/mac_internal.h#1 branch
.. //depot/projects/power/sys/security/mac/mac_net.c#1 branch
.. //depot/projects/power/sys/security/mac/mac_pipe.c#1 branch
.. //depot/projects/power/sys/security/mac/mac_process.c#1 branch
.. //depot/projects/power/sys/security/mac/mac_system.c#1 branch
.. //depot/projects/power/sys/security/mac/mac_vfs.c#1 branch
.. //depot/projects/power/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/power/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/endian.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/param.h#2 integrate
.. //depot/projects/power/sys/sparc64/include/pmap.h#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/elf_machdep.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/ofw_machdep.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/power/sys/sparc64/sparc64/trap.c#2 integrate
.. //depot/projects/power/sys/sys/bio.h#2 integrate
.. //depot/projects/power/sys/sys/buf.h#2 integrate
.. //depot/projects/power/sys/sys/bus.h#2 integrate
.. //depot/projects/power/sys/sys/cdefs.h#2 integrate
.. //depot/projects/power/sys/sys/cdio.h#2 integrate
.. //depot/projects/power/sys/sys/conf.h#2 integrate
.. //depot/projects/power/sys/sys/cons.h#2 integrate
.. //depot/projects/power/sys/sys/domain.h#2 integrate
.. //depot/projects/power/sys/sys/endian.h#2 integrate
.. //depot/projects/power/sys/sys/iconv.h#2 integrate
.. //depot/projects/power/sys/sys/kernel.h#2 integrate
.. //depot/projects/power/sys/sys/kobj.h#2 integrate
.. //depot/projects/power/sys/sys/lock.h#2 integrate
.. //depot/projects/power/sys/sys/mac.h#2 integrate
.. //depot/projects/power/sys/sys/mbuf.h#2 integrate
.. //depot/projects/power/sys/sys/mutex.h#2 integrate
.. //depot/projects/power/sys/sys/param.h#2 integrate
.. //depot/projects/power/sys/sys/proc.h#2 integrate
.. //depot/projects/power/sys/sys/protosw.h#2 integrate
.. //depot/projects/power/sys/sys/ptrace.h#2 integrate
.. //depot/projects/power/sys/sys/sched.h#2 integrate
.. //depot/projects/power/sys/sys/signalvar.h#2 integrate
.. //depot/projects/power/sys/sys/syscall.h#2 integrate
.. //depot/projects/power/sys/sys/syscall.mk#2 integrate
.. //depot/projects/power/sys/sys/sysctl.h#2 integrate
.. //depot/projects/power/sys/sys/sysent.h#2 integrate
.. //depot/projects/power/sys/sys/sysproto.h#2 integrate
.. //depot/projects/power/sys/sys/systm.h#2 integrate
.. //depot/projects/power/sys/sys/uio.h#2 integrate
.. //depot/projects/power/sys/sys/vnode.h#2 integrate
.. //depot/projects/power/sys/tools/makeobjops.awk#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vfsops.c#2 integrate
.. //depot/projects/power/sys/ufs/ffs/ffs_vnops.c#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_bmap.c#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_ihash.c#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_inode.c#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_quota.c#2 integrate
.. //depot/projects/power/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/power/sys/vm/device_pager.c#2 integrate
.. //depot/projects/power/sys/vm/pmap.h#2 integrate
.. //depot/projects/power/sys/vm/swap_pager.c#2 integrate
.. //depot/projects/power/sys/vm/uma.h#2 integrate
.. //depot/projects/power/sys/vm/uma_core.c#2 integrate
.. //depot/projects/power/sys/vm/uma_dbg.c#2 integrate
.. //depot/projects/power/sys/vm/uma_int.h#2 integrate
.. //depot/projects/power/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/power/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/power/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/power/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/power/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/power/sys/vm/vm_map.c#2 integrate
.. //depot/projects/power/sys/vm/vm_map.h#2 integrate
.. //depot/projects/power/sys/vm/vm_mmap.c#2 integrate
.. //depot/projects/power/sys/vm/vm_object.c#2 integrate
.. //depot/projects/power/sys/vm/vm_page.c#2 integrate
.. //depot/projects/power/sys/vm/vm_page.h#2 integrate
.. //depot/projects/power/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/power/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/power/sys/vm/vm_pager.c#2 integrate
.. //depot/projects/power/sys/vm/vnode_pager.c#2 integrate
Differences ...
==== //depot/projects/power/sys/alpha/alpha/elf_machdep.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.15 2003/08/17 08:08:38 gordon Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.16 2003/09/25 01:10:22 peter Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -73,7 +73,8 @@
PS_STRINGS,
VM_PROT_ALL,
exec_copyout_strings,
- exec_setregs
+ exec_setregs,
+ NULL
};
static Elf64_Brandinfo freebsd_brand_info = {
==== //depot/projects/power/sys/alpha/alpha/machdep.c#2 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.212 2003/08/25 03:43:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.213 2003/10/19 02:36:06 peter Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -1731,6 +1731,12 @@
prom_halt(1);
}
+void
+cpu_idle(void)
+{
+ /* Insert code to halt (until next interrupt) for the idle loop */
+}
+
/*
* Clear registers on exec
*/
==== //depot/projects/power/sys/alpha/alpha/pmap.c#2 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.139 2003/10/03 22:46:52 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2093,105 +2093,6 @@
}
/*
- * pmap_prefault provides a quick way of clustering
- * pagefaults into a processes address space. It is a "cousin"
- * of pmap_object_init_pt, except it runs at page fault time instead
- * of mmap time.
- */
-#define PFBAK 4
-#define PFFOR 4
-#define PAGEORDER_SIZE (PFBAK+PFFOR)
-
-static int pmap_prefault_pageorder[] = {
- -1 * PAGE_SIZE, 1 * PAGE_SIZE,
- -2 * PAGE_SIZE, 2 * PAGE_SIZE,
- -3 * PAGE_SIZE, 3 * PAGE_SIZE,
- -4 * PAGE_SIZE, 4 * PAGE_SIZE
-};
-
-void
-pmap_prefault(pmap, addra, entry)
- pmap_t pmap;
- vm_offset_t addra;
- vm_map_entry_t entry;
-{
- int i;
- vm_offset_t starta;
- vm_offset_t addr;
- vm_pindex_t pindex;
- vm_page_t m, mpte;
- vm_object_t object;
-
- if (!curthread || (pmap != vmspace_pmap(curthread->td_proc->p_vmspace)))
- return;
-
- object = entry->object.vm_object;
-
- starta = addra - PFBAK * PAGE_SIZE;
- if (starta < entry->start) {
- starta = entry->start;
- } else if (starta > addra) {
- starta = 0;
- }
-
- mpte = NULL;
- for (i = 0; i < PAGEORDER_SIZE; i++) {
- vm_object_t backing_object, lobject;
- pt_entry_t *pte;
-
- addr = addra + pmap_prefault_pageorder[i];
- if (addr > addra + (PFFOR * PAGE_SIZE))
- addr = 0;
-
- if (addr < starta || addr >= entry->end)
- continue;
-
- if (!pmap_pte_v(pmap_lev1pte(pmap, addr))
- || !pmap_pte_v(pmap_lev2pte(pmap, addr)))
- continue;
-
- pte = vtopte(addr);
- if (*pte)
- continue;
-
- pindex = ((addr - entry->start) + entry->offset) >> PAGE_SHIFT;
- lobject = object;
- VM_OBJECT_LOCK(lobject);
- while ((m = vm_page_lookup(lobject, pindex)) == NULL &&
- lobject->type == OBJT_DEFAULT &&
- (backing_object = lobject->backing_object) != NULL) {
- if (lobject->backing_object_offset & PAGE_MASK)
- break;
- pindex += lobject->backing_object_offset >> PAGE_SHIFT;
- VM_OBJECT_LOCK(backing_object);
- VM_OBJECT_UNLOCK(lobject);
- lobject = backing_object;
- }
- VM_OBJECT_UNLOCK(lobject);
- /*
- * give-up when a page is not in memory
- */
- if (m == NULL)
- break;
- vm_page_lock_queues();
- if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) &&
- (m->busy == 0) &&
- (m->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) {
-
- if ((m->queue - m->pc) == PQ_CACHE) {
- vm_page_deactivate(m);
- }
- vm_page_busy(m);
- vm_page_unlock_queues();
- mpte = pmap_enter_quick(pmap, addr, m, mpte);
- vm_page_lock_queues();
- vm_page_wakeup(m);
- }
- vm_page_unlock_queues();
- }
-}
-
-/*
* Routine: pmap_change_wiring
* Function: Change the wiring attribute for a map/virtual-address
* pair.
@@ -2557,6 +2458,26 @@
}
/*
+ * pmap_is_prefaultable:
+ *
+ * Return whether or not the specified virtual address is elgible
+ * for prefault.
+ */
+boolean_t
+pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr)
+{
+ pt_entry_t *pte;
+
+ if (!pmap_pte_v(pmap_lev1pte(pmap, addr)) ||
+ !pmap_pte_v(pmap_lev2pte(pmap, addr)))
+ return (FALSE);
+ pte = vtopte(addr);
+ if (*pte)
+ return (FALSE);
+ return (TRUE);
+}
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list