[email protected]
[Top] [All Lists]

PERFORCE change 114070 for review

Subject: PERFORCE change 114070 for review
From: Scott Long
Date: Mon, 5 Feb 2007 21:04:18 GMT
http://perforce.freebsd.org/chv.cgi?CH=114070

Change 114070 by [email protected] on 2007/02/05 21:04:05

        IFC

Affected files ...

.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#9 
integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#8 
integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#8 
integrate
.. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#6 
integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#3 
integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#3 
integrate
.. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 
integrate
.. //depot/projects/scottl-camlock/src/sys/boot/common/loader.8#11 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#11 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#21 integrate
.. //depot/projects/scottl-camlock/src/sys/coda/coda_vfsops.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linprocfs/linprocfs.c#13 
integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_emul.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_misc.c#13 
integrate
.. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_socket.c#11 
integrate
.. //depot/projects/scottl-camlock/src/sys/conf/NOTES#18 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files#17 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.sparc64#11 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#13 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options#16 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/options.sun4v#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_acpi.c#9 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_pcib_pci.c#6 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-chipset.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/cardbus/cardbus.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/esp/esp_sbus.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/firewire/fwohci_pci.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fxp/if_fxp.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_target.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_tpublic.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/iwi/if_iwi.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_cbus.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_isa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_lebuffer.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_ledma.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/if_le_pci.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/lance.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/le/lebuffer_sbus.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818reg.h#2 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mfi/mfi_pci.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/mii.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/rlphy.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mii/ukphy.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pccard/pccard.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_if.m#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_private.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_if.m#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcib_private.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcireg.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/driver.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ad1816.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/ess.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/mss.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb16.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/isa/sb8.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midi.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/midiq.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu401.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu401.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpu_if.m#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/mpufoi_if.m#2 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.c#8 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/sequencer.h#4 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/midi/synth_if.m#2 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/es137x.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/maestro.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/via8233.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.c#5 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/ac97_patch.h#5 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/buffer.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/dsp.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/sound.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pcm/vchan.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/sbus/cs4231.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio_pcm.c#8 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ti/if_ti.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_ns8250.c#7 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_sab82532.c#6 
integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_dev_z8530.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_kbd_sun.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/ehci_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/if_aue.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/ubsa.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/uhci_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/uhub.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/uipaq.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_subr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#15 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/uvisor.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/deadfs/dead_vnops.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_fat.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vfsops.c#13 
integrate
.. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#9 
integrate
.. //depot/projects/scottl-camlock/src/sys/geom/eli/g_eli.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_io.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 
integrate
.. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/powernow.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mp_machdep.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/mptable_pci.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/msi.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/clock.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#9 
integrate
.. //depot/projects/scottl-camlock/src/sys/i386/isa/clock.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/linux/linux_machdep.c#9 
integrate
.. //depot/projects/scottl-camlock/src/sys/i386/pci/pci_bus.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_conf.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_fork.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_idle.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_kse.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_mbuf.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_switch.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_4bsd.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_core.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_firmware.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_taskqueue.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_witness.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_mbuf.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_bio.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_export.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#17 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ath/Makefile#5 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/ath_rate_sample/Makefile#4 
integrate
.. //depot/projects/scottl-camlock/src/sys/modules/le/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/msdosfs/Makefile#4 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/uipaq/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/net/bpf.c#15 integrate
.. //depot/projects/scottl-camlock/src/sys/net/bpf_compat.h#3 delete
.. //depot/projects/scottl-camlock/src/sys/net/bpfdesc.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_tap.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/net/if_tun.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/_ieee80211.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_input.c#11 
integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ppp.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/netgraph/ng_pptpgre.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/in.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw2.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_input.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/tcp_var.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/ah_core.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfs_subs.c#3 
integrate
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vfsops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/nfs4client/nfs4_vnops.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/cbus/clock.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/pc98/machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/pci/if_rl.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/powerpc/include/ipl.h#2 delete
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/cache.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/frame.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/fsr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/intr_machdep.h#3 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/include/tsb.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/bus_machdep.c#4 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/exception.S#5 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/genassym.c#9 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#4 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_exception.S#2 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#2 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#6 
integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/support.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/swtch.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/upa.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/conf/.cvsignore#1 branch
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/bus.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/frame.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/fsr.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/intr_machdep.h#2 
integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/pcb.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/smp.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/include/utrap.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/bus_machdep.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/exception.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/interrupt.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/intr_machdep.c#3 
integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/mp_locore.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/support.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/swtch.S#2 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/tte.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/wbuf.S#4 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ata.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/buf.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/bufobj.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/conf.h#9 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/lock.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/mbuf.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/param.h#13 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/proc.h#14 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/sched.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/socketvar.h#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_alloc.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_extern.h#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_rawread.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/quota.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_quota.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vfsops.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma.h#7 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/uma_core.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_contig.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_page.c#14 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_pageq.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_zeroidle.c#9 integrate

