[email protected]
[Top] [All Lists]

PERFORCE change 114394 for review

Subject: PERFORCE change 114394 for review
From: Robert Watson
Date: Sun, 11 Feb 2007 19:00:02 GMT
http://perforce.freebsd.org/chv.cgi?CH=114394

Change 114394 by [email protected]_zoo on 2007/02/11 18:59:36

        Integrate TrustedBSD priv branch up to [email protected]

Affected files ...

.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/gdb_machdep.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/specialreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#6 
integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/pci/pci_bus.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/arm/pmap.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/at91/at91_twi.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/at91/uart_dev_at91usart.c#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/arm/conf/EP80219#3 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/include/bus_dma.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/include/md_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/include/pmap.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/avila_machdep.c#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_mem.c#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425_pci.c#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/arm/xscale/ixp425/ixp425var.h#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/loader.8#4 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/pnp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/pnpdata#2 delete
.. //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#4 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/coda/coda_vfsops.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ipc.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_mib.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#11 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_signal.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_socket.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/NOTES#8 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files#10 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files.powerpc#4 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files.sparc64#5 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/kmod.mk#4 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/options#6 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/options.sun4v#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ddb/db_command.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/ddb/db_thread.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aac/aac_cam.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_package.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_pcib_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_perf.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi_throttle.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpivar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/sample/sample.c#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/ath_rate/sample/sample.h#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bcereg.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/cy/cy_isa.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_eisa.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/dpt/dpt_scsi.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/fb/boot_font.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/fb/creator.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/fb/creatorreg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/fb/fbreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/fb/gallant12x22.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/fb/gfb.c#2 delete
.. //depot/projects/trustedbsd/priv/sys/dev/fb/gfb.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/firewire/fwohci_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/gfb/gfb_pci.c#2 delete
.. //depot/projects/trustedbsd/priv/sys/dev/gfb/gfb_pci.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/dev/ichsmb/ichsmb.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/idt/idtreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_pci.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_sbus.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_target.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_tpublic.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/ispvar.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_cbus.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_isa.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_lebuffer.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_ledma.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/le/if_le_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/le/lance.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/le/lebuffer_sbus.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/mc146818/mc146818reg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/acphy.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/acphyreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/amphy.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/brgphy.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/exphy.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/inphy.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/lxtphy.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/mii.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/mii_physubr.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/miivar.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/nsphy.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/rlphy.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/ruephy.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mii/ukphy.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mxge/if_mxge_var.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pccard/pccard.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_if.m#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_private.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_if.m#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pcib_private.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pcireg.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/re/if_re.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/si/si.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/driver.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ad1816.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ad1816.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/ess.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/mss.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb16.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/isa/sb8.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midi.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midi.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/midiq.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu401.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu401.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpu_if.m#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/mpufoi_if.m#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/synth_if.m#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/maestro.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/vchan.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/sbus/cs4231.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_cpu.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_dev_sab82532.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_dev_z8530.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_aue.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_auereg.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/ubsa.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/uhub.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/uipaq.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_ethersubr.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/uvisor.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/deadfs/dead_vnops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/denode.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vnops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/geom_apple.c#2 delete
.. //depot/projects/trustedbsd/priv/sys/geom/geom_gpt.c#3 delete
.. //depot/projects/trustedbsd/priv/sys/geom/geom_io.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/geom/part/g_part.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_apm.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_gpt.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/geom/part/g_part_if.m#1 branch
.. //depot/projects/trustedbsd/priv/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/cpufreq/powernow.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/mptable_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/msi.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/nexus.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/pmap.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/intr_machdep.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/specialreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/linux.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#8 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/pci/pci_bus.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/exec.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/floatingpoint.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/reloc.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/imgact_elf.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_acct.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_acl.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_conf.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_fork.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_idle.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_intr.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_kse.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_kthread.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_ktrace.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_ntptime.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_prot.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_subr.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sched_core.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_firmware.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_taskqueue.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/tty_pts.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_export.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/Makefile#7 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath/Makefile#3 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_sample/Makefile#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/modules/geom/Makefile#4 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ip_mroute_mod/Makefile#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/modules/le/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/msdosfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/emu10kx/Makefile#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/modules/uipaq/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/net/bpf.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/net/bpf_compat.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/bridgestp.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_loop.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_tap.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_tun.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/COPYRIGHT#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/aarp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/at.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/at_extern.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/at_proto.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/at_rmx.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/at_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_input.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_output.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_pcb.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_pcb.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netatalk/ddp_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_deflate.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ksocket.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_ppp.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_pptpgre.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_pred1.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_tcpmss.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/in.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/in.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#9 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_auth.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_crc32.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_indata.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_input.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_output.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_peeloff.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_structs.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_timer.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_var.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/ah_core.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/esp_aesctr.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/icmp6.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_cksum.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_if.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_input.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_ip.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_ip.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_outputfl.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_pcb.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_proto.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_usrreq.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/ipx_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/spx.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/spx_debug.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/spx_debug.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/spx_timer.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netipx/spx_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netnatm/natm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netnatm/natm.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netnatm/natm_pcb.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netnatm/natm_proto.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netsmb/smb_dev.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vfs_subs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vfsops.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/alpm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/amdpm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/amdsmb.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/if_pcn.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/if_rl.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/if_rlreg.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/intpm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/intpmreg.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/nfsmb.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/viapm.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/include/ipl.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/powerpc/include/reloc.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/cpu.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/machdep.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#7 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#8 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_label.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_pipe.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_posix_sem.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_system.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_msg.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_sem.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_shm.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_vfs.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_biba/mac_biba.c#4 integrate
.. 
//depot/projects/trustedbsd/priv/sys/security/mac_bsdextended/mac_bsdextended.c#5
 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_ifoff/mac_ifoff.c#3 
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_lomac/mac_lomac.c#7 
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_mls/mac_mls.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_none/mac_none.c#3 integrate
.. 
//depot/projects/trustedbsd/priv/sys/security/mac_partition/mac_partition.c#5 
integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#7 
integrate
.. 
//depot/projects/trustedbsd/priv/sys/security/mac_seeotheruids/mac_seeotheruids.c#5
 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_stub/mac_stub.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/creator/creator.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/sparc64/creator/creator_upa.c#2 delete
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/cache.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/frame.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/fsr.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/intr_machdep.h#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/ofw_nexus.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/pcb.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/reloc.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/tsb.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sbus/dma_sbus.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/bus_machdep.c#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/exception.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/genassym.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/interrupt.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_exception.S#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/mp_locore.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/ofw_machdep.c#2 
integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/support.S#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/swtch.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/upa.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/.cvsignore#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/frame.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/fsr.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/intr_machdep.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcb.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/reloc.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/setjmp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/smp.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/utrap.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/bus_machdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/exception.S#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hv_pci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/interrupt.S#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_locore.S#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/support.S#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/swtch.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/wbuf.S#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/_label.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/sys/apm.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sys/ata.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/buf.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/bufobj.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/conf.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/copyright.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/lock.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mac.h#6 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#7 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/param.h#7 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/priority.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/proc.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/rtprio.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/runq.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/sched.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/socketvar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/systm.h#8 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_alloc.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_extern.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_rawread.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/quota.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#7 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/swap_pager.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/uma.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/uma_core.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_glue.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_object.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_zeroidle.c#4 integrate

