PERFORCE change 90535 for review
Warner Losh
imp at FreeBSD.org
Fri Jan 27 16:06:23 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=90535
Change 90535 by imp at imp_harmony on 2006/01/28 00:06:03
IFC @90525
Affected files ...
.. //depot/projects/arm/src/sys/Makefile#4 integrate
.. //depot/projects/arm/src/sys/alpha/conf/GENERIC#5 integrate
.. //depot/projects/arm/src/sys/alpha/include/_types.h#4 integrate
.. //depot/projects/arm/src/sys/alpha/include/param.h#4 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#6 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/mptable_pci.c#3 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/trap.c#5 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/arm/src/sys/amd64/include/_types.h#6 integrate
.. //depot/projects/arm/src/sys/amd64/include/param.h#4 integrate
.. //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#4 integrate
.. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#5 integrate
.. //depot/projects/arm/src/sys/arm/arm/trap.c#4 integrate
.. //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/arm/include/_types.h#4 integrate
.. //depot/projects/arm/src/sys/arm/include/param.h#3 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/arm/src/sys/boot/common/module.c#2 integrate
.. //depot/projects/arm/src/sys/boot/ia64/efi/start.S#2 integrate
.. //depot/projects/arm/src/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/arm/src/sys/cam/cam_periph.c#4 integrate
.. //depot/projects/arm/src/sys/cam/cam_xpt.c#4 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#3 integrate
.. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.h#2 integrate
.. //depot/projects/arm/src/sys/coda/coda_vfsops.c#4 integrate
.. //depot/projects/arm/src/sys/coda/coda_vnops.c#4 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#6 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/arm/src/sys/compat/linux/linux_stats.c#5 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.arm#9 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#12 integrate
.. //depot/projects/arm/src/sys/conf/files#13 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#7 integrate
.. //depot/projects/arm/src/sys/conf/kern.post.mk#6 integrate
.. //depot/projects/arm/src/sys/conf/options#12 integrate
.. //depot/projects/arm/src/sys/contrib/pf/net/pf_norm.c#5 integrate
.. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/arm/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pci.c#4 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pci_link.c#6 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_smbat.c#3 integrate
.. //depot/projects/arm/src/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/arm/src/sys/dev/amr/amr_linux.c#1 branch
.. //depot/projects/arm/src/sys/dev/amr/amrreg.h#3 integrate
.. //depot/projects/arm/src/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/arm/src/sys/dev/asr/asr.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.h#7 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#9 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#8 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#8 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#7 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_ath.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/arm/src/sys/dev/ath/if_athvar.h#3 integrate
.. //depot/projects/arm/src/sys/dev/auxio/auxio.c#3 integrate
.. //depot/projects/arm/src/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/arm/src/sys/dev/bge/if_bgereg.h#7 integrate
.. //depot/projects/arm/src/sys/dev/bktr/bktr_os.c#4 integrate
.. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#7 integrate
.. //depot/projects/arm/src/sys/dev/ce/ceddk.c#1 branch
.. //depot/projects/arm/src/sys/dev/ce/ceddk.h#1 branch
.. //depot/projects/arm/src/sys/dev/ce/if_ce.c#1 branch
.. //depot/projects/arm/src/sys/dev/ce/ng_ce.h#1 branch
.. //depot/projects/arm/src/sys/dev/ce/tau32-ddk.c#1 branch
.. //depot/projects/arm/src/sys/dev/ce/tau32-ddk.h#1 branch
.. //depot/projects/arm/src/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_3c503.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_cbus.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_hpp.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_isa.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_novell.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_sic.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_ed_wd80x3.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ed/if_edvar.h#4 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#11 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.h#4 integrate
.. //depot/projects/arm/src/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/arm/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate
.. //depot/projects/arm/src/sys/dev/ieee488/pcii.c#3 integrate
.. //depot/projects/arm/src/sys/dev/iir/iir.h#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp.c#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.h#4 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_inline.h#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_ioctl.h#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#5 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_target.c#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_target.h#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/isp_tpublic.h#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispmbox.h#3 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispreg.h#2 integrate
.. //depot/projects/arm/src/sys/dev/isp/ispvar.h#5 integrate
.. //depot/projects/arm/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_inb.h#1 branch
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_init.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_log_fc.h#1 branch
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_log_sas.h#1 branch
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_sas.h#1 branch
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_tool.h#1 branch
.. //depot/projects/arm/src/sys/dev/mpt/mpilib/mpi_type.h#4 integrate
.. //depot/projects/arm/src/sys/dev/mpt/mpt_debug.c#3 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#7 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#3 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_private.h#5 integrate
.. //depot/projects/arm/src/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/arm/src/sys/dev/rp/rp_pci.c#5 integrate
.. //depot/projects/arm/src/sys/dev/si/si.c#3 integrate
.. //depot/projects/arm/src/sys/dev/si/si2_z280.c#2 integrate
.. //depot/projects/arm/src/sys/dev/si/si3_t225.c#2 integrate
.. //depot/projects/arm/src/sys/dev/sn/if_sn.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/driver.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/isa/ess.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/cmi.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/ds1.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/emu10k1.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#5 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/maestro.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/solo.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/vibes.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#6 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/channel.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/dsp.c#5 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/feeder.h#2 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_fmt.c#4 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/vchan.c#3 integrate
.. //depot/projects/arm/src/sys/dev/syscons/syscons.c#5 integrate
.. //depot/projects/arm/src/sys/dev/tx/if_tx.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/ehci.c#5 integrate
.. //depot/projects/arm/src/sys/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/ehcivar.h#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_ural.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_uralreg.h#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/ohci.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/ohci_pci.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/ufoma.c#1 branch
.. //depot/projects/arm/src/sys/dev/usb/uhci.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/umass.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#2 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_quirks.c#6 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_quirks.h#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/usbdevs#8 integrate
.. //depot/projects/arm/src/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/arm/src/sys/fs/hpfs/hpfs_vnops.c#6 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/direntry.h#2 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_conv.c#4 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_denode.c#5 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate
.. //depot/projects/arm/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/arm/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate
.. //depot/projects/arm/src/sys/fs/nwfs/nwfs_node.c#4 integrate
.. //depot/projects/arm/src/sys/fs/smbfs/smbfs_node.c#4 integrate
.. //depot/projects/arm/src/sys/fs/udf/udf_vnops.c#5 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli.c#3 integrate
.. //depot/projects/arm/src/sys/geom/eli/g_eli_ctl.c#2 integrate
.. //depot/projects/arm/src/sys/geom/label/g_label_ntfs.c#3 integrate
.. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#5 integrate
.. //depot/projects/arm/src/sys/geom/nop/g_nop.c#4 integrate
.. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#5 integrate
.. //depot/projects/arm/src/sys/geom/uzip/g_uzip.c#4 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_var.h#4 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_volume.c#4 integrate
.. //depot/projects/arm/src/sys/geom/zero/g_zero.c#3 integrate
.. //depot/projects/arm/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#6 integrate
.. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/mem.c#2 integrate
.. //depot/projects/arm/src/sys/i386/i386/mptable_pci.c#3 integrate
.. //depot/projects/arm/src/sys/i386/i386/swtch.s#5 integrate
.. //depot/projects/arm/src/sys/i386/i386/trap.c#4 integrate
.. //depot/projects/arm/src/sys/i386/include/_types.h#6 integrate
.. //depot/projects/arm/src/sys/i386/include/param.h#3 integrate
.. //depot/projects/arm/src/sys/i386/pci/pci_bus.c#4 integrate
.. //depot/projects/arm/src/sys/ia64/conf/GENERIC#5 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/elf_machdep.c#5 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/genassym.c#2 integrate
.. //depot/projects/arm/src/sys/ia64/ia64/locore.S#2 integrate
.. //depot/projects/arm/src/sys/ia64/include/_types.h#4 integrate
.. //depot/projects/arm/src/sys/ia64/include/elf.h#2 integrate
.. //depot/projects/arm/src/sys/ia64/include/param.h#4 integrate
.. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/arm/src/sys/isofs/cd9660/cd9660_vnops.c#5 integrate
.. //depot/projects/arm/src/sys/kern/imgact_elf.c#6 integrate
.. //depot/projects/arm/src/sys/kern/init_sysent.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_alq.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_conf.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_descrip.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_exit.c#6 integrate
.. //depot/projects/arm/src/sys/kern/kern_ktr.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_ktrace.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_mbuf.c#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_mutex.c#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_proc.c#5 integrate
.. //depot/projects/arm/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_sysctl.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/arm/src/sys/kern/md5c.c#2 integrate
.. //depot/projects/arm/src/sys/kern/subr_bus.c#5 integrate
.. //depot/projects/arm/src/sys/kern/subr_disk.c#3 integrate
.. //depot/projects/arm/src/sys/kern/subr_lock.c#1 branch
.. //depot/projects/arm/src/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/arm/src/sys/kern/subr_taskqueue.c#4 integrate
.. //depot/projects/arm/src/sys/kern/subr_turnstile.c#3 integrate
.. //depot/projects/arm/src/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/arm/src/sys/kern/sys_generic.c#4 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.c#6 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#7 integrate
.. //depot/projects/arm/src/sys/kern/tty.c#6 integrate
.. //depot/projects/arm/src/sys/kern/tty_compat.c#3 integrate
.. //depot/projects/arm/src/sys/kern/tty_pts.c#1 branch
.. //depot/projects/arm/src/sys/kern/tty_pty.c#5 integrate
.. //depot/projects/arm/src/sys/kern/uipc_sem.c#4 integrate
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#7 integrate
.. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/arm/src/sys/kern/vfs_aio.c#3 integrate
.. //depot/projects/arm/src/sys/kern/vfs_bio.c#6 integrate
.. //depot/projects/arm/src/sys/kern/vfs_default.c#6 integrate
.. //depot/projects/arm/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/arm/src/sys/kern/vfs_mount.c#8 integrate
.. //depot/projects/arm/src/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/arm/src/sys/kern/vfs_syscalls.c#6 integrate
.. //depot/projects/arm/src/sys/libkern/fnmatch.c#2 integrate
.. //depot/projects/arm/src/sys/libkern/gets.c#2 integrate
.. //depot/projects/arm/src/sys/modules/Makefile#8 integrate
.. //depot/projects/arm/src/sys/modules/amr/Makefile#2 integrate
.. //depot/projects/arm/src/sys/modules/amr/amr_linux/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/bktr/bktr/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/linux/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/nwfs/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/smbfs/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/svr4/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/ufoma/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/xfs/Makefile#2 integrate
.. //depot/projects/arm/src/sys/net/if.c#5 integrate
.. //depot/projects/arm/src/sys/net/if_arcsubr.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_bridge.c#7 integrate
.. //depot/projects/arm/src/sys/net/if_bridgevar.h#4 integrate
.. //depot/projects/arm/src/sys/net/if_ef.c#4 integrate
.. //depot/projects/arm/src/sys/net/if_ethersubr.c#8 integrate
.. //depot/projects/arm/src/sys/net/if_fddisubr.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_fwsubr.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_gre.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_iso88025subr.c#3 integrate
.. //depot/projects/arm/src/sys/net/if_ppp.c#4 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211.c#6 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_input.c#6 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.c#6 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_proto.c#6 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_radiotap.h#2 integrate
.. //depot/projects/arm/src/sys/net80211/ieee80211_var.h#7 integrate
.. //depot/projects/arm/src/sys/netatm/atm_signal.c#2 integrate
.. //depot/projects/arm/src/sys/netatm/ipatm/ipatm_vcm.c#3 integrate
.. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#5 integrate
.. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/netflow/ng_netflow.h#3 integrate
.. //depot/projects/arm/src/sys/netgraph/netgraph.h#4 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_base.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_frame_relay.c#2 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_lmi.c#3 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_message.h#3 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_parse.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_pppoe.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_pppoe.h#3 integrate
.. //depot/projects/arm/src/sys/netgraph/ng_source.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/if_ether.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/in.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/in_var.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fastfwd.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/ip_gre.c#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_gre.h#2 integrate
.. //depot/projects/arm/src/sys/netinet/ip_icmp.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_input.c#7 integrate
.. //depot/projects/arm/src/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/ip_output.c#6 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#6 integrate
.. //depot/projects/arm/src/sys/netinet6/in6_cksum.c#3 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_mroute.c#4 integrate
.. //depot/projects/arm/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/arm/src/sys/netinet6/ipcomp_input.c#2 integrate
.. //depot/projects/arm/src/sys/netipsec/keysock.c#3 integrate
.. //depot/projects/arm/src/sys/netipsec/keysock.h#2 integrate
.. //depot/projects/arm/src/sys/netipx/ipx_input.c#3 integrate
.. //depot/projects/arm/src/sys/netipx/spx_usrreq.c#4 integrate
.. //depot/projects/arm/src/sys/netkey/keysock.c#3 integrate
.. //depot/projects/arm/src/sys/netkey/keysock.h#2 integrate
.. //depot/projects/arm/src/sys/netncp/ncp_conn.c#3 integrate
.. //depot/projects/arm/src/sys/netsmb/smb_subr.c#3 integrate
.. //depot/projects/arm/src/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#3 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_node.c#4 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_socket.c#6 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/arm/src/sys/nfsserver/nfs_serv.c#3 integrate
.. //depot/projects/arm/src/sys/pc98/conf/GENERIC#4 integrate
.. //depot/projects/arm/src/sys/pc98/include/_types.h#3 integrate
.. //depot/projects/arm/src/sys/pc98/include/param.h#3 integrate
.. //depot/projects/arm/src/sys/pccard/cardinfo.h#2 integrate
.. //depot/projects/arm/src/sys/pccard/driver.h#2 delete
.. //depot/projects/arm/src/sys/pccard/i82365.h#2 delete
.. //depot/projects/arm/src/sys/pccard/meciareg.h#2 delete
.. //depot/projects/arm/src/sys/pccard/pccard_nbk.h#2 delete
.. //depot/projects/arm/src/sys/pccard/pcic_pci.h#2 delete
.. //depot/projects/arm/src/sys/pccard/pcicvar.h#2 delete
.. //depot/projects/arm/src/sys/pccard/slot.h#2 delete
.. //depot/projects/arm/src/sys/pci/agp.c#3 integrate
.. //depot/projects/arm/src/sys/pci/if_sk.c#4 integrate
.. //depot/projects/arm/src/sys/pci/if_skreg.h#3 integrate
.. //depot/projects/arm/src/sys/pci/if_xl.c#4 integrate
.. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/arm/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/arm/src/sys/powerpc/powerpc/machdep.c#6 integrate
.. //depot/projects/arm/src/sys/rpc/rpcclnt.c#4 integrate
.. //depot/projects/arm/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate
.. //depot/projects/arm/src/sys/sparc64/central/central.c#6 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#9 integrate
.. //depot/projects/arm/src/sys/sparc64/ebus/ebus.c#4 integrate
.. //depot/projects/arm/src/sys/sparc64/fhc/fhc_central.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/fhc/fhc_nexus.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/include/in_cksum.h#2 integrate
.. //depot/projects/arm/src/sys/sparc64/include/trap.h#2 integrate
.. //depot/projects/arm/src/sys/sparc64/include/utrap.h#2 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/apb.c#4 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcib.c#3 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#6 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/arm/src/sys/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/arm/src/sys/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/arm/src/sys/sparc64/sparc64/exception.S#4 integrate
.. //depot/projects/arm/src/sys/sys/_lock.h#3 integrate
.. //depot/projects/arm/src/sys/sys/ata.h#3 integrate
.. //depot/projects/arm/src/sys/sys/cdefs.h#5 integrate
.. //depot/projects/arm/src/sys/sys/ioctl.h#3 integrate
.. //depot/projects/arm/src/sys/sys/ioctl_compat.h#2 integrate
.. //depot/projects/arm/src/sys/sys/ktr.h#6 integrate
.. //depot/projects/arm/src/sys/sys/lock.h#5 integrate
.. //depot/projects/arm/src/sys/sys/mbuf.h#7 integrate
.. //depot/projects/arm/src/sys/sys/md5.h#2 integrate
.. //depot/projects/arm/src/sys/sys/mount.h#6 integrate
.. //depot/projects/arm/src/sys/sys/mutex.h#4 integrate
.. //depot/projects/arm/src/sys/sys/param.h#9 integrate
.. //depot/projects/arm/src/sys/sys/proc.h#5 integrate
.. //depot/projects/arm/src/sys/sys/select.h#2 integrate
.. //depot/projects/arm/src/sys/sys/socketvar.h#5 integrate
.. //depot/projects/arm/src/sys/sys/syscall.h#6 integrate
.. //depot/projects/arm/src/sys/sys/syscall.mk#6 integrate
.. //depot/projects/arm/src/sys/sys/sysproto.h#6 integrate
.. //depot/projects/arm/src/sys/sys/taskqueue.h#3 integrate
.. //depot/projects/arm/src/sys/sys/tree.h#3 integrate
.. //depot/projects/arm/src/sys/sys/ttychars.h#2 integrate
.. //depot/projects/arm/src/sys/sys/ttycom.h#2 integrate
.. //depot/projects/arm/src/sys/sys/ttydev.h#2 integrate
.. //depot/projects/arm/src/sys/sys/turnstile.h#2 integrate
.. //depot/projects/arm/src/sys/sys/user.h#3 integrate
.. //depot/projects/arm/src/sys/sys/vnode.h#7 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate
.. //depot/projects/arm/src/sys/ufs/ufs/ufs_quota.c#4 integrate
.. //depot/projects/arm/src/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/arm/src/sys/vm/uma_core.c#4 integrate
.. //depot/projects/arm/src/sys/vm/vm_contig.c#4 integrate
.. //depot/projects/arm/src/sys/vm/vm_fault.c#6 integrate
.. //depot/projects/arm/src/sys/vm/vm_map.c#5 integrate
.. //depot/projects/arm/src/sys/vm/vm_object.c#5 integrate
.. //depot/projects/arm/src/sys/vm/vm_object.h#3 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.c#6 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.h#4 integrate
.. //depot/projects/arm/src/sys/vm/vm_pageout.c#4 integrate
.. //depot/projects/arm/src/sys/vm/vm_pageq.c#5 integrate
Differences ...
==== //depot/projects/arm/src/sys/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.33 2005/03/08 00:09:41 grog Exp $
+# $FreeBSD: src/sys/Makefile,v 1.34 2006/01/10 20:58:27 rees Exp $
# The boot loader
.if !defined(NO_BOOT)
@@ -11,7 +11,8 @@
CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs gnu i4b isa \
isofs kern libkern modules net netatalk netatm netgraph \
netinet netinet6 netipx netkey netnatm netncp netsmb nfs \
- pccard pci posix4 sys ufs vm ${ARCHDIR}
+ nfsclient nfs4client rpc pccard pci posix4 sys ufs vm \
+ ${ARCHDIR}
ARCHDIR ?= ${MACHINE}
==== //depot/projects/arm/src/sys/alpha/conf/GENERIC#5 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.191 2005/11/27 23:16:58 ru Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.192 2006/01/10 09:19:07 phk Exp $
cpu EV4
cpu EV5
@@ -61,6 +61,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!]
+options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
==== //depot/projects/arm/src/sys/alpha/include/_types.h#4 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/alpha/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $
+ * $FreeBSD: src/sys/alpha/include/_types.h,v 1.8 2006/01/09 06:05:55 imp Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -43,8 +43,6 @@
#error this file needs sys/cdefs.h as a prerequisite
#endif
-#define __PCI_REROUTE_INTERRUPT
-
/*
* Basic types upon which most other types are built.
*/
==== //depot/projects/arm/src/sys/alpha/include/param.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.40 2005/12/06 13:27:20 ru Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.41 2006/01/09 06:05:55 imp Exp $ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
/*-
@@ -66,6 +66,8 @@
#ifndef _NO_NAMESPACE_POLLUTION
+#define __PCI_REROUTE_INTERRUPT
+
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
==== //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.72 2005/12/16 05:57:18 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.73 2006/01/14 17:22:46 scottl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -285,8 +285,10 @@
/* Must bounce */
- if ((error = alloc_bounce_zone(newtag)) != 0)
+ if ((error = alloc_bounce_zone(newtag)) != 0) {
+ free(newtag, M_DEVBUF);
return (error);
+ }
bz = newtag->bounce_zone;
if (ptoa(bz->total_bpages) < maxsize) {
==== //depot/projects/arm/src/sys/amd64/amd64/mptable_pci.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.3 2005/09/18 01:42:43 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.4 2006/01/06 19:22:18 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,13 +100,10 @@
{ 0, 0 }
};
-static driver_t mptable_hostb_driver = {
- "pcib",
- mptable_hostb_methods,
- 1,
-};
+static devclass_t hostb_devclass;
-DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, pcib_devclass, 0, 0);
+DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1);
+DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0);
/* PCI to PCI bridge driver. */
@@ -155,11 +152,9 @@
{0, 0}
};
-static driver_t mptable_pcib_driver = {
- "pcib",
- mptable_pcib_pci_methods,
- sizeof(struct pcib_softc),
-};
+static devclass_t pcib_devclass;
+DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods,
+ sizeof(struct pcib_softc));
DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0);
==== //depot/projects/arm/src/sys/amd64/amd64/trap.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.300 2006/01/27 22:22:10 jhb Exp $");
/*
* AMD64 Trap and System call handling
@@ -220,10 +220,10 @@
printf("kernel trap %d with interrupts disabled\n",
type);
/*
- * We shouldn't enable interrupts while in a critical
- * section or servicing an NMI.
+ * We shouldn't enable interrupts while holding a
+ * spin lock or servicing an NMI.
*/
- if (type != T_NMI && td->td_critnest == 0)
+ if (type != T_NMI && td->td_md.md_spinlock_count == 0)
enable_intr();
}
}
@@ -237,8 +237,16 @@
* do the VM lookup, so just consider it a fatal trap so the
* kernel can print out a useful trap message and even get
* to the debugger.
+ *
+ * If we get a page fault while holding a non-sleepable
+ * lock, then it is most likely a fatal kernel page fault.
+ * If WITNESS is enabled, then it's going to whine about
+ * bogus LORs with various VM locks, so just skip to the
+ * fatal trap handling directly.
*/
- if (td->td_critnest != 0)
+ if (td->td_critnest != 0 ||
+ WITNESS_CHECK(WARN_SLEEPOK | WARN_GIANTOK, NULL,
+ "Kernel page fault") != 0)
trap_fatal(&frame, frame.tf_addr);
}
==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#7 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.447 2005/11/27 23:16:58 ru Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.449 2006/01/12 01:20:59 obrien Exp $
cpu HAMMER
ident GENERIC
@@ -46,10 +46,10 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_GPT # GUID Partition Tables.
options COMPAT_43 # Needed by COMPAT_LINUX32
+options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!]
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
-options COMPAT_LINUX32 # Compatible with i386 linux binaries
options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
@@ -77,6 +77,7 @@
options SMP # Symmetric MultiProcessor Kernel
# Linux 32-bit ABI support
+options COMPAT_LINUX32 # Compatible with i386 linux binaries
options LINPROCFS # Cannot be a module yet.
# Bus support.
==== //depot/projects/arm/src/sys/amd64/include/_types.h#6 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/amd64/include/_types.h,v 1.10 2006/01/01 20:59:27 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -44,8 +44,6 @@
#endif
#define __NO_STRICT_ALIGNMENT
-#define __HAVE_ACPI
-#define __PCI_REROUTE_INTERRUPT
/*
* Basic types upon which most other types are built.
==== //depot/projects/arm/src/sys/amd64/include/param.h#4 (text+ko) ====
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)param.h 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/amd64/include/param.h,v 1.19 2005/12/06 13:27:20 ru Exp $
+ * $FreeBSD: src/sys/amd64/include/param.h,v 1.20 2006/01/09 06:05:56 imp Exp $
*/
/*
@@ -66,6 +66,9 @@
#ifndef _NO_NAMESPACE_POLLUTION
+#define __HAVE_ACPI
+#define __PCI_REROUTE_INTERRUPT
+
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
==== //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.115 2005/12/20 21:09:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.116 2006/01/06 19:22:18 jhb Exp $");
#include "opt_cpu.h"
@@ -326,12 +326,9 @@
{ 0, 0 }
};
-static driver_t legacy_pcib_driver = {
- "pcib",
- legacy_pcib_methods,
- 1,
-};
+static devclass_t pcib_devclass;
+DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1);
DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, pcib_devclass, 0, 0);
@@ -377,12 +374,7 @@
{ 0, 0 }
};
-static driver_t pcibus_pnp_driver = {
- "pcibus_pnp",
- pcibus_pnp_methods,
- 1, /* no softc */
-};
-
static devclass_t pcibus_pnp_devclass;
+DEFINE_CLASS_0(pcibus_pnp, pcibus_pnp_driver, pcibus_pnp_methods, 1);
DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0);
==== //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#5 (text+ko) ====
@@ -23,13 +23,15 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.4 2005/12/20 01:28:17 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.5 2006/01/20 00:46:44 cognet Exp $");
#include <machine/asm.h>
#include <sys/types.h>
#include <sys/elf32.h>
#include <sys/param.h>
#include <sys/inflate.h>
#include <machine/elf.h>
+#include <machine/pte.h>
+
#include <stdlib.h>
#include "opt_global.h"
@@ -204,7 +206,7 @@
{
Elf32_Ehdr *eh;
Elf32_Phdr phdr[512] /* XXX */, *php;
- Elf32_Shdr *shdr;
+ Elf32_Shdr shdr[512] /* XXX */;
int i,j;
void *entry_point;
int symtabindex = -1;
@@ -228,9 +230,6 @@
}
/* Save the symbol tables, as there're about to be scratched. */
- lastaddr = roundup(lastaddr, sizeof(long));
- shdr = (Elf_Shdr *)lastaddr;
- lastaddr += sizeof(*shdr) * eh->e_shnum;
memcpy(shdr, (void *)(kstart + eh->e_shoff),
sizeof(*shdr) * eh->e_shnum);
if (eh->e_shnum * eh->e_shentsize != 0 &&
@@ -337,7 +336,51 @@
extern char func_end[];
extern void *_end;
-void __start(void)
+
+#define PMAP_DOMAIN_KERNEL 15 /*
+ * Just define it instead of including the
+ * whole VM headers set.
+ */
+int __hack;
+static __inline void
+setup_pagetables(unsigned int pt_addr, vm_paddr_t physstart, vm_paddr_t physend)
+{
+ unsigned int *pd = (unsigned int *)pt_addr;
+ vm_paddr_t addr;
+ int domain = (DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT;
+ int tmp;
+
+ bzero(pd, L1_TABLE_SIZE);
+ for (addr = physstart; addr < physend; addr += L1_S_SIZE)
+ pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)|
+ L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr;
+ /* XXX: See below */
+ if (0xfff00000 < physstart || 0xfff00000 > physend)
+ pd[0xfff00000 >> L1_S_SHIFT] = L1_TYPE_S|L1_S_AP(AP_KRW)|
+ L1_S_DOM(PMAP_DOMAIN_KERNEL)|physstart;
+ __asm __volatile("mcr p15, 0, %1, c2, c0, 0\n" /* set TTB */
+ "mcr p15, 0, %1, c8, c7, 0\n" /* Flush TTB */
+ "mcr p15, 0, %2, c3, c0, 0\n" /* Set DAR */
+ "mrc p15, 0, %0, c1, c0, 0\n"
+ "orr %0, %0, #1\n" /* MMU_ENABLE */
+ "mcr p15, 0, %0, c1, c0, 0\n"
+ "mrc p15, 0, %0, c2, c0, 0\n" /* CPWAIT */
+ "mov r0, r0\n"
+ "sub pc, pc, #4\n" :
+ "=r" (tmp) : "r" (pd), "r" (domain));
+
+ /*
+ * XXX: This is the most stupid workaround I've ever wrote.
+ * For some reason, the KB9202 won't boot the kernel unless
+ * we access an address which is not in the
+ * 0x20000000 - 0x20ffffff range. I hope I'll understand
+ * what's going on later.
+ */
+ __hack = *(volatile int *)0xfffff21c;
+}
+
+void
+__start(void)
{
void *curaddr;
void *dst;
@@ -348,6 +391,10 @@
curaddr = (void*)((unsigned int)curaddr & 0xfff00000);
#ifdef KZIP
if (*kernel == 0x1f && kernel[1] == 0x8b) {
+ int pt_addr = (((int)&_end + KERNSIZE + 0x100) &
+ ~(L1_TABLE_SIZE - 1)) + L1_TABLE_SIZE;
+ setup_pagetables(pt_addr, (vm_paddr_t)curaddr,
+ (vm_paddr_t)curaddr + 0x10000000);
/* Gzipped kernel */
dst = inflate_kernel(kernel, &_end);
kernel = (char *)&_end;
==== //depot/projects/arm/src/sys/arm/arm/trap.c#4 (text+ko) ====
@@ -82,7 +82,7 @@
#include "opt_ktrace.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.19 2006/01/06 18:02:12 jhb Exp $");
#include <sys/types.h>
@@ -269,7 +269,8 @@
/* Grab the current pcb */
pcb = td->td_pcb;
/* Re-enable interrupts if they were enabled previously */
- if (td->td_critnest == 0 && __predict_true(tf->tf_spsr & I32_bit) == 0)
+ if (td->td_md.md_spinlock_count == 0 &&
+ __predict_true(tf->tf_spsr & I32_bit) == 0)
enable_interrupts(I32_bit);
/* Invoke the appropriate handler, if necessary */
@@ -729,7 +730,7 @@
thread_user_enter(td);
}
fault_pc = tf->tf_pc;
- if (td->td_critnest == 0 &&
+ if (td->td_md.md_spinlock_count == 0 &&
__predict_true((tf->tf_spsr & I32_bit) == 0))
enable_interrupts(I32_bit);
@@ -1007,7 +1008,7 @@
* Since all syscalls *should* come from user mode it will always
* be safe to enable them, but check anyway.
*/
- if (td->td_critnest == 0 && !(frame->tf_spsr & I32_bit))
+ if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit))
enable_interrupts(I32_bit);
syscall(td, frame, insn);
==== //depot/projects/arm/src/sys/arm/arm/vm_machdep.c#4 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.20 2005/12/05 12:58:44 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.21 2006/01/27 21:07:04 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -477,9 +477,11 @@
"smallalloc", 0);
in_sleep--;
goto retry;
+ } else if (in_alloc) {
+ mtx_unlock(&smallalloc_mtx);
+ return (NULL);
}
- if (wait & M_WAITOK)
- in_alloc = 1;
+ in_alloc = 1;
mtx_unlock(&smallalloc_mtx);
/* Try to alloc 1MB of contiguous memory. */
ret = arm_uma_do_alloc(&sp, bytes, zone == l2zone ?
==== //depot/projects/arm/src/sys/arm/include/_types.h#4 (text+ko) ====
@@ -33,7 +33,7 @@
*
* From: @(#)ansi.h 8.2 (Berkeley) 1/4/94
* From: @(#)types.h 8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/arm/include/_types.h,v 1.7 2006/01/01 20:59:27 imp Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.8 2006/01/09 06:05:56 imp Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -43,8 +43,6 @@
#error this file needs sys/cdefs.h as a prerequisite
#endif
-#define __PCI_REROUTE_INTERRUPT
-
/*
* Basic types upon which most other types are built.
*/
==== //depot/projects/arm/src/sys/arm/include/param.h#3 (text+ko) ====
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)param.h 5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/arm/include/param.h,v 1.10 2005/12/06 13:27:20 ru Exp $
+ * $FreeBSD: src/sys/arm/include/param.h,v 1.11 2006/01/09 06:05:56 imp Exp $
*/
/*
@@ -59,6 +59,8 @@
#ifndef _NO_NAMESPACE_POLLUTION
+#define __PCI_REROUTE_INTERRUPT
+
#ifndef _MACHINE_PARAM_H_
#define _MACHINE_PARAM_H_
==== //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.5 2005/09/25 21:06:50 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.6 2006/01/23 14:03:14 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -368,15 +368,17 @@
rm = &sc->sc_io_rman;
bt = sc->sc_pciio;
bh = sc->sc_io;
- start = start - 0x90000000 + sc->sc_io;
- end = end - 0x90000000 + sc->sc_io;
+ if (start < sc->sc_io) {
+ start = start - 0x90000000 + sc->sc_io;
+ end = end - 0x90000000 + sc->sc_io;
+ }
break;
default:
return (NULL);
}
rv = rman_reserve_resource(rm, start, end, count, flags, child);
- if (rv == NULL)
+ if (rv == NULL)
return (NULL);
if (type != SYS_RES_IRQ) {
bh += (rman_get_start(rv));
==== //depot/projects/arm/src/sys/boot/common/module.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.25 2003/08/25 23:30:41 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.26 2006/01/12 13:18:49 marius Exp $");
/*
* file/module function dispatcher, support, etc.
@@ -864,7 +864,8 @@
if (mdp->d_hints != NULL || (mdp->d_flags & MDIR_NOHINTS))
return;
path = moduledir_fullpath(mdp, "linker.hints");
- if (stat(path, &st) != 0 || st.st_size < (sizeof(version) + sizeof(int)) ||
+ if (stat(path, &st) != 0 ||
+ st.st_size < (ssize_t)(sizeof(version) + sizeof(int)) ||
st.st_size > 100 * 1024 || (fd = open(path, O_RDONLY)) < 0) {
free(path);
mdp->d_flags |= MDIR_NOHINTS;
==== //depot/projects/arm/src/sys/boot/ia64/efi/start.S#2 (text+ko) ====
@@ -23,56 +23,32 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.8 2004/11/23 05:38:30 marcel Exp $
+ * $FreeBSD: src/sys/boot/ia64/efi/start.S,v 1.10 2006/01/18 18:49:25 marcel Exp $
*/
.text
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list