Differences ...

==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#5 
(text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.56 2006/12/03 
07:11:55 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.57 2007/01/28 
21:34:07 wilko Exp $");
 
 #include <sys/ioctl.h>
 #include <sys/stdint.h>
@@ -1058,7 +1058,7 @@
        retval = 0;
 
        if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) {
-               warnx("error opening tranport layer device %s", XPT_DEVICE);
+               warnx("error opening transport layer device %s", XPT_DEVICE);
                warn("%s", XPT_DEVICE);
                return(1);
        }
@@ -1244,7 +1244,7 @@
 
        if (scan) {
                if ((fd = open(XPT_DEVICE, O_RDWR)) < 0) {
-                       warnx("error opening tranport layer device %s\n",
+                       warnx("error opening transport layer device %s\n",
                            XPT_DEVICE);
                        warn("%s", XPT_DEVICE);
                        return(1);

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#14 (text+ko) 
====

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

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#11 
(text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 
00:17:02 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.280 2007/01/23 
08:38:39 jeff Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -949,15 +949,12 @@
        ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]);
 
        if (ipi_bitmap & (1 << IPI_PREEMPT)) {
+               struct thread *running_thread = curthread;
                mtx_lock_spin(&sched_lock);
-               /* Don't preempt the idle thread */
-               if (curthread != PCPU_GET(idlethread)) {
-                       struct thread *running_thread = curthread;
-                       if (running_thread->td_critnest > 1) 
-                               running_thread->td_owepreempt = 1;
-                       else            
-                               mi_switch(SW_INVOL | SW_PREEMPT, NULL);
-               }
+               if (running_thread->td_critnest > 1) 
+                       running_thread->td_owepreempt = 1;
+               else            
+                       mi_switch(SW_INVOL | SW_PREEMPT, NULL);
                mtx_unlock_spin(&sched_lock);
        }
 

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/mptable_pci.c#6 
(text+ko) ====

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

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/msi.c#2 (text+ko) ====

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

==== //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#11 (text+ko) 
====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb 
Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb 
Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
@@ -105,6 +105,7 @@
 static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int 
maxcount, int *irqs);
 static int nexus_release_msi(device_t pcib, device_t dev, int count, int 
*irqs);
 static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq);
+static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq);
 static int nexus_release_msix(device_t pcib, device_t dev, int irq);
 
 static device_method_t nexus_methods[] = {
@@ -135,6 +136,7 @@
        DEVMETHOD(pcib_alloc_msi,       nexus_alloc_msi),
        DEVMETHOD(pcib_release_msi,     nexus_release_msi),
        DEVMETHOD(pcib_alloc_msix,      nexus_alloc_msix),
+       DEVMETHOD(pcib_remap_msix,      nexus_remap_msix),
        DEVMETHOD(pcib_release_msix,    nexus_release_msix),
 
        { 0, 0 }
@@ -510,6 +512,13 @@
 }
 
 static int