Differences ...

==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/identcpu.c#2 (text+ko) 
====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 
obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 
jkim Exp $");
 
 #include "opt_cpu.h"
 
@@ -228,8 +228,8 @@
                                "\007<b6>"
                                "\010EST"       /* Enhanced SpeedStep */
                                "\011TM2"       /* Thermal Monitor 2 */
-                               "\012<b9>"
-                               "\013CNTX-ID"   /* L1 context ID available */
+                               "\012SSSE3"     /* SSSE3 */
+                               "\013CNXT-ID"   /* L1 context ID available */
                                "\014<b11>"
                                "\015<b12>"
                                "\016CX16"      /* CMPXCHG16B Instruction */

==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#6 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 
davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.669 2007/01/27 18:13:24 
jkoshy Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -1176,7 +1176,6 @@
         *           under witness.
         */
        mutex_init();
-       mtx_init(&clock_lock, "clk", NULL, MTX_SPIN);
        mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS);
 
        /* exceptions */
@@ -1184,7 +1183,7 @@
                setidt(x, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0);
        setidt(IDT_DE, &IDTVEC(div),  SDT_SYSIGT, SEL_KPL, 0);
        setidt(IDT_DB, &IDTVEC(dbg),  SDT_SYSIGT, SEL_KPL, 0);
