PERFORCE change 70025 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sun Jan 30 22:08:07 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=70025
Change 70025 by marcel at marcel_nfs on 2005/01/31 06:07:23
IFC @70022
Affected files ...
.. //depot/projects/uart/alpha/alpha/busdma_machdep.c#6 integrate
.. //depot/projects/uart/alpha/alpha/vm_machdep.c#9 integrate
.. //depot/projects/uart/alpha/include/bus.h#7 integrate
.. //depot/projects/uart/alpha/linux/linux_sysvec.c#5 integrate
.. //depot/projects/uart/alpha/osf1/imgact_osf1.c#4 integrate
.. //depot/projects/uart/alpha/osf1/osf1_sysvec.c#4 integrate
.. //depot/projects/uart/amd64/amd64/apic_vector.S#2 integrate
.. //depot/projects/uart/amd64/amd64/db_trace.c#6 integrate
.. //depot/projects/uart/amd64/amd64/exception.S#6 integrate
.. //depot/projects/uart/amd64/amd64/identcpu.c#4 integrate
.. //depot/projects/uart/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/uart/amd64/amd64/io_apic.c#2 integrate
.. //depot/projects/uart/amd64/amd64/local_apic.c#2 integrate
.. //depot/projects/uart/amd64/amd64/machdep.c#12 integrate
.. //depot/projects/uart/amd64/amd64/mp_machdep.c#3 integrate
.. //depot/projects/uart/amd64/amd64/mptable.c#2 integrate
.. //depot/projects/uart/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/uart/amd64/amd64/vm_machdep.c#8 integrate
.. //depot/projects/uart/amd64/include/apicreg.h#3 integrate
.. //depot/projects/uart/amd64/include/apicvar.h#2 integrate
.. //depot/projects/uart/amd64/include/bus_dma.h#6 integrate
.. //depot/projects/uart/amd64/include/intr_machdep.h#2 integrate
.. //depot/projects/uart/amd64/include/param.h#6 integrate
.. //depot/projects/uart/amd64/include/smp.h#4 integrate
.. //depot/projects/uart/amd64/isa/atpic.c#2 integrate
.. //depot/projects/uart/amd64/isa/elcr.c#2 integrate
.. //depot/projects/uart/amd64/isa/isa.c#5 integrate
.. //depot/projects/uart/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/uart/amd64/pci/pci_cfgreg.c#5 integrate
.. //depot/projects/uart/arm/arm/busdma_machdep.c#4 integrate
.. //depot/projects/uart/arm/arm/cpufunc_asm_xscale.S#4 integrate
.. //depot/projects/uart/arm/arm/locore.S#4 integrate
.. //depot/projects/uart/arm/arm/machdep.c#4 integrate
.. //depot/projects/uart/arm/arm/trap.c#5 integrate
.. //depot/projects/uart/arm/arm/undefined.c#5 integrate
.. //depot/projects/uart/arm/conf/IQ31244#5 integrate
.. //depot/projects/uart/arm/include/bus.h#3 integrate
.. //depot/projects/uart/arm/include/endian.h#6 integrate
.. //depot/projects/uart/arm/include/proc.h#3 integrate
.. //depot/projects/uart/arm/include/trap.h#2 integrate
.. //depot/projects/uart/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/uart/arm/xscale/i80321/files.iq31244#2 integrate
.. //depot/projects/uart/arm/xscale/i80321/i80321_timer.c#3 integrate
.. //depot/projects/uart/arm/xscale/i80321/i80321_wdog.c#1 branch
.. //depot/projects/uart/arm/xscale/i80321/iq31244_7seg.c#1 branch
.. //depot/projects/uart/arm/xscale/i80321/iq80321.c#3 integrate
.. //depot/projects/uart/arm/xscale/i80321/uart_cpu_i80321.c#4 integrate
.. //depot/projects/uart/boot/common/ufsread.c#4 integrate
.. //depot/projects/uart/cam/cam_xpt.c#5 integrate
.. //depot/projects/uart/cam/scsi/scsi_cd.c#9 integrate
.. //depot/projects/uart/cam/scsi/scsi_pass.c#4 integrate
.. //depot/projects/uart/cam/scsi/scsi_ses.c#4 integrate
.. //depot/projects/uart/coda/coda_fbsd.c#5 integrate
.. //depot/projects/uart/coda/coda_venus.c#5 integrate
.. //depot/projects/uart/coda/coda_venus.h#5 integrate
.. //depot/projects/uart/coda/coda_vfsops.c#6 integrate
.. //depot/projects/uart/coda/coda_vnops.c#7 integrate
.. //depot/projects/uart/coda/coda_vnops.h#4 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/uart/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/uart/compat/freebsd32/syscalls.master#5 integrate
.. //depot/projects/uart/compat/ia32/ia32_sysvec.c#4 integrate
.. //depot/projects/uart/compat/linprocfs/linprocfs.c#12 integrate
.. //depot/projects/uart/compat/linux/linux_file.c#4 integrate
.. //depot/projects/uart/compat/linux/linux_getcwd.c#3 integrate
.. //depot/projects/uart/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/uart/compat/linux/linux_ipc.c#3 integrate
.. //depot/projects/uart/compat/linux/linux_mib.c#3 integrate
.. //depot/projects/uart/compat/linux/linux_misc.c#7 integrate
.. //depot/projects/uart/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/uart/compat/linux/linux_socket.c#4 integrate
.. //depot/projects/uart/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/uart/compat/linux/linux_sysctl.c#3 integrate
.. //depot/projects/uart/compat/linux/linux_uid16.c#3 integrate
.. //depot/projects/uart/compat/ndis/hal_var.h#3 integrate
.. //depot/projects/uart/compat/ndis/kern_ndis.c#3 integrate
.. //depot/projects/uart/compat/ndis/ndis_var.h#3 integrate
.. //depot/projects/uart/compat/ndis/ntoskrnl_var.h#3 integrate
.. //depot/projects/uart/compat/ndis/pe_var.h#3 integrate
.. //depot/projects/uart/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/uart/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/uart/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/uart/compat/pecoff/imgact_pecoff.c#6 integrate
.. //depot/projects/uart/compat/svr4/imgact_svr4.c#3 integrate
.. //depot/projects/uart/compat/svr4/svr4_sysvec.c#5 integrate
.. //depot/projects/uart/conf/Makefile.arm#2 integrate
.. //depot/projects/uart/conf/NOTES#23 integrate
.. //depot/projects/uart/conf/files#40 integrate
.. //depot/projects/uart/conf/files.pc98#13 integrate
.. //depot/projects/uart/conf/kern.pre.mk#8 integrate
.. //depot/projects/uart/conf/kmod.mk#12 integrate
.. //depot/projects/uart/conf/newvers.sh#4 integrate
.. //depot/projects/uart/conf/options#17 integrate
.. //depot/projects/uart/contrib/dev/acpica/dsutils.c#4 integrate
.. //depot/projects/uart/contrib/dev/acpica/nsinit.c#4 integrate
.. //depot/projects/uart/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/uart/contrib/pf/net/pf_ioctl.c#2 integrate
.. //depot/projects/uart/dev/aac/aacreg.h#4 integrate
.. //depot/projects/uart/dev/acpica/acpi_pci_link.c#7 integrate
.. //depot/projects/uart/dev/acpica/acpi_pcib.c#9 integrate
.. //depot/projects/uart/dev/acpica/acpi_resource.c#8 integrate
.. //depot/projects/uart/dev/aha/aha.c#6 integrate
.. //depot/projects/uart/dev/aha/aha_isa.c#7 integrate
.. //depot/projects/uart/dev/aha/aha_mca.c#5 integrate
.. //depot/projects/uart/dev/aha/ahareg.h#4 integrate
.. //depot/projects/uart/dev/amr/amr.c#7 integrate
.. //depot/projects/uart/dev/amr/amr_cam.c#5 integrate
.. //depot/projects/uart/dev/amr/amr_disk.c#6 integrate
.. //depot/projects/uart/dev/amr/amr_pci.c#8 integrate
.. //depot/projects/uart/dev/amr/amrreg.h#2 integrate
.. //depot/projects/uart/dev/amr/amrvar.h#6 integrate
.. //depot/projects/uart/dev/ata/ata-card.c#7 integrate
.. //depot/projects/uart/dev/ata/atapi-cd.c#12 integrate
.. //depot/projects/uart/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/uart/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/uart/dev/ath/if_ath.c#14 integrate
.. //depot/projects/uart/dev/ath/if_ath_pci.c#7 integrate
.. //depot/projects/uart/dev/ath/if_athvar.h#10 integrate
.. //depot/projects/uart/dev/bktr/bktr_card.c#7 integrate
.. //depot/projects/uart/dev/bktr/bktr_mem.c#5 integrate
.. //depot/projects/uart/dev/bktr/bktr_tuner.c#7 integrate
.. //depot/projects/uart/dev/bktr/bktr_tuner.h#3 integrate
.. //depot/projects/uart/dev/cardbus/cardbus.c#7 integrate
.. //depot/projects/uart/dev/cardbus/cardbus_cis.c#7 integrate
.. //depot/projects/uart/dev/cardbus/cardbus_cis.h#4 integrate
.. //depot/projects/uart/dev/cardbus/cardbusreg.h#3 integrate
.. //depot/projects/uart/dev/cardbus/cardbusvar.h#3 integrate
.. //depot/projects/uart/dev/ciss/ciss.c#9 integrate
.. //depot/projects/uart/dev/cs/if_cs.c#5 integrate
.. //depot/projects/uart/dev/cs/if_cs_pccard.c#5 integrate
.. //depot/projects/uart/dev/cs/if_csvar.h#4 integrate
.. //depot/projects/uart/dev/ed/if_ed.c#8 integrate
.. //depot/projects/uart/dev/ed/if_ed_pccard.c#9 integrate
.. //depot/projects/uart/dev/ed/if_ed_pci.c#6 integrate
.. //depot/projects/uart/dev/ed/if_edvar.h#5 integrate
.. //depot/projects/uart/dev/em/if_em.c#12 integrate
.. //depot/projects/uart/dev/em/if_em.h#11 integrate
.. //depot/projects/uart/dev/ep/if_ep.c#9 integrate
.. //depot/projects/uart/dev/ep/if_ep_eisa.c#7 integrate
.. //depot/projects/uart/dev/ep/if_ep_isa.c#8 integrate
.. //depot/projects/uart/dev/ep/if_ep_mca.c#5 integrate
.. //depot/projects/uart/dev/ep/if_ep_pccard.c#8 integrate
.. //depot/projects/uart/dev/ep/if_epvar.h#6 integrate
.. //depot/projects/uart/dev/ex/if_ex_pccard.c#4 integrate
.. //depot/projects/uart/dev/exca/exca.c#9 integrate
.. //depot/projects/uart/dev/fdc/fdc.c#7 integrate
.. //depot/projects/uart/dev/fdc/fdc_isa.c#2 integrate
.. //depot/projects/uart/dev/fdc/fdc_pccard.c#2 integrate
.. //depot/projects/uart/dev/fdc/fdcvar.h#2 integrate
.. //depot/projects/uart/dev/fe/if_fe.c#5 integrate
.. //depot/projects/uart/dev/fe/if_fe_cbus.c#4 integrate
.. //depot/projects/uart/dev/fe/if_fe_isa.c#4 integrate
.. //depot/projects/uart/dev/fe/if_fe_pccard.c#6 integrate
.. //depot/projects/uart/dev/fe/if_fevar.h#4 integrate
.. //depot/projects/uart/dev/fxp/if_fxp.c#15 integrate
.. //depot/projects/uart/dev/hifn/hifn7751.c#10 integrate
.. //depot/projects/uart/dev/hifn/hifn7751reg.h#6 integrate
.. //depot/projects/uart/dev/hifn/hifn7751var.h#5 integrate
.. //depot/projects/uart/dev/hme/if_hme.c#7 integrate
.. //depot/projects/uart/dev/if_ndis/if_ndis.c#3 integrate
.. //depot/projects/uart/dev/iir/iir.h#5 integrate
.. //depot/projects/uart/dev/ips/ips.c#5 integrate
.. //depot/projects/uart/dev/ips/ips.h#5 integrate
.. //depot/projects/uart/dev/ips/ips_commands.c#6 integrate
.. //depot/projects/uart/dev/ips/ips_disk.c#5 integrate
.. //depot/projects/uart/dev/ips/ips_ioctl.c#5 integrate
.. //depot/projects/uart/dev/ips/ips_pci.c#8 integrate
.. //depot/projects/uart/dev/isp/isp.c#7 integrate
.. //depot/projects/uart/dev/isp/isp_freebsd.c#7 integrate
.. //depot/projects/uart/dev/isp/isp_pci.c#6 integrate
.. //depot/projects/uart/dev/isp/isp_target.c#5 integrate
.. //depot/projects/uart/dev/isp/isp_target.h#4 integrate
.. //depot/projects/uart/dev/isp/ispvar.h#5 integrate
.. //depot/projects/uart/dev/ispfw/asm_2300.h#4 integrate
.. //depot/projects/uart/dev/ispfw/ispfw.c#4 integrate
.. //depot/projects/uart/dev/led/led.c#2 integrate
.. //depot/projects/uart/dev/matcd/creativeif.h#3 delete
.. //depot/projects/uart/dev/matcd/matcd.c#6 delete
.. //depot/projects/uart/dev/matcd/matcd_data.h#4 delete
.. //depot/projects/uart/dev/matcd/matcd_isa.c#5 delete
.. //depot/projects/uart/dev/matcd/matcddrv.h#3 delete
.. //depot/projects/uart/dev/matcd/options.h#3 delete
.. //depot/projects/uart/dev/mcd/mcd.c#7 integrate
.. //depot/projects/uart/dev/md/md.c#10 integrate
.. //depot/projects/uart/dev/mse/mse.c#2 integrate
.. //depot/projects/uart/dev/mse/mse_cbus.c#2 integrate
.. //depot/projects/uart/dev/mse/mse_isa.c#2 integrate
.. //depot/projects/uart/dev/mse/msevar.h#2 integrate
.. //depot/projects/uart/dev/nmdm/nmdm.c#6 integrate
.. //depot/projects/uart/dev/pccard/card_if.m#5 integrate
.. //depot/projects/uart/dev/pccard/pccard.c#9 integrate
.. //depot/projects/uart/dev/pccard/pccard_cis.c#7 integrate
.. //depot/projects/uart/dev/pccard/pccard_cis.h#3 integrate
.. //depot/projects/uart/dev/pccard/pccarddevs#13 integrate
.. //depot/projects/uart/dev/pccbb/pccbb.c#10 integrate
.. //depot/projects/uart/dev/pccbb/pccbb_isa.c#3 integrate
.. //depot/projects/uart/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/uart/dev/pccbb/pccbbdevid.h#5 integrate
.. //depot/projects/uart/dev/pccbb/pccbbreg.h#4 integrate
.. //depot/projects/uart/dev/pccbb/pccbbvar.h#4 integrate
.. //depot/projects/uart/dev/pci/pci.c#16 integrate
.. //depot/projects/uart/dev/puc/puc.c#14 integrate
.. //depot/projects/uart/dev/puc/puc_pci.c#8 integrate
.. //depot/projects/uart/dev/puc/puc_sbus.c#9 integrate
.. //depot/projects/uart/dev/puc/pucdata.c#11 integrate
.. //depot/projects/uart/dev/puc/pucvar.h#12 integrate
.. //depot/projects/uart/dev/ray/if_ray.c#5 integrate
.. //depot/projects/uart/dev/re/if_re.c#8 integrate
.. //depot/projects/uart/dev/scd/scd.c#6 integrate
.. //depot/projects/uart/dev/sio/sio_pci.c#5 integrate
.. //depot/projects/uart/dev/sn/if_sn_pccard.c#5 integrate
.. //depot/projects/uart/dev/snc/if_snc_pccard.c#5 integrate
.. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#36 integrate
.. //depot/projects/uart/dev/uart/uart_dev_z8530.c#22 integrate
.. //depot/projects/uart/dev/uart/uart_kbd_sun.c#3 integrate
.. //depot/projects/uart/dev/usb/ehcivar.h#5 integrate
.. //depot/projects/uart/dev/usb/ohcivar.h#5 integrate
.. //depot/projects/uart/dev/usb/ucom.c#8 integrate
.. //depot/projects/uart/dev/usb/uhcivar.h#6 integrate
.. //depot/projects/uart/dev/usb/uplcom.c#7 integrate
.. //depot/projects/uart/dev/usb/usb_port.h#10 integrate
.. //depot/projects/uart/dev/usb/usb_subr.c#9 integrate
.. //depot/projects/uart/dev/wi/if_wi_pccard.c#13 integrate
.. //depot/projects/uart/dev/xe/if_xe_pccard.c#7 integrate
.. //depot/projects/uart/fs/deadfs/dead_vnops.c#5 integrate
.. //depot/projects/uart/fs/devfs/devfs_vfsops.c#6 integrate
.. //depot/projects/uart/fs/devfs/devfs_vnops.c#8 integrate
.. //depot/projects/uart/fs/fdescfs/fdesc_vnops.c#6 integrate
.. //depot/projects/uart/fs/fifofs/fifo_vnops.c#7 integrate
.. //depot/projects/uart/fs/hpfs/hpfs_vfsops.c#7 integrate
.. //depot/projects/uart/fs/hpfs/hpfs_vnops.c#7 integrate
.. //depot/projects/uart/fs/msdosfs/msdosfs_denode.c#6 integrate
.. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#10 integrate
.. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#10 integrate
.. //depot/projects/uart/fs/ntfs/ntfs_subr.c#6 integrate
.. //depot/projects/uart/fs/ntfs/ntfs_vfsops.c#10 integrate
.. //depot/projects/uart/fs/ntfs/ntfs_vnops.c#7 integrate
.. //depot/projects/uart/fs/nullfs/null_vfsops.c#6 integrate
.. //depot/projects/uart/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/uart/fs/nwfs/nwfs.h#4 integrate
.. //depot/projects/uart/fs/nwfs/nwfs_io.c#7 integrate
.. //depot/projects/uart/fs/nwfs/nwfs_node.c#4 integrate
.. //depot/projects/uart/fs/nwfs/nwfs_vnops.c#5 integrate
.. //depot/projects/uart/fs/portalfs/portal_vnops.c#4 integrate
.. //depot/projects/uart/fs/pseudofs/pseudofs_vnops.c#7 integrate
.. //depot/projects/uart/fs/smbfs/smbfs.h#4 integrate
.. //depot/projects/uart/fs/smbfs/smbfs_io.c#7 integrate
.. //depot/projects/uart/fs/smbfs/smbfs_node.c#5 integrate
.. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#7 integrate
.. //depot/projects/uart/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/uart/fs/udf/udf_vnops.c#7 integrate
.. //depot/projects/uart/fs/umapfs/umap_vnops.c#4 integrate
.. //depot/projects/uart/fs/unionfs/union_subr.c#6 integrate
.. //depot/projects/uart/fs/unionfs/union_vnops.c#6 integrate
.. //depot/projects/uart/geom/geom_ctl.c#5 integrate
.. //depot/projects/uart/geom/geom_disk.c#8 integrate
.. //depot/projects/uart/geom/geom_mbr.c#7 integrate
.. //depot/projects/uart/geom/geom_vfs.c#3 integrate
.. //depot/projects/uart/geom/geom_vfs.h#2 integrate
.. //depot/projects/uart/geom/shsec/g_shsec.c#1 branch
.. //depot/projects/uart/geom/shsec/g_shsec.h#1 branch
.. //depot/projects/uart/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/uart/geom/vinum/geom_vinum_init.c#3 integrate
.. //depot/projects/uart/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/uart/geom/vinum/geom_vinum_state.c#3 integrate
.. //depot/projects/uart/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/uart/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/uart/gnu/ext2fs/ext2_inode.c#5 integrate
.. //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#9 integrate
.. //depot/projects/uart/gnu/ext2fs/ext2_vnops.c#7 integrate
.. //depot/projects/uart/i386/conf/GENERIC.hints#3 integrate
.. //depot/projects/uart/i386/conf/NOTES#9 integrate
.. //depot/projects/uart/i386/i386/db_trace.c#6 integrate
.. //depot/projects/uart/i386/i386/io_apic.c#2 integrate
.. //depot/projects/uart/i386/i386/local_apic.c#3 integrate
.. //depot/projects/uart/i386/i386/machdep.c#13 integrate
.. //depot/projects/uart/i386/i386/mptable.c#3 integrate
.. //depot/projects/uart/i386/i386/sys_machdep.c#11 integrate
.. //depot/projects/uart/i386/i386/vm_machdep.c#9 integrate
.. //depot/projects/uart/i386/ibcs2/ibcs2_sysvec.c#5 integrate
.. //depot/projects/uart/i386/ibcs2/imgact_coff.c#5 integrate
.. //depot/projects/uart/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/uart/i386/include/sysarch.h#5 integrate
.. //depot/projects/uart/i386/isa/atpic.c#2 integrate
.. //depot/projects/uart/i386/isa/elcr.c#2 integrate
.. //depot/projects/uart/i386/linux/imgact_linux.c#4 integrate
.. //depot/projects/uart/i386/linux/linux_machdep.c#3 integrate
.. //depot/projects/uart/i386/linux/linux_sysvec.c#6 integrate
.. //depot/projects/uart/ia64/ia64/busdma_machdep.c#6 integrate
.. //depot/projects/uart/ia64/ia64/unaligned.c#4 integrate
.. //depot/projects/uart/ia64/ia64/vm_machdep.c#10 integrate
.. //depot/projects/uart/ia64/include/bus.h#7 integrate
.. //depot/projects/uart/isa/isa_common.c#5 integrate
.. //depot/projects/uart/isa/psm.c#7 integrate
.. //depot/projects/uart/isofs/cd9660/cd9660_node.c#5 integrate
.. //depot/projects/uart/isofs/cd9660/cd9660_vfsops.c#9 integrate
.. //depot/projects/uart/isofs/cd9660/cd9660_vnops.c#7 integrate
.. //depot/projects/uart/kern/imgact_aout.c#6 integrate
.. //depot/projects/uart/kern/imgact_elf.c#4 integrate
.. //depot/projects/uart/kern/imgact_gzip.c#4 integrate
.. //depot/projects/uart/kern/imgact_shell.c#4 integrate
.. //depot/projects/uart/kern/init_sysent.c#8 integrate
.. //depot/projects/uart/kern/kern_conf.c#5 integrate
.. //depot/projects/uart/kern/kern_descrip.c#14 integrate
.. //depot/projects/uart/kern/kern_exec.c#10 integrate
.. //depot/projects/uart/kern/kern_exit.c#4 integrate
.. //depot/projects/uart/kern/kern_kse.c#4 integrate
.. //depot/projects/uart/kern/kern_lock.c#6 integrate
.. //depot/projects/uart/kern/kern_lockf.c#4 integrate
.. //depot/projects/uart/kern/kern_malloc.c#7 integrate
.. //depot/projects/uart/kern/kern_mib.c#4 integrate
.. //depot/projects/uart/kern/kern_module.c#3 integrate
.. //depot/projects/uart/kern/kern_prot.c#7 integrate
.. //depot/projects/uart/kern/kern_time.c#4 integrate
.. //depot/projects/uart/kern/kern_timeout.c#5 integrate
.. //depot/projects/uart/kern/kern_umtx.c#8 integrate
.. //depot/projects/uart/kern/subr_bus.c#8 integrate
.. //depot/projects/uart/kern/subr_witness.c#9 integrate
.. //depot/projects/uart/kern/sys_generic.c#8 integrate
.. //depot/projects/uart/kern/sys_pipe.c#16 integrate
.. //depot/projects/uart/kern/syscalls.c#8 integrate
.. //depot/projects/uart/kern/syscalls.master#8 integrate
.. //depot/projects/uart/kern/sysv_msg.c#6 integrate
.. //depot/projects/uart/kern/sysv_sem.c#6 integrate
.. //depot/projects/uart/kern/sysv_shm.c#6 integrate
.. //depot/projects/uart/kern/uipc_socket.c#9 integrate
.. //depot/projects/uart/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/uart/kern/vfs_bio.c#14 integrate
.. //depot/projects/uart/kern/vfs_cache.c#5 integrate
.. //depot/projects/uart/kern/vfs_cluster.c#10 integrate
.. //depot/projects/uart/kern/vfs_default.c#9 integrate
.. //depot/projects/uart/kern/vfs_init.c#4 integrate
.. //depot/projects/uart/kern/vfs_lookup.c#4 integrate
.. //depot/projects/uart/kern/vfs_mount.c#11 integrate
.. //depot/projects/uart/kern/vfs_subr.c#13 integrate
.. //depot/projects/uart/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/uart/kern/vfs_vnops.c#9 integrate
.. //depot/projects/uart/kern/vnode_if.src#8 integrate
.. //depot/projects/uart/libkern/strvalid.c#2 integrate
.. //depot/projects/uart/modules/Makefile#16 integrate
.. //depot/projects/uart/modules/agp/Makefile#4 integrate
.. //depot/projects/uart/modules/aic7xxx/ahd/Makefile#3 integrate
.. //depot/projects/uart/modules/ath_hal/Makefile#4 integrate
.. //depot/projects/uart/modules/bios/smapi/Makefile#2 integrate
.. //depot/projects/uart/modules/geom/Makefile#3 integrate
.. //depot/projects/uart/modules/geom/geom_shsec/Makefile#1 branch
.. //depot/projects/uart/modules/ie/Makefile#2 integrate
.. //depot/projects/uart/modules/netgraph/Makefile#4 integrate
.. //depot/projects/uart/modules/pcic/Makefile#3 delete
.. //depot/projects/uart/modules/sound/driver/maestro/Makefile#2 integrate
.. //depot/projects/uart/net/bridge.c#8 integrate
.. //depot/projects/uart/net/if.c#10 integrate
.. //depot/projects/uart/net/if_ethersubr.c#8 integrate
.. //depot/projects/uart/net/if_fwsubr.c#3 integrate
.. //depot/projects/uart/net/if_stf.c#5 integrate
.. //depot/projects/uart/net/if_vlan.c#7 integrate
.. //depot/projects/uart/net/net_osdep.h#4 integrate
.. //depot/projects/uart/net/raw_cb.c#4 integrate
.. //depot/projects/uart/net80211/ieee80211.c#8 integrate
.. //depot/projects/uart/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/uart/net80211/ieee80211_input.c#9 integrate
.. //depot/projects/uart/net80211/ieee80211_ioctl.c#9 integrate
.. //depot/projects/uart/net80211/ieee80211_node.c#11 integrate
.. //depot/projects/uart/net80211/ieee80211_node.h#9 integrate
.. //depot/projects/uart/net80211/ieee80211_output.c#9 integrate
.. //depot/projects/uart/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/uart/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/uart/net80211/ieee80211_radiotap.h#4 integrate
.. //depot/projects/uart/net80211/ieee80211_var.h#9 integrate
.. //depot/projects/uart/netgraph/bluetooth/drivers/h4/ng_h4.c#5 integrate
.. //depot/projects/uart/netgraph/bluetooth/drivers/h4/ng_h4_var.h#4 integrate
.. //depot/projects/uart/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#4 integrate
.. //depot/projects/uart/netgraph/netflow/netflow.c#4 integrate
.. //depot/projects/uart/netgraph/netflow/ng_netflow.c#3 integrate
.. //depot/projects/uart/netgraph/ng_base.c#6 integrate
.. //depot/projects/uart/netgraph/ng_eiface.c#3 integrate
.. //depot/projects/uart/netgraph/ng_iface.c#5 integrate
.. //depot/projects/uart/netgraph/ng_l2tp.c#4 integrate
.. //depot/projects/uart/netgraph/ng_lmi.c#4 integrate
.. //depot/projects/uart/netgraph/ng_parse.h#4 integrate
.. //depot/projects/uart/netgraph/ng_ppp.c#4 integrate
.. //depot/projects/uart/netgraph/ng_pptpgre.c#4 integrate
.. //depot/projects/uart/netgraph/ng_tty.c#4 integrate
.. //depot/projects/uart/netinet/ip_dummynet.c#8 integrate
.. //depot/projects/uart/netinet/ip_dummynet.h#5 integrate
.. //depot/projects/uart/netinet/ip_fw.h#6 integrate
.. //depot/projects/uart/netinet/ip_fw2.c#12 integrate
.. //depot/projects/uart/netinet/ip_fw_pfil.c#3 integrate
.. //depot/projects/uart/netinet/ip_input.c#8 integrate
.. //depot/projects/uart/netinet/ip_output.c#10 integrate
.. //depot/projects/uart/netinet/tcp_output.c#6 integrate
.. //depot/projects/uart/netinet/tcp_subr.c#9 integrate
.. //depot/projects/uart/netinet/tcp_syncache.c#7 integrate
.. //depot/projects/uart/netinet6/icmp6.c#6 integrate
.. //depot/projects/uart/netkey/key.c#7 integrate
.. //depot/projects/uart/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/uart/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/uart/nfsclient/nfs.h#4 integrate
.. //depot/projects/uart/nfsclient/nfs_bio.c#8 integrate
.. //depot/projects/uart/nfsclient/nfs_diskless.c#4 integrate
.. //depot/projects/uart/nfsclient/nfs_node.c#6 integrate
.. //depot/projects/uart/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/uart/nfsclient/nfs_vnops.c#9 integrate
.. //depot/projects/uart/nfsserver/nfs.h#4 integrate
.. //depot/projects/uart/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/uart/nfsserver/nfs_srvsock.c#4 integrate
.. //depot/projects/uart/nfsserver/nfs_srvsubs.c#4 integrate
.. //depot/projects/uart/pc98/conf/NOTES#8 integrate
.. //depot/projects/uart/pci/if_rlreg.h#12 integrate
.. //depot/projects/uart/pci/if_sis.c#12 integrate
.. //depot/projects/uart/pci/if_sk.c#11 integrate
.. //depot/projects/uart/powerpc/include/bus.h#5 integrate
.. //depot/projects/uart/powerpc/powermac/uninorth.c#4 integrate
.. //depot/projects/uart/powerpc/powerpc/busdma_machdep.c#6 integrate
.. //depot/projects/uart/powerpc/powerpc/pmap.c#11 integrate
.. //depot/projects/uart/powerpc/powerpc/vm_machdep.c#8 integrate
.. //depot/projects/uart/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/uart/security/mac_biba/mac_biba.c#5 integrate
.. //depot/projects/uart/security/mac_lomac/mac_lomac.c#5 integrate
.. //depot/projects/uart/security/mac_lomac/mac_lomac.h#3 integrate
.. //depot/projects/uart/security/mac_mls/mac_mls.c#5 integrate
.. //depot/projects/uart/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/uart/security/mac_test/mac_test.c#6 integrate
.. //depot/projects/uart/sparc64/conf/GENERIC#10 integrate
.. //depot/projects/uart/sparc64/conf/NOTES#5 integrate
.. //depot/projects/uart/sparc64/include/bus.h#7 integrate
.. //depot/projects/uart/sparc64/include/md_var.h#3 integrate
.. //depot/projects/uart/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/uart/sparc64/sparc64/bus_machdep.c#9 integrate
.. //depot/projects/uart/sparc64/sparc64/iommu.c#6 integrate
.. //depot/projects/uart/sparc64/sparc64/machdep.c#10 integrate
.. //depot/projects/uart/sparc64/sparc64/sys_machdep.c#3 integrate
.. //depot/projects/uart/sparc64/sparc64/vm_machdep.c#10 integrate
.. //depot/projects/uart/sys/buf.h#11 integrate
.. //depot/projects/uart/sys/bufobj.h#3 integrate
.. //depot/projects/uart/sys/bus.h#7 integrate
.. //depot/projects/uart/sys/cdio.h#3 integrate
.. //depot/projects/uart/sys/conf.h#8 integrate
.. //depot/projects/uart/sys/device_port.h#2 integrate
.. //depot/projects/uart/sys/imgact.h#3 integrate
.. //depot/projects/uart/sys/ktr.h#5 integrate
.. //depot/projects/uart/sys/linker_set.h#3 integrate
.. //depot/projects/uart/sys/lockf.h#4 integrate
.. //depot/projects/uart/sys/lockmgr.h#4 integrate
.. //depot/projects/uart/sys/mount.h#7 integrate
.. //depot/projects/uart/sys/namei.h#5 integrate
.. //depot/projects/uart/sys/param.h#16 integrate
.. //depot/projects/uart/sys/socketvar.h#5 integrate
.. //depot/projects/uart/sys/syscall.h#7 integrate
.. //depot/projects/uart/sys/syscall.mk#7 integrate
.. //depot/projects/uart/sys/syscallsubr.h#4 integrate
.. //depot/projects/uart/sys/sysproto.h#7 integrate
.. //depot/projects/uart/sys/systm.h#10 integrate
.. //depot/projects/uart/sys/time.h#4 integrate
.. //depot/projects/uart/sys/umtx.h#4 integrate
.. //depot/projects/uart/sys/vnode.h#9 integrate
.. //depot/projects/uart/tools/vnode_if.awk#4 integrate
.. //depot/projects/uart/ufs/ffs/ffs_alloc.c#5 integrate
.. //depot/projects/uart/ufs/ffs/ffs_balloc.c#5 integrate
.. //depot/projects/uart/ufs/ffs/ffs_extern.h#5 integrate
.. //depot/projects/uart/ufs/ffs/ffs_inode.c#5 integrate
.. //depot/projects/uart/ufs/ffs/ffs_rawread.c#5 integrate
.. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#6 integrate
.. //depot/projects/uart/ufs/ffs/ffs_softdep.c#9 integrate
.. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#11 integrate
.. //depot/projects/uart/ufs/ffs/ffs_vnops.c#9 integrate
.. //depot/projects/uart/ufs/ffs/fs.h#4 integrate
.. //depot/projects/uart/ufs/ufs/ufs_extattr.c#6 integrate
.. //depot/projects/uart/ufs/ufs/ufs_inode.c#6 integrate
.. //depot/projects/uart/ufs/ufs/ufs_lookup.c#4 integrate
.. //depot/projects/uart/ufs/ufs/ufs_vfsops.c#5 integrate
.. //depot/projects/uart/ufs/ufs/ufs_vnops.c#10 integrate
.. //depot/projects/uart/ufs/ufs/ufsmount.h#5 integrate
.. //depot/projects/uart/vm/memguard.c#1 branch
.. //depot/projects/uart/vm/memguard.h#1 branch
.. //depot/projects/uart/vm/uma_core.c#15 integrate
.. //depot/projects/uart/vm/vm_fault.c#8 integrate
.. //depot/projects/uart/vm/vm_glue.c#11 integrate
.. //depot/projects/uart/vm/vm_map.c#14 integrate
.. //depot/projects/uart/vm/vm_mmap.c#10 integrate
.. //depot/projects/uart/vm/vm_object.c#13 integrate
.. //depot/projects/uart/vm/vnode_pager.c#12 integrate
.. //depot/projects/uart/vm/vnode_pager.h#4 integrate
Differences ...
==== //depot/projects/uart/alpha/alpha/busdma_machdep.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.47 2005/01/05 20:05:48 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.48 2005/01/15 20:11:25 scottl Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -637,18 +637,16 @@
struct thread *td,
int flags,
vm_offset_t *lastaddrp,
+ bus_dma_segment_t *segs,
int *segp,
int first)
{
- bus_dma_segment_t *segs;
bus_size_t sgsize;
bus_addr_t curaddr, lastaddr, baddr, bmask;
vm_offset_t vaddr = (vm_offset_t)buf;
int seg;
pmap_t pmap;
- segs = dmat->segments;
-
if (td != NULL)
pmap = vmspace_pmap(td->td_proc->p_vmspace);
else
@@ -745,7 +743,7 @@
error = _bus_dmamap_load_buffer(dmat,
m->m_data, m->m_len,
NULL, flags, &lastaddr,
- &nsegs, first);
+ dmat->segments, &nsegs, first);
first = 0;
}
}
@@ -763,6 +761,41 @@
return (error);
}
+int
+bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map,
+ struct mbuf *m0, bus_dma_segment_t *segs,
+ int *nsegs, int flags)
+{
+ int error;
+
+ KASSERT(dmat->lowaddr >= ptoa(Maxmem) || map != NULL,
+ ("bus_dmamap_load_mbuf: No support for bounce pages!"));
+ M_ASSERTPKTHDR(m0);
+
+ *nsegs = 0;
+ error = 0;
+ if (m0->m_pkthdr.len <= dmat->maxsize) {
+ int first = 1;
+ bus_addr_t lastaddr = 0;
+ struct mbuf *m;
+
+ for (m = m0; m != NULL && error == 0; m = m->m_next) {
+ if (m->m_len > 0) {
+ error = _bus_dmamap_load_buffer(dmat,
+ m->m_data, m->m_len,
+ NULL, flags, &lastaddr,
+ segs, nsegs, first);
+ first = 0;
+ }
+ }
+ ++*nsegs;
+ } else {
+ error = EINVAL;
+ }
+
+ return (error);
+}
+
/*
* Like _bus_dmamap_load(), but for uios.
*/
@@ -804,7 +837,8 @@
if (minlen > 0) {
error = _bus_dmamap_load_buffer(dmat, addr, minlen,
- td, flags, &lastaddr, &nsegs, first);
+ td, flags, &lastaddr, dmat->segments,
+ &nsegs, first);
first = 0;
resid -= minlen;
==== //depot/projects/uart/alpha/alpha/vm_machdep.c#9 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.106 2005/01/05 20:05:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.107 2005/01/14 20:13:04 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,17 +224,15 @@
td->td_pcb->pcb_context[2] = (u_long) arg;
}
-/*
- * cpu_exit is called as the last action during exit.
- * We release the address space of the process, block interrupts,
- * and call switch_exit. switch_exit switches to proc0's PCB and stack,
- * then jumps into the middle of cpu_switch, as if it were switching
- * from proc0.
- */
void
cpu_exit(struct thread *td)
{
+ /*
+ * XXX: Should this be in thread_exit instead? If so,
+ * alpha_fpstate_save() should be in cpu_set_upcall()
+ * as well.
+ */
alpha_fpstate_drop(td);
}
==== //depot/projects/uart/alpha/include/bus.h#7 (text+ko) ====
@@ -67,7 +67,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.26 2005/01/05 20:05:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.28 2005/01/29 21:43:33 ru Exp $ */
#ifndef _ALPHA_BUS_H_
#define _ALPHA_BUS_H_
@@ -88,7 +88,7 @@
/* The largest address space known so far is 40 bits */
#define BUS_SPACE_MAXADDR 0xFFFFFFFFFUL
-#define BUS_SPACE_UNRESTRICTED (~0UL)
+#define BUS_SPACE_UNRESTRICTED (~0)
/*
* Map a region of device bus space into CPU virtual address space.
@@ -639,6 +639,9 @@
struct mbuf *mbuf,
bus_dmamap_callback2_t *callback, void *callback_arg,
int flags);
+int bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map,
+ struct mbuf *mbuf, bus_dma_segment_t *segs,
+ int *nsegs, int flags);
/*
* Like bus_dmamap_load but for uios. Note the use of the
* bus_dmamap_callback2_t interface.
==== //depot/projects/uart/alpha/linux/linux_sysvec.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.93 2004/07/15 08:25:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.94 2005/01/29 23:11:57 sobomax Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -97,7 +97,7 @@
(curthread->td_proc->p_flag & P_SA) == 0,
("unsafe elf_linux_fixup(), should be curproc"));
args = (Elf64_Auxargs *)imgp->auxargs;
- pos = *stack_base + (imgp->argc + imgp->envc + 2);
+ pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);
if (args->trace)
AUXARGS_ENTRY(pos, AT_DEBUG, 1);
@@ -120,7 +120,7 @@
imgp->auxargs = NULL;
(*stack_base)--;
- **stack_base = (register_t)imgp->argc;
+ **stack_base = (register_t)imgp->args->argc;
return 0;
}
@@ -154,8 +154,8 @@
if ((error = exec_shell_imgact(imgp)) == 0) {
char *rpath = NULL;
- linux_emul_find(FIRST_THREAD_IN_PROC(imgp->proc), NULL,
- imgp->interpreter_name, &rpath, 0);
+ linux_emul_convpath(FIRST_THREAD_IN_PROC(imgp->proc),
+ imgp->interpreter_name, UIO_SYSSPACE, &rpath, 0);
if (rpath != imgp->interpreter_name) {
int len = strlen(rpath) + 1;
==== //depot/projects/uart/alpha/osf1/imgact_osf1.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.21 2005/01/05 20:05:51 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.22 2005/01/29 23:11:57 sobomax Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -118,7 +118,7 @@
osf_auxargs = malloc(sizeof(Osf_Auxargs), M_TEMP, M_WAITOK | M_ZERO);
imgp->auxargs = osf_auxargs;
osf_auxargs->executable = osf_auxargs->exec_path;
- path_not_saved = copyinstr(imgp->fname, osf_auxargs->executable,
+ path_not_saved = copystr(imgp->args->fname, osf_auxargs->executable,
PATH_MAX, &bytes);
if (execp->f.f_flags & DYNAMIC_FLAG) {
if (path_not_saved) {
@@ -172,11 +172,6 @@
bsize = eap->bsize;
imgp->entry_addr = eap->entry;
- /* copy in arguments and/or environment from old process */
-
- error = exec_extract_strings(imgp);
- if (error)
- goto bail;
/*
* Destroy old process VM and create a new one (with a new stack).
==== //depot/projects/uart/alpha/osf1/osf1_sysvec.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.11 2003/09/25 01:10:22 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.12 2005/01/29 23:11:57 sobomax Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -117,15 +117,15 @@
Osf_Auxargs *args;
args = (Osf_Auxargs *)imgp->auxargs;
- pos = *stack_base + (imgp->argc + imgp->envc + 2);
+ pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2);
arginfo = (struct ps_strings *)PS_STRINGS;
sz = *(imgp->proc->p_sysent->sv_szsigcode);
destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE -
- roundup((ARG_MAX - imgp->stringspace), sizeof(char *));
+ roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *));
- destp -= imgp->stringspace;
+ destp -= imgp->args->stringspace;
destp -= strlen(args->executable)+2;
copyout(args->executable, destp, strlen(args->executable)+1);
@@ -143,6 +143,6 @@
free(imgp->auxargs, M_TEMP);
imgp->auxargs = NULL;
(*stack_base)--;
- **stack_base = (long)imgp->argc;
+ **stack_base = (long)imgp->args->argc;
return 0;
}
==== //depot/projects/uart/amd64/amd64/apic_vector.S#2 (text+ko) ====
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.100 2004/05/24 12:08:56 bde Exp $
+ * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.101 2005/01/21 06:01:19 peter Exp $
*/
/*
@@ -210,31 +210,16 @@
*/
.text
SUPERALIGN_TEXT
-IDTVEC(hardclock)
+IDTVEC(ipi_intr_bitmap_handler)
+
PUSH_FRAME
movq lapic, %rdx
movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */
-
- call forwarded_hardclock
- MEXITCOUNT
- jmp doreti
-
-/*
- * Forward statclock to another CPU. Pushes a clockframe and calls
- * forwarded_statclock().
- */
- .text
- SUPERALIGN_TEXT
-IDTVEC(statclock)
- PUSH_FRAME
-
- movq lapic, %rdx
- movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */
-
+
FAKE_MCOUNT(TF_RIP(%rsp))
- call forwarded_statclock
+ call ipi_bitmap_handler
MEXITCOUNT
jmp doreti
==== //depot/projects/uart/amd64/amd64/db_trace.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.65 2005/01/05 20:17:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.66 2005/01/21 05:54:05 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -302,10 +302,16 @@
rbp = db_get_value((long) &(*fp)->f_frame, 8, FALSE);
/*
- * Figure out frame type.
+ * Figure out frame type. We look at the address just before
+ * the saved instruction pointer as the saved EIP is after the
+ * call function, and if the function being called is marked as
+ * dead (such as panic() at the end of dblfault_handler()), then
+ * the instruction at the saved EIP will be part of a different
+ * function (syscall() in this example) rather than the one that
+ * actually made the call.
*/
frame_type = NORMAL;
- sym = db_search_symbol(rip, DB_STGY_ANY, &offset);
+ sym = db_search_symbol(rip - 1, DB_STGY_ANY, &offset);
db_symbol_values(sym, &name, NULL);
if (name != NULL) {
if (strcmp(name, "calltrap") == 0 ||
==== //depot/projects/uart/amd64/amd64/exception.S#6 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.120 2004/08/16 12:51:32 obrien Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.121 2005/01/21 05:56:40 peter Exp $
*/
#include "opt_atpic.h"
@@ -130,7 +130,7 @@
TRAP_ERR(T_PROTFLT)
IDTVEC(align)
TRAP_ERR(T_ALIGNFLT)
-
+
/*
* alltraps entry point. Use swapgs if this is the first time in the
* kernel from userland. Reenable interrupts if they were enabled
==== //depot/projects/uart/amd64/amd64/identcpu.c#4 (text+ko) ====
@@ -2,8 +2,6 @@
* Copyright (c) 1992 Terrence R. Lambert.
* Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
* Copyright (c) 1997 KATO Takenori.
- * Copyright (c) 2001 Tamotsu Hattori.
- * Copyright (c) 2001 Mitsuru IWASAKI.
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
@@ -41,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.134 2004/06/08 01:20:37 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.135 2005/01/21 05:56:40 peter Exp $");
#include "opt_cpu.h"
==== //depot/projects/uart/amd64/amd64/intr_machdep.c#4 (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.12 2004/12/06 22:56:15 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.13 2005/01/21 06:01:19 peter Exp $
*/
/*
@@ -286,6 +286,17 @@
is->is_straycount = &intrcnt[is->is_index + 1];
}
+void
+intrcnt_add(const char *name, u_long **countp)
+{
+
+ mtx_lock_spin(&intr_table_lock);
+ *countp = &intrcnt[intrcnt_index];
+ intrcnt_setname(name, intrcnt_index);
+ intrcnt_index++;
+ mtx_unlock_spin(&intr_table_lock);
+}
+
static void
intr_init(void *dummy __unused)
{
==== //depot/projects/uart/amd64/amd64/io_apic.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.11 2004/08/16 23:12:29 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.12 2005/01/21 06:01:19 peter Exp $");
#include "opt_atpic.h"
#include "opt_isa.h"
@@ -424,7 +424,7 @@
* them to be set to active low.
*
* XXX: Should we write to the ELCR if the trigger mode changes for
- * an EISA IRQ?
+ * an EISA IRQ or an ISA IRQ with the ELCR present?
*/
if (intpin->io_bus == APIC_BUS_EISA)
pol = INTR_POLARITY_HIGH;
==== //depot/projects/uart/amd64/amd64/local_apic.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.10 2004/08/16 22:55:32 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.11 2005/01/21 06:01:19 peter Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,9 @@
#define MAX_APICID 16
/* Sanity checks on IDT vectors. */
-CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS <= APIC_LOCAL_INTS);
+CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT);
+CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS);
+CTASSERT(APIC_LOCAL_INTS == 240);
CTASSERT(IPI_STOP < APIC_SPURIOUS_INT);
/*
@@ -96,10 +98,10 @@
static struct lvt lvts[LVT_MAX + 1] = {
{ 1, 1, 1, 1, APIC_LVT_DM_EXTINT, 0 }, /* LINT0: masked ExtINT */
{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 }, /* LINT1: NMI */
- { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* Timer: needs a vector */
- { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* Error: needs a vector */
+ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT }, /* Timer */
+ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_ERROR_INT }, /* Error */
{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* PMC */
- { 1, 1, 1, 1, APIC_LVT_DM_FIXED, 0 }, /* Thermal: needs a vector */
+ { 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_THERMAL_INT }, /* Thermal */
};
static inthand_t *ioint_handlers[] = {
@@ -115,6 +117,9 @@
volatile lapic_t *lapic;
+static void lapic_enable(void);
+static uint32_t lvt_mode(struct lapic *la, u_int pin, uint32_t value);
+
static uint32_t
lvt_mode(struct lapic *la, u_int pin, uint32_t value)
{
@@ -148,11 +153,7 @@
/* Use a vector of 0. */
break;
case APIC_LVT_DM_FIXED:
-#if 0
value |= lvt->lvt_vector;
-#else
- panic("Fixed LINT pins not supported");
-#endif
break;
default:
panic("bad APIC LVT delivery mode: %#x\n", value);
@@ -166,7 +167,6 @@
void
lapic_init(uintptr_t addr)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list