+nexus_remap_msix(device_t pcib, device_t dev, int index, int irq)
+{
+
+       return (msix_remap(index, irq));
+}
+
+static int
 nexus_release_msix(device_t pcib, device_t dev, int irq)
 {
 

==== //depot/projects/scottl-camlock/src/sys/amd64/include/clock.h#6 (text+ko) 
====

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

==== //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#9 
(text+ko) ====

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

==== //depot/projects/scottl-camlock/src/sys/amd64/isa/clock.c#9 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde 
Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde 
Exp $");
 
 /*
  * Routines to handle clock hardware.
@@ -103,11 +103,11 @@
 u_int  timer_freq = TIMER_FREQ;
 int    timer0_max_count;
 int    timer0_real_max_count;
-struct mtx clock_lock;
 #define        RTC_LOCK        mtx_lock_spin(&clock_lock)
 #define        RTC_UNLOCK      mtx_unlock_spin(&clock_lock)
 
 static int     beeping = 0;
+static struct mtx clock_lock;
 static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31};
 static struct intsrc *i8254_intsrc;
 static u_int32_t i8254_lastcount;
@@ -295,13 +295,6 @@
                printf("DELAY(%d)...", n);
 #endif
        /*
-        * Guard against the timer being uninitialized if we are called
-        * early for console i/o.
-        */
-       if (timer0_max_count == 0)
-               set_timer_freq(timer_freq, hz);
-
-       /*
         * Read the counter first, so that the rest of the setup overhead is
         * counted.  Guess the initial overhead is 20 usec (on most systems it
         * takes about 1.5 usec for each of the i/o's in getit().  The loop
@@ -560,10 +553,15 @@
        mtx_unlock_spin(&clock_lock);
 }
 
-/*
- * Initialize 8254 timer 0 early so that it can be used in DELAY().
- * XXX initialization of other timers is unintentionally left blank.
- */
+/* This is separate from startrtclock() so that it can be called early. */
+void
+i8254_init(void)
+{
+
+       mtx_init(&clock_lock, "clk", NULL, MTX_SPIN);
+       set_timer_freq(timer_freq, hz);
+}
+
 void
 startrtclock()
 {
@@ -572,7 +570,6 @@
        writertc(RTC_STATUSA, rtc_statusa);
        writertc(RTC_STATUSB, RTCSB_24HR);
 
-       set_timer_freq(timer_freq, hz);
        freq = calibrate_clocks();
 #ifdef CLK_CALIBRATION_LOOP
        if (bootverbose) {

==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux.h#7 (text+ko) 
====

@@ -27,7 +27,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/amd64/linux32/linux.h,v 1.10 2006/12/20 20:17:34 jkim Exp 
$
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.11 2007/02/01 13:36:19 kib Exp $
  */
 
 #ifndef _AMD64_LINUX_LINUX_H_
@@ -662,6 +662,13 @@
 #define        LINUX_SO_NO_CHECK       11
 #define        LINUX_SO_PRIORITY       12
 #define        LINUX_SO_LINGER         13
+#define        LINUX_SO_PEERCRED               17
+#define        LINUX_SO_RCVLOWAT               18
+#define        LINUX_SO_SNDLOWAT               19
+#define        LINUX_SO_RCVTIMEO               20
+#define        LINUX_SO_SNDTIMEO               21
+#define        LINUX_SO_TIMESTAMP              29
+#define        LINUX_SO_ACCEPTCONN             30
 
 #define        LINUX_IP_TOS            1
 #define        LINUX_IP_TTL            2

==== //depot/projects/scottl-camlock/src/sys/amd64/linux32/linux32_machdep.c#8 
(text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.26 2007/01/14 
16:20:37 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.30 2007/02/01 
13:27:51 kib Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -46,6 +46,7 @@
 #include <sys/proc.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
+#include <sys/sched.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysproto.h>
 #include <sys/unistd.h>
@@ -453,14 +454,21 @@
 linux_fork(struct thread *td, struct linux_fork_args *args)
 {
        int error;
+       struct proc *p2;
+       struct thread *td2;
 
 #ifdef DEBUG
        if (ldebug(fork))
                printf(ARGS(fork, ""));
 #endif
 
-       if ((error = fork(td, (struct fork_args *)args)) != 0)
+       if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0)
                return (error);
+       
+       if (error == 0) {
+               td->td_retval[0] = p2->p_pid;
+               td->td_retval[1] = 0;
+       }
 
        if (td->td_retval[1] == 1)
                td->td_retval[0] = 0;
@@ -468,6 +476,14 @@
        if (error)
                return (error);
 
+       td2 = FIRST_THREAD_IN_PROC(p2);
+
+       /* make it run */
+       mtx_lock_spin(&sched_lock);
+       TD_SET_CAN_RUN(td2);
+       sched_add(td2, SRQ_BORING);
+       mtx_unlock_spin(&sched_lock);
+
        return (0);
 }
 
@@ -476,6 +492,7 @@
 {
        int error;
        struct proc *p2;
+       struct thread *td2;
 
 #ifdef DEBUG
        if (ldebug(vfork))
@@ -483,7 +500,7 @@
 #endif
 
        /* exclude RFPPWAIT */
-       if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0)
+       if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 
0)
                return (error);
        if (error == 0) {
                td->td_retval[0] = p2->p_pid;
@@ -495,12 +512,25 @@
        error = linux_proc_init(td, td->td_retval[0], 0);
        if (error)
                return (error);
+
+       PROC_LOCK(p2);
+       p2->p_flag |= P_PPWAIT;
+       PROC_UNLOCK(p2);
+
+       td2 = FIRST_THREAD_IN_PROC(p2);
+       
+       /* make it run */
+       mtx_lock_spin(&sched_lock);
+       TD_SET_CAN_RUN(td2);
+       sched_add(td2, SRQ_BORING);
+       mtx_unlock_spin(&sched_lock);
+
        /* wait for the children to exit, ie. emulate vfork */
        PROC_LOCK(p2);
-       p2->p_flag |= P_PPWAIT;
        while (p2->p_flag & P_PPWAIT)
                msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
        PROC_UNLOCK(p2);
+       
        return (0);
 }
 
@@ -523,7 +553,7 @@
 #endif
 
        exit_signal = args->flags & 0x000000ff;
-       if (exit_signal >= LINUX_NSIG)
+       if (!LINUX_SIG_VALID(exit_signal) && exit_signal != 0)
                return (EINVAL);
 
        if (exit_signal <= LINUX_SIGTBLSZ)
@@ -561,6 +591,14 @@
        error = fork1(td, ff, 0, &p2);
        if (error)
                return (error);
+
+       if (args->flags & (CLONE_PARENT|CLONE_THREAD)) {
+               sx_xlock(&proctree_lock);
+               PROC_LOCK(p2);
+               proc_reparent(p2, td->td_proc->p_pptr);
+               PROC_UNLOCK(p2);
+               sx_xunlock(&proctree_lock);
+       }
        
        /* create the emuldata */
        error = linux_proc_init(td, p2->p_pid, args->flags);
@@ -580,14 +618,6 @@
                }
        }
 