-       setidt(IDT_NMI, &IDTVEC(nmi),  SDT_SYSIGT, SEL_KPL, 0);
+       setidt(IDT_NMI, &IDTVEC(nmi),  SDT_SYSIGT, SEL_KPL, 1);
        setidt(IDT_BP, &IDTVEC(bpt),  SDT_SYSIGT, SEL_UPL, 0);
        setidt(IDT_OF, &IDTVEC(ofl),  SDT_SYSIGT, SEL_KPL, 0);
        setidt(IDT_BR, &IDTVEC(bnd),  SDT_SYSIGT, SEL_KPL, 0);
@@ -1207,6 +1206,12 @@
        lidt(&r_idt);
 
        /*
+        * Initialize the i8254 before the console so that console
+        * initialization can use DELAY().
+        */
+       i8254_init();
+
+       /*
         * Initialize the console before we print anything out.
         */
        cninit();

==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#4 (text+ko) 
====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 
23:23:11 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.281 2007/02/08 
16:49:58 jhb Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -632,6 +632,8 @@
                        continue;
                if (cpu_info[apic_id].cpu_bsp)
                        continue;
+               if (cpu_info[apic_id].cpu_disabled)
+                       continue;
 
                /* Don't let hyperthreads service interrupts. */
                if (hyperthreading_cpus > 1 &&
@@ -948,20 +950,15 @@
 
        ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]);
 
-#ifdef IPI_PREEMPTION
-       if (ipi_bitmap & IPI_PREEMPT) {
+       if (ipi_bitmap & (1 << IPI_PREEMPT)) {
+               struct thread *running_thread = curthread;
                mtx_lock_spin(&sched_lock);
-               /* Don't preempt the idle thread */
-               if (curthread->td_priority <  PRI_MIN_IDLE) {
-                       struct thread *running_thread = curthread;
-                       if (running_thread->td_critnest > 1) 
-                               running_thread->td_owepreempt = 1;
-                       else            
-                               mi_switch(SW_INVOL | SW_PREEMPT, NULL);
-               }
+               if (running_thread->td_critnest > 1) 
+                       running_thread->td_owepreempt = 1;
+               else            
+                       mi_switch(SW_INVOL | SW_PREEMPT, NULL);
                mtx_unlock_spin(&sched_lock);
        }
-#endif
 
        /* Nothing to do for AST */
 }

==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/mptable_pci.c#3 (text+ko) 
====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 
19:27:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 
21:48:42 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,6 +120,7 @@
        DEVMETHOD(pcib_alloc_msi,       mptable_hostb_alloc_msi),
        DEVMETHOD(pcib_release_msi,     pcib_release_msi),
        DEVMETHOD(pcib_alloc_msix,      mptable_hostb_alloc_msix),
+       DEVMETHOD(pcib_remap_msix,      pcib_remap_msix),
        DEVMETHOD(pcib_release_msix,    pcib_release_msix),
 
        { 0, 0 }
@@ -176,6 +177,7 @@
        DEVMETHOD(pcib_alloc_msi,       pcib_alloc_msi),
        DEVMETHOD(pcib_release_msi,     pcib_release_msi),
        DEVMETHOD(pcib_alloc_msix,      pcib_alloc_msix),
+       DEVMETHOD(pcib_remap_msix,      pcib_remap_msix),
        DEVMETHOD(pcib_release_msix,    pcib_release_msix),
 
        {0, 0}

==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/msi.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb 
Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb 
Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -480,6 +480,30 @@
 }
 
 int
+msix_remap(int index, int irq)
+{
+       struct msi_intsrc *msi;
+
+       sx_xlock(&msi_sx);
+       msi = (struct msi_intsrc *)intr_lookup_source(irq);
+       if (msi == NULL) {
+               sx_xunlock(&msi_sx);
+               return (ENOENT);
+       }
+
+       /* Make sure this is an MSI-X message. */
+       if (!msi->msi_msix) {
+               sx_xunlock(&msi_sx);
+               return (EINVAL);
+       }
+
+       KASSERT(msi->msi_dev != NULL, ("unowned message"));
+       msi->msi_index = index;
+       sx_xunlock(&msi_sx);
+       return (0);
+}
+
+int
 msix_release(int irq)
 {
        struct msi_intsrc *msi;

==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/nexus.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb 
Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb 
Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
@@ -105,6 +105,7 @@
 static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int 
maxcount, int *irqs);
 static int nexus_release_msi(device_t pcib, device_t dev, int count, int 
*irqs);
 static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq);
