PERFORCE change 107851 for review
Robert Watson
rwatson at FreeBSD.org
Fri Oct 13 17:57:53 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107851
Change 107851 by rwatson at rwatson_zoo on 2006/10/14 00:57:03
Integrate TrustedBSD priv branch from TrustedBSD base. See
@107850 for a description of integrated changes.
Affected files ...
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/ia32/ia32_sigtramp.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/intr_machdep.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/include/stdarg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/isa/atpic_vector.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/amd64/linux32/linux32_machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/include/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/arm/include/stdarg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/help.common#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/loader.8#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/merge_help.awk#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/common/panic.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/forth/support.4th#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/Makefile.inc#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/btx/btx/btx.S#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/biospci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/bootinfo64.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/libi386/libi386.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/loader/help.i386#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/i386/pxeldr/pxeboot.8#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/openfirm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/ofw/libofw/openfirm_mmu.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/boot/pc98/boot2/inode.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/hcall.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/boot/sparc64/loader/main.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit_internal.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit_kevents.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/bsm/audit_record.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/cam_periph.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/cam/scsi/scsi_da.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_proto.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_signal.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_genassym.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_signal.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_emul.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_misc.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/Makefile.sun4v#1 branch
.. //depot/projects/trustedbsd/priv/sys/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files#4 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files.amd64#3 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files.i386#2 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/files.sun4v#1 branch
.. //depot/projects/trustedbsd/priv/sys/conf/kern.post.mk#2 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/kmod.mk#2 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/options#3 integrate
.. //depot/projects/trustedbsd/priv/sys/conf/options.sun4v#1 branch
.. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/freebsd/ah_if.m#2 delete
.. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/freebsd/ah_osdep.c#3 delete
.. //depot/projects/trustedbsd/priv/sys/contrib/dev/ath/freebsd/ah_osdep.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ddb/db_command.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ddb/db_examine.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ddb/db_output.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ddb/db_output.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/Osd/OsdHardware.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/aic/aic_pccard.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ata/ata-chipset.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ath/ah_osdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/atkbdc/atkbd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bce/if_bce.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bge.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bge/if_bgereg.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/bktr/bktr_i2c.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/digi/digi.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/em/if_em.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/exca/exca.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/fxp/if_fxp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_acpi.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_isa.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_kcs.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smbios.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smbus.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_smic.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmi_ssif.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/ipmi/ipmivars.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ips/ips.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ips/ipsreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/isp/isp_freebsd.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfi_debug.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/mfi/mfivar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ofw/openfirm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ofw/openfirm.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_if.m#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sk/if_sk.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sk/if_skreg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/smbus/smb.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/driver.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/midi/sequencer.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ak452x.c#2 delete
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/ak452x.h#2 delete
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/atiixp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/envy24ht.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hda_reg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_private.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/hda/hdac_reg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pci/spicds.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/ac97_patch.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/buffer.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/channel_if.m#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/dsp.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/sound/usb/uaudio_pcm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/syscons/syscons.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_includes.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_inline.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/twa/tw_osl_share.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/uart/uart_kbd_sun.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_aue.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_cdce.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_kue.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/ohci.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/ukbd.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_quirks.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usb_subr.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/usbdi.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/dev/vkbd/vkbd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/devfs/devfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_conv.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/nwfs/nwfs_subr.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/portalfs/portal_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/procfs/procfs_ioctl.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/udf/udf_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/umapfs/umap_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/cache/g_cache.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/geom/cache/g_cache.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/eli/g_eli_ctl.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/label/g_label_msdosfs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/label/g_label_msdosfs.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/nop/g_nop.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/busdma_machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/i386/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/include/stdarg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/isa/atpic_vector.s#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/ia32/ia32_signal.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ia64/include/stdarg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/init_main.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_event.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_mac.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_sig.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_time.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_timeout.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/kern_umtx.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/subr_rtc.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/kern/sys_generic.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/syscalls.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/syscalls.master#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sysv_msg.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/tty.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/tty_pts.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/tty_tty.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_mqueue.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_cluster.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_mount.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath_hal/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/digi/digi/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/geom/geom_cache/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/if_tap/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/ipmi/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/kbdmux/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/libalias/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/cuseeme/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/dummy/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/ftp/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/irc/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/modules.inc#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/nbt/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/pptp/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/skinny/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/libalias/modules/smedia/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/mfi/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/procfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/ak452x/Makefile#2 delete
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/envy24/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/envy24ht/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/hda/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/sound/driver/spicds/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/modules/ukbd/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/vkbd/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/bridgestp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_bridge.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_loop.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_tap.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_tap.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/net/if_vlan.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/net80211/ieee80211_ioctl.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/atm/ccatm/ng_ccatm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netgraph/ng_nat.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/in.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/in_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_mroute.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_cuseeme.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_db.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_dummy.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_ftp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_irc.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_local.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_mod.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_mod.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_nbt.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_old.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_pptp.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_proxy.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_skinny.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_smedia.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/alias_util.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/libalias/libalias.3#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_subr.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/in6.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/cbus/clock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/cbus/pckbd.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/priv/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/agp_amd64.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/include/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/include/stdarg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/clock.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/powerpc/powerpc/db_interface.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit.c#6 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_bsm_token.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_syscalls.c#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/audit/audit_worker.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_framework.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_inet.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_internal.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_pipe.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_posix_sem.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_process.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_msg.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_sem.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_sysv_shm.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/security/mac_portacl/mac_portacl.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/asi.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/elf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/include/stdarg.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/db_interface.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/pmap.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sparc64/sparc64/tsb.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sun4v/compile/.cvsignore#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/DEFAULTS#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/GENERIC.hints#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/MAC#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/Makefile#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/conf/NOTES#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/_bus.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/_inttypes.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/_limits.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/_types.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/asi.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/asm.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/asmacros.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/atomic.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus_common.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus_dma.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/bus_private.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/cache.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ccr.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/cddl/mdesc.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/cddl/mdesc_impl.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/clock.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/cpu.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/cpufunc.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/db_machdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/elf.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/endian.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/exec.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/float.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/floatingpoint.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/fp.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/frame.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/fsr.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/gdb_machdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/hv_pcivar.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/hviommu.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisor_api.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/hypervisorvar.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/idprom.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ieee.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ieeefp.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/in_cksum.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/instr.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/intr_machdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/iommureg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/iommuvar.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/kdb.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/kerneldump.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ktr.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/limits.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/lsu.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/md_var.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/mdesc_bus.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/mdesc_bus_subr.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/memdev.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/metadata.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/mmu.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/mutex.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/nexusvar.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_bus.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_machdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_mem.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_nexus.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ofw_upa.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/param.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcb.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/pcpu.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/pmap.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/pmc_mdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/proc.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/profile.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/pstate.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ptrace.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/reg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/reloc.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/resource.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/runq.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/sc_machdep.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/setjmp.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/sigframe.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/signal.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/smp.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/stdarg.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/sun4v_cpufunc.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/sysarch.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/tick.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/tlb.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/trap.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/tsb.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/tstate.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/tte.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/tte_hash.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ucontext.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/upa.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/utrap.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/varargs.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/ver.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/vmparam.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/watch.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/include/wstate.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_bus_if.m#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_bus_subr.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_diff.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_findname.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_findnodeprop.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_fini.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getbinsize.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getgen.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropdata.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropstr.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_getpropval.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_init.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_init_intern.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_nodecount.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_rootnode.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_scandag.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_subr.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/mdesc/mdesc_vdevfindval.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/autoconf.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/bus_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/clock.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/counter.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_disasm.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_hwwatch.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_interface.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/db_trace.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/dump_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/eeprom.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/elf_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/exception.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/gdb_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hcall.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hv_pci.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hvcons.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/hviommu.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/identcpu.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/in_cksum.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/interrupt.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/intr_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/iommu.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/locore.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mem.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_exception.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_locore.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/mp_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/nexus.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/ofw_bus.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/ofw_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/pmap.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/prof_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/rtc.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/rwindow.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/simdisk.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/support.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/swtch.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/sys_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/t1_copy.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tick.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tlb.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/trap_trace.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tsb.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/tte_hash.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/uio_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vm_machdep.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/vnex.c#1 branch
.. //depot/projects/trustedbsd/priv/sys/sun4v/sun4v/wbuf.S#1 branch
.. //depot/projects/trustedbsd/priv/sys/sys/_elf_solaris.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sys/buf.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/cdefs.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/clock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/consio.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/copyright.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/digiio.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/elf.h#1 branch
.. //depot/projects/trustedbsd/priv/sys/sys/elf32.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/elf64.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/elf_common.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/event.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/ioccom.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/ipmi.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/kbio.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/kernel.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/lockmgr.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mbuf.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mount.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/param.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/pioctl.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/proc.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/rtprio.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/rwlock.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/signalvar.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/soundcard.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/syscall.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/syscall.mk#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/sysproto.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/systm.h#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/thr.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/time.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/ttycom.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/umtx.h#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_inode.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_snapshot.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ffs/ffs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/inode.h#2 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_quota.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vm_page.c#3 integrate
.. //depot/projects/trustedbsd/priv/sys/vm/vnode_pager.c#2 integrate
Differences ...
==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/intr_machdep.c#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/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.24 2006/10/13 17:31:57 jhb Exp $
*/
/*
@@ -37,6 +37,7 @@
* that source.
*/
+#include "opt_atpic.h"
#include "opt_ddb.h"
#include <sys/param.h>
@@ -55,6 +56,13 @@
#include <ddb/ddb.h>
#endif
+#ifndef DEV_ATPIC
+#include <machine/segments.h>
+#include <dev/ic/i8259.h>
+#include <amd64/isa/icu.h>
+#include <amd64/isa/isa.h>
+#endif
+
#define MAX_STRAY_LOG 5
typedef void (*mask_fn)(void *);
@@ -62,6 +70,7 @@
static int intrcnt_index;
static struct intsrc *interrupt_sources[NUM_IO_INTS];
static struct mtx intr_table_lock;
+static STAILQ_HEAD(, pic) pics;
#ifdef SMP
static int assign_cpu;
@@ -70,11 +79,46 @@
#endif
static void intr_init(void *__dummy);
+static int intr_pic_registered(struct pic *pic);
static void intrcnt_setname(const char *name, int index);
static void intrcnt_updatename(struct intsrc *is);
static void intrcnt_register(struct intsrc *is);
+static int
+intr_pic_registered(struct pic *pic)
+{
+ struct pic *p;
+
+ STAILQ_FOREACH(p, &pics, pics) {
+ if (p == pic)
+ return (1);
+ }
+ return (0);
+}
+
/*
+ * Register a new interrupt controller (PIC). This is to support suspend
+ * and resume where we suspend/resume controllers rather than individual
+ * sources. This also allows controllers with no active sources (such as
+ * 8259As in a system using the APICs) to participate in suspend and resume.
+ */
+int
+intr_register_pic(struct pic *pic)
+{
+ int error;
+
+ mtx_lock_spin(&intr_table_lock);
+ if (intr_pic_registered(pic))
+ error = EBUSY;
+ else {
+ STAILQ_INSERT_TAIL(&pics, pic, pics);
+ error = 0;
+ }
+ mtx_unlock_spin(&intr_table_lock);
+ return (error);
+}
+
+/*
* Register a new interrupt source with the global interrupt system.
* The global interrupts need to be disabled when this function is
* called.
@@ -84,6 +128,7 @@
{
int error, vector;
+ KASSERT(intr_pic_registered(isrc->is_pic), ("unregistered PIC"));
vector = isrc->is_pic->pic_vector(isrc);
if (interrupt_sources[vector] != NULL)
return (EEXIST);
@@ -255,26 +300,29 @@
void
intr_resume(void)
{
- struct intsrc **isrc;
- int i;
+ struct pic *pic;
+#ifndef DEV_ATPIC
+ atpic_reset();
+#endif
mtx_lock_spin(&intr_table_lock);
- for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++)
- if (*isrc != NULL && (*isrc)->is_pic->pic_resume != NULL)
- (*isrc)->is_pic->pic_resume(*isrc);
+ STAILQ_FOREACH(pic, &pics, pics) {
+ if (pic->pic_resume != NULL)
+ pic->pic_resume(pic);
+ }
mtx_unlock_spin(&intr_table_lock);
}
void
intr_suspend(void)
{
- struct intsrc **isrc;
- int i;
+ struct pic *pic;
mtx_lock_spin(&intr_table_lock);
- for (i = 0, isrc = interrupt_sources; i < NUM_IO_INTS; i++, isrc++)
- if (*isrc != NULL && (*isrc)->is_pic->pic_suspend != NULL)
- (*isrc)->is_pic->pic_suspend(*isrc);
+ STAILQ_FOREACH(pic, &pics, pics) {
+ if (pic->pic_suspend != NULL)
+ pic->pic_suspend(pic);
+ }
mtx_unlock_spin(&intr_table_lock);
}
@@ -327,10 +375,33 @@
intrcnt_setname("???", 0);
intrcnt_index = 1;
+ STAILQ_INIT(&pics);
mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN);
}
SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL)
+#ifndef DEV_ATPIC
+/* Initialize the two 8259A's to a known-good shutdown state. */
+void
+atpic_reset(void)
+{
+
+ outb(IO_ICU1, ICW1_RESET | ICW1_IC4);
+ outb(IO_ICU1 + ICU_IMR_OFFSET, IDT_IO_INTS);
+ outb(IO_ICU1 + ICU_IMR_OFFSET, 1 << 2);
+ outb(IO_ICU1 + ICU_IMR_OFFSET, ICW4_8086);
+ outb(IO_ICU1 + ICU_IMR_OFFSET, 0xff);
+ outb(IO_ICU1, OCW3_SEL | OCW3_RR);
+
+ outb(IO_ICU2, ICW1_RESET | ICW1_IC4);
+ outb(IO_ICU2 + ICU_IMR_OFFSET, IDT_IO_INTS + 8);
+ outb(IO_ICU2 + ICU_IMR_OFFSET, 2);
+ outb(IO_ICU2 + ICU_IMR_OFFSET, ICW4_8086);
+ outb(IO_ICU2 + ICU_IMR_OFFSET, 0xff);
+ outb(IO_ICU2, OCW3_SEL | OCW3_RR);
+}
+#endif
+
#ifdef DDB
/*
* Dump data about interrupt handlers
==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/io_apic.c#2 (text+ko) ====
@@ -28,9 +28,8 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.24 2006/04/05 20:43:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.25 2006/10/10 23:23:11 jhb Exp $");
-#include "opt_atpic.h"
#include "opt_isa.h"
#include <sys/param.h>
@@ -61,8 +60,6 @@
#define IRQ_SMI (NUM_IO_INTS + 3)
#define IRQ_DISABLED (NUM_IO_INTS + 4)
-#define TODO printf("%s: not implemented!\n", __func__)
-
static MALLOC_DEFINE(M_IOAPIC, "io_apic", "I/O APIC structures");
/*
@@ -115,8 +112,7 @@
static int ioapic_source_pending(struct intsrc *isrc);
static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig,
enum intr_polarity pol);
-static void ioapic_suspend(struct intsrc *isrc);
-static void ioapic_resume(struct intsrc *isrc);
+static void ioapic_resume(struct pic *pic);
static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id);
static void ioapic_program_intpin(struct ioapic_intsrc *intpin);
@@ -124,7 +120,7 @@
struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source,
ioapic_eoi_source, ioapic_enable_intr,
ioapic_vector, ioapic_source_pending,
- ioapic_suspend, ioapic_resume,
+ NULL, ioapic_resume,
ioapic_config_intr, ioapic_assign_cpu };
static int next_ioapic_base;
@@ -419,17 +415,13 @@
}
static void
-ioapic_suspend(struct intsrc *isrc)
+ioapic_resume(struct pic *pic)
{
+ struct ioapic *io = (struct ioapic *)pic;
+ int i;
- TODO;
-}
-
-static void
-ioapic_resume(struct intsrc *isrc)
-{
-
- ioapic_program_intpin((struct ioapic_intsrc *)isrc);
+ for (i = 0; i < io->io_numintr; i++)
+ ioapic_program_intpin(&io->io_pins[i]);
}
/*
@@ -727,6 +719,7 @@
io->io_intbase + io->io_numintr - 1);
/* Register valid pins as interrupt sources. */
+ intr_register_pic(&io->io_pic);
for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++)
if (pin->io_irq < NUM_IO_INTS)
intr_register_source(&pin->io_intsrc);
==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/local_apic.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.29 2006/09/11 20:12:42 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.32 2006/10/10 23:23:11 jhb Exp $");
#include "opt_hwpmc_hooks.h"
@@ -151,12 +151,15 @@
static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz;
static void lapic_enable(void);
+static void lapic_resume(struct pic *pic);
static void lapic_timer_enable_intr(void);
static void lapic_timer_oneshot(u_int count);
static void lapic_timer_periodic(u_int count);
static void lapic_timer_set_divisor(u_int divisor);
static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value);
+struct pic lapic_pic = { .pic_resume = lapic_resume };
+
static uint32_t
lvt_mode(struct lapic *la, u_int pin, uint32_t value)
{
@@ -277,7 +280,7 @@
}
void
-lapic_setup(void)
+lapic_setup(int boot)
{
struct lapic *la;
u_int32_t maxlvt;
@@ -306,9 +309,13 @@
/* Program timer LVT and setup handler. */
lapic->lvt_timer = lvt_mode(la, LVT_TIMER, lapic->lvt_timer);
- snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid));
- intrcnt_add(buf, &la->la_timer_count);
- if (PCPU_GET(cpuid) != 0) {
+ if (boot) {
+ snprintf(buf, sizeof(buf), "cpu%d: timer", PCPU_GET(cpuid));
+ intrcnt_add(buf, &la->la_timer_count);
+ }
+
+ /* We don't setup the timer during boot on the BSP until later. */
+ if (!(boot && PCPU_GET(cpuid) == 0)) {
KASSERT(lapic_timer_period != 0, ("lapic%u: zero divisor",
lapic_id()));
lapic_timer_set_divisor(lapic_timer_divisor);
@@ -398,6 +405,14 @@
lapic->svr = value;
}
+/* Reset the local APIC on the BSP during resume. */
+static void
+lapic_resume(struct pic *pic)
+{
+
+ lapic_setup(0);
+}
+
int
lapic_id(void)
{
@@ -613,13 +628,17 @@
/* Send EOI first thing. */
lapic_eoi();
-#ifdef SMP
+#if defined(SMP) && !defined(SCHED_ULE)
/*
* Don't do any accounting for the disabled HTT cores, since it
* will provide misleading numbers for the userland.
*
* No locking is necessary here, since even if we loose the race
* when hlt_cpus_mask changes it is not a big deal, really.
+ *
+ * Don't do that for ULE, since ULE doesn't consider hlt_cpus_mask
+ * and unlike other schedulers it actually schedules threads to
+ * those CPUs.
*/
if ((hlt_cpus_mask & (1 << PCPU_GET(cpuid))) != 0)
return;
@@ -979,7 +998,8 @@
* Finish setting up the local APIC on the BSP once we know how to
* properly program the LINT pins.
*/
- lapic_setup();
+ lapic_setup(1);
+ intr_register_pic(&lapic_pic);
if (bootverbose)
lapic_dump("BSP");
}
==== //depot/projects/trustedbsd/priv/sys/amd64/amd64/machdep.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.652 2006/09/07 15:03:02 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.656 2006/10/12 12:48:21 jhb Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -61,6 +61,7 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
+#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
@@ -124,9 +125,11 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the trustedbsd-cvs
mailing list