-       if (args->flags & (CLONE_PARENT|CLONE_THREAD)) {
-               sx_xlock(&proctree_lock);
-               PROC_LOCK(p2);
-               proc_reparent(p2, td->td_proc->p_pptr);
-               PROC_UNLOCK(p2);
-               sx_xunlock(&proctree_lock);
-       }
-
        if (args->flags & CLONE_THREAD) {
                /* XXX: linux mangles pgrp and pptr somehow
                 * I think it might be this but I am not sure.
@@ -632,13 +662,18 @@
                printf(LMSG("clone: successful rfork to %ld, stack %p sig = 
%d"),
                    (long)p2->p_pid, args->stack, exit_signal);
 #endif
+       if (args->flags & CLONE_VFORK) {
+               PROC_LOCK(p2);
+               p2->p_flag |= P_PPWAIT;
+               PROC_UNLOCK(p2);
+       }
 
        /*
         * Make this runnable after we are finished with it.
         */
        mtx_lock_spin(&sched_lock);
        TD_SET_CAN_RUN(td2);
-       setrunqueue(td2, SRQ_BORING);
+       sched_add(td2, SRQ_BORING);
        mtx_unlock_spin(&sched_lock);
 
        td->td_retval[0] = p2->p_pid;
@@ -647,7 +682,6 @@
        if (args->flags & CLONE_VFORK) {
                /* wait for the children to exit, ie. emulate vfork */
                PROC_LOCK(p2);
-               p2->p_flag |= P_PPWAIT;
                while (p2->p_flag & P_PPWAIT)
                        msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
                PROC_UNLOCK(p2);

==== //depot/projects/scottl-camlock/src/sys/amd64/pci/pci_bus.c#8 (text+ko) 
====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 
jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.120 2007/01/22 21:48:42 
jhb Exp $");
 
 #include "opt_cpu.h"
 
@@ -347,6 +347,7 @@
        DEVMETHOD(pcib_alloc_msi,       legacy_pcib_alloc_msi),
        DEVMETHOD(pcib_release_msi,     pcib_release_msi),
        DEVMETHOD(pcib_alloc_msix,      legacy_pcib_alloc_msix),
+       DEVMETHOD(pcib_remap_msix,      pcib_remap_msix),
        DEVMETHOD(pcib_release_msix,    pcib_release_msix),
 
        { 0, 0 }

==== //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#14 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.77 2006/12/04 12:55:00 cognet 
Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo 
Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -157,7 +157,6 @@
 #include <sys/vmmeter.h>
 #include <sys/mman.h>
 #include <sys/smp.h>
-#include <sys/sx.h>
 #include <sys/sched.h>
 
 #include <vm/vm.h>

==== //depot/projects/scottl-camlock/src/sys/arm/at91/if_ate.c#9 (text) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.15 2007/01/05 01:07:59 ticso 
Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.16 2007/02/03 07:46:26 kevlo 
Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -203,7 +203,6 @@
 
        ifp->if_softc = sc;
        if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-       ifp->if_mtu = ETHERMTU;
        ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
        ifp->if_capabilities |= IFCAP_VLAN_MTU;
        ifp->if_capenable |= IFCAP_VLAN_MTU; /* the hw bits already set */

==== //depot/projects/scottl-camlock/src/sys/arm/at91/uart_dev_at91usart.c#8 
(text) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 
00:24:15 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 
22:01:19 marius Exp $");
 
 #include "opt_comconsole.h"
 
@@ -94,7 +94,7 @@
 static void at91_usart_init(struct uart_bas *bas, int, int, int, int);
 static void at91_usart_term(struct uart_bas *bas);
 static void at91_usart_putc(struct uart_bas *bas, int);
-static int at91_usart_poll(struct uart_bas *bas);
+static int at91_usart_rxready(struct uart_bas *bas);
 static int at91_usart_getc(struct uart_bas *bas, struct mtx *mtx);
 
 extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
@@ -201,7 +201,7 @@
        .init = at91_usart_init,
        .term = at91_usart_term,
        .putc = at91_usart_putc,
-       .poll = at91_usart_poll,
+       .rxready = at91_usart_rxready,
        .getc = at91_usart_getc,
 };
 
@@ -252,15 +252,13 @@
 }
 
 /*
- * Poll for a character available
+ * Check for a character available.
  */
 static int