+static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq);
 static int nexus_release_msix(device_t pcib, device_t dev, int irq);
 
 static device_method_t nexus_methods[] = {
@@ -135,6 +136,7 @@
        DEVMETHOD(pcib_alloc_msi,       nexus_alloc_msi),
        DEVMETHOD(pcib_release_msi,     nexus_release_msi),
        DEVMETHOD(pcib_alloc_msix,      nexus_alloc_msix),
+       DEVMETHOD(pcib_remap_msix,      nexus_remap_msix),
        DEVMETHOD(pcib_release_msix,    nexus_release_msix),
 
        { 0, 0 }
@@ -371,24 +373,9 @@
         * If this is a memory resource, map it into the kernel.
         */
        if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
-               caddr_t vaddr = 0;
+               void *vaddr;
 
-               if (rman_get_end(r) < 1024 * 1024) {
-                       /*
-                        * The first 1Mb is mapped at KERNBASE.
-                        */
-                       vaddr = (caddr_t)(uintptr_t)(KERNBASE + 
rman_get_start(r));
-               } else {
-                       u_int64_t paddr;
-                       u_int64_t psize;
-                       u_int32_t poffs;
-
-                       paddr = rman_get_start(r);
-                       psize = rman_get_size(r);
-
-                       poffs = paddr - trunc_page(paddr);
-                       vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) 
+ poffs;
-               }
+               vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r));
                rman_set_virtual(r, vaddr);
                rman_set_bushandle(r, (bus_space_handle_t) vaddr);
        }
@@ -402,12 +389,9 @@
        /*
         * If this is a memory resource, unmap it.
         */
-       if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) &&
-           (rman_get_end(r) >= 1024 * 1024)) {
-               u_int32_t psize;
-
-               psize = rman_get_size(r);
-               pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize);
+       if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) {
+               pmap_unmapdev((vm_offset_t)rman_get_virtual(r),
+                   rman_get_size(r));
        }
                
        return (rman_deactivate_resource(r));
@@ -528,6 +512,13 @@
 }
 
 static int
+nexus_remap_msix(device_t pcib, device_t dev, int index, int irq)
+{
+
+       return (msix_remap(index, irq));
+}
+
+static int
 nexus_release_msix(device_t pcib, device_t dev, int irq)
 {
 

==== //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#5 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.471 2006/12/13 03:41:47 yongari Exp 
$
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.472 2007/02/07 18:55:29 marcel Exp $
 
 cpu            HAMMER
 ident          GENERIC
@@ -43,7 +43,7 @@
 options        CD9660                  # ISO 9660 Filesystem
 options        PROCFS                  # Process filesystem (requires PSEUDOFS)
 options        PSEUDOFS                # Pseudo-filesystem framework
-options        GEOM_GPT                # GUID Partition Tables.
+options        GEOM_PART_GPT           # GUID Partition Tables.
 options        COMPAT_43TTY            # BSD 4.3 TTY compat [KEEP THIS!]
 options        COMPAT_IA32             # Compatible with i386 binaries
 options        COMPAT_FREEBSD4         # Compatible with FreeBSD4

==== //depot/projects/trustedbsd/priv/sys/amd64/include/clock.h#3 (text+ko) ====

@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
@@ -22,7 +22,8 @@
 extern int     timer0_max_count;
 extern uint64_t        tsc_freq;
 extern int     tsc_is_broken;
-extern struct mtx clock_lock;
+
+void   i8254_init(void);
 
 /*
  * Driver to clock driver interface.

==== //depot/projects/trustedbsd/priv/sys/amd64/include/gdb_machdep.h#2 
(text+ko) ====

@@ -23,13 +23,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.5 2006/04/04 03:00:20 
marcel Exp $
+ * $FreeBSD: src/sys/amd64/include/gdb_machdep.h,v 1.6 2007/02/05 21:48:32 jhb 
Exp $
  */
 
 #ifndef _MACHINE_GDB_MACHDEP_H_
 #define        _MACHINE_GDB_MACHDEP_H_
 
-#define        GDB_BUFSZ       500
+#define        GDB_BUFSZ       (GDB_NREGS * 16)
 #define        GDB_NREGS       56
 #define        GDB_REG_PC      16
 

==== //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#4 
(text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 
jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 
jhb Exp $
  */
 
 #ifndef __MACHINE_INTR_MACHDEP_H__
@@ -152,6 +152,7 @@
 void   msi_init(void);
 int    msi_release(int *irqs, int count);
 int    msix_alloc(device_t dev, int index, int *irq, int *new);
+int    msix_remap(int index, int irq);
 int    msix_release(int irq);
 
 #endif /* !LOCORE */

==== //depot/projects/trustedbsd/priv/sys/amd64/include/md_var.h#2 (text+ko) 
====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu 
Exp $
+ * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc 
Exp $
  */
 
 #ifndef _MACHINE_MD_VAR_H_

==== //depot/projects/trustedbsd/priv/sys/amd64/include/pcpu.h#2 (text+ko) ====

@@ -23,14 +23,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.44 2005/03/11 22:16:09 peter Exp 
$
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.46 2007/02/06 18:04:02 bde Exp $
  */
 
 #ifndef _MACHINE_PCPU_H_
-#define _MACHINE_PCPU_H_
+#define        _MACHINE_PCPU_H_
 
 #ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
+#error "sys/cdefs.h is a prerequisite for this file"
 #endif
 
 #ifdef _KERNEL
@@ -51,16 +51,15 @@
        u_int   pc_apic_id;                                             \
        u_int   pc_acpi_id              /* ACPI CPU id */
 
-#if defined(lint)
- 
+#ifdef lint
+
 extern struct pcpu *pcpup;
- 
-#define PCPU_GET(member)        (pcpup->pc_ ## member)
-#define PCPU_PTR(member)        (&pcpup->pc_ ## member)
-#define PCPU_SET(member,value)  (pcpup->pc_ ## member = (value))
- 
-#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) \
-    && defined(__GNUCLIKE___OFFSETOF)
+
+#define        PCPU_GET(member)        (pcpup->pc_ ## member)
+#define        PCPU_PTR(member)        (&pcpup->pc_ ## member)
+#define        PCPU_SET(member, val)   (pcpup->pc_ ## member = (val))
+
+#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF)
 
 /*
  * Evaluates to the byte offset of the per-cpu variable name.
@@ -92,69 +91,39 @@
  * Evaluates to the value of the per-cpu variable name.
  */
 #define        __PCPU_GET(name) __extension__ ({                               
\
-       __pcpu_type(name) __result;                                     \
+       __pcpu_type(name) __res;                                        \
+       struct __s {                                                    \
+               u_char  __b[MIN(sizeof(__pcpu_type(name)), 8)];         \
+       } __s;                                                          \
                                                                        \
-       if (sizeof(__result) == 1) {                                    \
-               u_char __b;                                             \
-               __asm __volatile("movb %%gs:%1,%0"                      \
-                   : "=r" (__b)                                        \
-                   : "m" (*(u_char *)(__pcpu_offset(name))));          \
-               __result = *(__pcpu_type(name) *)&__b;                  \
-       } else if (sizeof(__result) == 2) {                             \
-               u_short __w;                                            \
-               __asm __volatile("movw %%gs:%1,%0"                      \
-                   : "=r" (__w)                                        \
-                   : "m" (*(u_short *)(__pcpu_offset(name))));         \
-               __result = *(__pcpu_type(name) *)&__w;                  \
-       } else if (sizeof(__result) == 4) {                             \
-               u_int __i;                                              \
-               __asm __volatile("movl %%gs:%1,%0"                      \
-                   : "=r" (__i)                                        \
-                   : "m" (*(u_int *)(__pcpu_offset(name))));           \
-               __result = *(__pcpu_type(name) *)&__i;                  \
-       } else if (sizeof(__result) == 8) {                             \
-               u_long __l;                                             \
-               __asm __volatile("movq %%gs:%1,%0"                      \
-                   : "=r" (__l)                                        \
-                   : "m" (*(u_long *)(__pcpu_offset(name))));          \
-               __result = *(__pcpu_type(name) *)&__l;                  \

>>> TRUNCATED FOR MAIL (1000 lines) <<<
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/p4-projects
To unsubscribe, send any mail to "[email protected]"

<Prev in Thread] Current Thread [Next in Thread>
  • PERFORCE change 114394 for review, Robert Watson <=