-at91_usart_poll(struct uart_bas *bas)
+at91_usart_rxready(struct uart_bas *bas)
 {
 
-       if (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY))
-               return (-1);
-       return (RD4(bas, USART_RHR) & 0xff);
+       return ((RD4(bas, USART_CSR) & USART_CSR_RXRDY) != 0 ? 1 : 0);
 }
 
 /*

==== //depot/projects/scottl-camlock/src/sys/arm/sa11x0/uart_dev_sa1110.c#6 
(text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.6 2006/06/07 
11:28:17 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 
22:01:19 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@
 static void sa1110_init(struct uart_bas *bas, int, int, int, int);
 static void sa1110_term(struct uart_bas *bas);
 static void sa1110_putc(struct uart_bas *bas, int);
-static int sa1110_poll(struct uart_bas *bas);
+static int sa1110_rxready(struct uart_bas *bas);
 static int sa1110_getc(struct uart_bas *bas, struct mtx *mtx);
 
 extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
@@ -62,7 +62,7 @@
        .init = sa1110_init,
        .term = sa1110_term,
        .putc = sa1110_putc,
-       .poll = sa1110_poll,
+       .rxready = sa1110_rxready,
        .getc = sa1110_getc,
 };
 
@@ -102,11 +102,10 @@
 }
 
 static int
-sa1110_poll(struct uart_bas *bas)
+sa1110_rxready(struct uart_bas *bas)
 {
-       if (!(uart_getreg(bas, SACOM_SR1) & SR1_RNE))
-               return (-1);
-       return (uart_getreg(bas, SACOM_DR) & 0xff);
+
+       return ((uart_getreg(bas, SACOM_SR1) & SR1_RNE) != 0 ? 1 : 0);
 }
 
 static int

==== 
//depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/avila_machdep.c#3 
(text+ko) ====

@@ -49,7 +49,7 @@
 #include "opt_ddb.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.2 2006/12/06 
06:34:54 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.3 2007/02/02 
05:14:21 kevlo Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -274,7 +274,7 @@
 #ifdef DDB
        vm_offset_t zstart = 0, zend = 0;
 #endif
-       int i = 0;
+       int i;
        uint32_t fake_preload[35];
        uint32_t memsize;
 

==== //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/if_npe.c#3 
(text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.2 2007/01/17 
00:58:25 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.4 2007/02/03 
07:46:26 kevlo Exp $");
 
 /*

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

<Prev in Thread] Current Thread [Next in Thread>
  • PERFORCE change 114070 for review, Scott Long <=