PERFORCE change 157151 for review

Marko Zec zec at FreeBSD.org
Wed Feb 4 10:47:52 PST 2009


http://perforce.freebsd.org/chv.cgi?CH=157151

Change 157151 by zec at zec_amdx2 on 2009/02/04 18:47:06

	IFC @ 157147

Affected files ...

.. //depot/projects/vimage/src/share/man/man4/iic.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#2 integrate
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/snd_ai2s.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/man4.powerpc/snd_davbus.4#1 branch
.. //depot/projects/vimage/src/share/man/man4/ng_bpf.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/nge.4#2 integrate
.. //depot/projects/vimage/src/share/man/man4/sk.4#2 integrate
.. //depot/projects/vimage/src/share/man/man5/Makefile#2 integrate
.. //depot/projects/vimage/src/share/man/man5/portindex.5#1 branch
.. //depot/projects/vimage/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/vimage/src/share/man/man7/Makefile#2 integrate
.. //depot/projects/vimage/src/share/man/man7/adding_user.7#1 branch
.. //depot/projects/vimage/src/share/man/man7/build.7#3 integrate
.. //depot/projects/vimage/src/share/man/man7/tuning.7#2 integrate
.. //depot/projects/vimage/src/share/man/man8/Makefile#2 integrate
.. //depot/projects/vimage/src/share/man/man8/adding_user.8#2 delete
.. //depot/projects/vimage/src/share/man/man9/kthread.9#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#12 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#9 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/io_apic.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#15 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#8 integrate
.. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/ia32/ia32_sigtramp.S#2 integrate
.. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#6 integrate
.. //depot/projects/vimage/src/sys/amd64/include/cpufunc.h#4 integrate
.. //depot/projects/vimage/src/sys/amd64/include/fpu.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/include/intr_machdep.h#7 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_locore.s#4 integrate
.. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate
.. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#12 integrate
.. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#8 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#17 integrate
.. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA#11 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA.hints#4 integrate
.. //depot/projects/vimage/src/sys/arm/include/atomic.h#6 integrate
.. //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#6 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#8 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425reg.h#4 integrate
.. //depot/projects/vimage/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate
.. //depot/projects/vimage/src/sys/cam/cam_periph.c#7 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#15 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_low.c#4 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#7 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#10 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/winx32_wrap.S#2 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_types.h#2 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#18 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#25 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#16 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#17 integrate
.. //depot/projects/vimage/src/sys/conf/kmod.mk#9 integrate
.. //depot/projects/vimage/src/sys/conf/options#42 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#21 integrate
.. //depot/projects/vimage/src/sys/dev/adb/adb_mouse.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_regdomain.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#27 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#16 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/cfi/cfi_bus_ixp4xx.c#1 branch
.. //depot/projects/vimage/src/sys/dev/cfi/cfi_core.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/cfi/cfi_dev.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#18 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/fwohci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/fwohcivar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_intel.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/ichsmb/ichsmb.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iic.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/iicbus/iic.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_acpi.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_smbios.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/kbdmux/kbdmux.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#11 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/lpt.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ppbus/ppbconf.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/sdhci/sdhci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/smbus/smb.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/snp/snp.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/sound/macio/aoa.c#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/macio/aoa.h#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/macio/davbus.c#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/macio/davbusreg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/macio/i2s.c#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/macio/snapper.c#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/macio/tumbler.c#1 branch
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#27 integrate
.. //depot/projects/vimage/src/sys/dev/speaker/spkr.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/u3g.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#39 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_atmelarm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_error.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_error.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_hid.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_ioctl.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_mfunc.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_revision.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/input/ukbd2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/u3g2.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/xen/blkback/blkback.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/xen/netback/netback.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_lookup.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#11 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/coda/coda_vfsops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#23 integrate
.. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#10 integrate
.. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#10 integrate
.. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_subr.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_vnops.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#11 integrate
.. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#10 integrate
.. //depot/projects/vimage/src/sys/geom/geom.h#4 integrate
.. //depot/projects/vimage/src/sys/geom/geom_dev.c#8 integrate
.. //depot/projects/vimage/src/sys/geom/geom_subr.c#7 integrate
.. //depot/projects/vimage/src/sys/i386/i386/io_apic.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#15 integrate
.. //depot/projects/vimage/src/sys/i386/i386/locore.s#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#14 integrate
.. //depot/projects/vimage/src/sys/i386/i386/msi.c#8 integrate
.. //depot/projects/vimage/src/sys/i386/i386/swtch.s#7 integrate
.. //depot/projects/vimage/src/sys/i386/include/apicvar.h#8 integrate
.. //depot/projects/vimage/src/sys/i386/include/cpufunc.h#8 integrate
.. //depot/projects/vimage/src/sys/i386/include/intr_machdep.h#7 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_locore.s#3 integrate
.. //depot/projects/vimage/src/sys/i386/svr4/svr4_locore.s#2 integrate
.. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#8 integrate
.. //depot/projects/vimage/src/sys/i386/xen/xen_machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/imgact_elf.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#22 integrate
.. //depot/projects/vimage/src/sys/kern/kern_malloc.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mib.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#22 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_timeout.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#26 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#29 integrate
.. //depot/projects/vimage/src/sys/kern/subr_autoconf.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/subr_clist.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_disk.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_firmware.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/subr_kobj.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/subr_prf.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/subr_prof.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/subr_rman.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/subr_rtc.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/subr_taskqueue.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/subr_witness.c#22 integrate
.. //depot/projects/vimage/src/sys/kern/sys_generic.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#30 integrate
.. //depot/projects/vimage/src/sys/kern/tty_info.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/tty_inq.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/tty_outq.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pty.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_aio.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#24 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#21 integrate
.. //depot/projects/vimage/src/sys/modules/agp/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/sound/driver/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/sound/driver/ai2s/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/sound/driver/davbus/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb2/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/net/if.c#63 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#37 integrate
.. //depot/projects/vimage/src/sys/net/if_llatbl.c#3 integrate
.. //depot/projects/vimage/src/sys/net/rtsock.c#27 integrate
.. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#12 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#27 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.h#12 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#17 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#18 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#17 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#12 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#7 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.h#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#11 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#20 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#49 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_divert.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#65 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#29 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#38 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#15 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#26 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_crc32.h#5 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#26 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#36 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#23 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#33 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#34 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.h#19 integrate
.. //depot/projects/vimage/src/sys/netinet6/frag6.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#18 integrate
.. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#34 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#47 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#19 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#44 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#32 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#30 integrate
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#35 integrate
.. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#29 integrate
.. //depot/projects/vimage/src/sys/netinet6/vinet6.h#33 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_mbuf.c#9 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#21 integrate
.. //depot/projects/vimage/src/sys/nfs4client/nfs4_subs.c#2 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#25 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#26 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#14 integrate
.. //depot/projects/vimage/src/sys/opencrypto/cryptosoft.c#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#17 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#11 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#11 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_audit.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_priv.c#3 integrate
.. //depot/projects/vimage/src/sys/sys/_null.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/cdefs.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/clist.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/conf.h#15 integrate
.. //depot/projects/vimage/src/sys/sys/elf_common.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/jail.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/kobj.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/malloc.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#40 integrate
.. //depot/projects/vimage/src/sys/sys/pciio.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/pcpu.h#10 integrate
.. //depot/projects/vimage/src/sys/sys/pmc.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/sysctl.h#31 integrate
.. //depot/projects/vimage/src/sys/sys/ttyqueue.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/types.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/unistd.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#17 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#8 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_balloc.c#5 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_extern.h#5 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#9 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#17 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#14 integrate
.. //depot/projects/vimage/src/sys/vm/uma.h#6 integrate
.. //depot/projects/vimage/src/sys/vm/uma_core.c#10 integrate
.. //depot/projects/vimage/src/sys/vm/uma_dbg.c#2 integrate
.. //depot/projects/vimage/src/sys/vm/uma_int.h#3 integrate
.. //depot/projects/vimage/src/sys/vm/vm_meter.c#11 integrate

Differences ...

==== //depot/projects/vimage/src/share/man/man4/iic.4#2 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/iic.4,v 1.15 2006/12/14 16:40:57 mpp Exp $
+.\" $FreeBSD: src/share/man/man4/iic.4,v 1.16 2009/01/26 13:53:39 raj Exp $
 .\"
 .Dd September 6, 2006
 .Dt IIC 4
@@ -45,13 +45,19 @@
 .Pa /dev/iic?
 with the
 following ioctls:
-.Bl -tag -width ".Dv I2CRSTCARD"
+.Bl -tag -width ".Dv I2CRPTSTART"
 .It Dv I2CSTART
 .Pq Vt "struct iiccmd"
 Sends the start condition to the slave specified by the
 .Va slave
 element to the bus.
 All other elements are ignored.
+.It Dv I2CRPTSTART
+.Pq Vt "struct iiccmd"
+Sends the repeated start condition to the slave specified by the
+.Va slave
+element to the bus.
+All other elements are ignored.
 .It Dv I2CSTOP
 No argument is passed.
 Sends the stop condition to the bus.

==== //depot/projects/vimage/src/share/man/man4/man4.powerpc/Makefile#2 (text+ko) ====

@@ -1,8 +1,10 @@
-# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.3 2008/12/07 06:18:47 nwhitehorn Exp $
+# $FreeBSD: src/share/man/man4/man4.powerpc/Makefile,v 1.5 2009/01/26 01:08:24 nwhitehorn Exp $
 
 MAN=	bm.4 \
 	pmu.4 \
-	powermac_nvram.4
+	powermac_nvram.4 \
+	snd_ai2s.4 \
+	snd_davbus.4
 
 MANSUBDIR=/powerpc
 

==== //depot/projects/vimage/src/share/man/man4/ng_bpf.4#2 (text+ko) ====

@@ -32,7 +32,7 @@
 .\"
 .\" Author: Archie Cobbs <archie at FreeBSD.org>
 .\"
-.\" $FreeBSD: src/share/man/man4/ng_bpf.4,v 1.22 2007/05/30 09:05:49 glebius Exp $
+.\" $FreeBSD: src/share/man/man4/ng_bpf.4,v 1.23 2009/01/30 19:33:04 keramida Exp $
 .\" $Whistle: ng_bpf.8,v 1.2 1999/12/03 01:57:12 archie Exp $
 .\"
 .Dd May 30, 2007
@@ -156,21 +156,14 @@
 MATCHHOOK="hook2"
 NOTMATCHHOOK="hook3"
 
-cat > /tmp/bpf.awk << xxENDxx
-{
-  if (!init) {
-    printf "bpf_prog_len=%d bpf_prog=[", \\$1;
-    init=1;
-  } else {
-    printf " { code=%d jt=%d jf=%d k=%d }", \\$1, \\$2, \\$3, \\$4;
-  }
-}
-END {
-  print " ]"
-}
-xxENDxx
-
-BPFPROG=`tcpdump -s 8192 -ddd ${PATTERN} | awk -f /tmp/bpf.awk`
+BPFPROG=$( tcpdump -s 8192 -ddd ${PATTERN} | \\
+           ( read len ; \\
+             echo -n "bpf_prog_len=$len" ; \\
+             echo -n "bpf_prog=[" ; \\
+             while read code jt jf k ; do \\
+                 echo -n " { code=$code jt=$jt jf=$jf k=$k }" ; \\
+             done ; \\
+             echo " ]" ) )
 
 ngctl msg ${NODEPATH} setprogram { thisHook=\\"${INHOOK}\\" \\
   ifMatch=\\"${MATCHHOOK}\\" \\

==== //depot/projects/vimage/src/share/man/man4/nge.4#2 (text+ko) ====

@@ -29,9 +29,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/nge.4,v 1.20 2006/01/14 15:35:21 bz Exp $
+.\" $FreeBSD: src/share/man/man4/nge.4,v 1.21 2009/01/24 04:08:00 trhodes Exp $
 .\"
-.Dd January 14, 2006
+.Dd January 23, 2009
 .Dt NGE 4
 .Os
 .Sh NAME
@@ -170,6 +170,8 @@
 .It
 D-Link DGE-500T
 .It
+Linksys EG1032, revision 1
+.It
 Netgear GA621
 .It
 Netgear GA622T

==== //depot/projects/vimage/src/share/man/man4/sk.4#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/sk.4,v 1.31 2008/02/14 10:01:48 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/sk.4,v 1.32 2009/01/24 04:08:00 trhodes Exp $
 .\"
-.Dd February 14, 2008
+.Dd January 23, 2009
 .Dt SK 4
 .Os
 .Sh NAME
@@ -82,7 +82,7 @@
 on the primary port fails, the SysKonnect driver will automatically
 switch traffic onto the second port.
 .Pp
-Also supported is the Marvell Semiconductor 88E1000* gigabit PHY.
+Also supported is the Marvell Semiconductor 88E100* gigabit PHY.
 .Pp
 The XaQti XMAC II supports full and half duplex operation with
 autonegotiation.
@@ -173,7 +173,7 @@
 .It
 D-Link DGE-530T single port, 1000baseT adapter
 .It
-Linksys EG1032 single port, 1000baseT adapter
+Linksys (revision 2) single port, 1000baseT adapter
 .It
 SK-9521 SK-NET GE-T single port, 1000baseT adapter
 .It

==== //depot/projects/vimage/src/share/man/man5/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD: src/share/man/man5/Makefile,v 1.81 2008/10/05 18:57:27 danger Exp $
+#	$FreeBSD: src/share/man/man5/Makefile,v 1.82 2009/01/28 15:22:44 tabthorpe Exp $
 
 .include <bsd.own.mk>
 
@@ -51,6 +51,7 @@
 	pbm.5 \
 	periodic.conf.5 \
 	phones.5 \
+	portindex.5 \
 	portsnap.conf.5 \
 	procfs.5 \
 	protocols.5 \

==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.350 2009/01/08 23:50:32 keramida Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.355 2009/01/29 06:43:29 keramida Exp $
 .\"
-.Dd January 9, 2009
+.Dd January 27, 2009
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -1089,9 +1089,9 @@
 variable.
 One or more IP addresses must be provided in Classless Inter-Domain
 Routing (CIDR) address notation, whose last byte can be a range like
-192.168.0.5-23/24.
-In this case the address 192.168.0.5 will be configured with the
-netmask /24 and the addresses 192.168.0.6 to 192.168.0.23 with
+192.0.2.5-23/24.
+In this case the address 192.0.2.5 will be configured with the
+netmask /24 and the addresses 192.0.2.6 to 192.0.2.23 with
 the non-conflicting netmask /32 as explained in the
 .Xr ifconfig 8
 alias section.
@@ -1099,7 +1099,7 @@
 .Li ed0 ,
 an example could look like:
 .Bd -literal
-ipv4_addrs_ed0="192.168.0.1/24 192.168.1.1-5/28"
+ipv4_addrs_ed0="192.0.2.129/27 192.0.2.1-5/28"
 .Ed
 .Pp
 It is also possible to add IP alias entries using
@@ -1233,7 +1233,7 @@
 It is also possible to rename interface by doing:
 .Bd -literal
 ifconfig_ed0_name="net0"
-ifconfig_net0="inet 10.0.0.1 netmask 0xffff0000"
+ifconfig_net0="inet 192.0.2.1 netmask 0xffffff00"
 .Ed
 .It Va ipv6_network_interfaces
 .Pq Vt str
@@ -3309,7 +3309,7 @@
 you would have the following dependent variables:
 .Bd -literal
 jail_vjail_hostname="jail.example.com"
-jail_vjail_ip="192.168.1.100"
+jail_vjail_ip="192.0.2.100"
 jail_vjail_rootdir="/var/jails/vjail/root"
 .Ed
 .Pp
@@ -3426,8 +3426,38 @@
 .It Va jail_ Ns Ao Ar jname Ac Ns Va _ip
 .Pq Vt str
 Unset by default.
-Set to the IP address assigned to jail
-.Va jname .
+Set to the (primary) IPv4 and/or IPv6 address(es) assigned to the jail.
+The argument can be a sole address or a comma separated list of addresses.
+Additionally each address can be prefixed by the name of an interface
+followed by a pipe to overwrite
+.Va jail_ Ns Ao Ar jname Ac Ns Va _interface
+or
+.Va jail_interface
+and/or suffixed by a netmask, prefixlen or prefix.
+In case no netmask, prefixlen or prefix is given,
+.Sq /32
+will be used for IPv4 and
+.Sq /128
+will be used for an IPv6 address.
+If no address is given for the jail then the jail will be started with
+no networking support.
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+.Pq Vt str
+Unset by default.
+Set additional IPv4 and/or IPv6 address(es) assigned to the jail.
+The sequence starts with
+.Dq Li _multi0
+and the numbers have to be strictly ascending.
+These entries follow the same syntax as their primary
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip
+entry.
+The order of the entries can be important as the first address for
+each address family found will be the primary address of the jail.
+See
+.Va ip-addresses
+option in
+.Xr jail 8
+for more details.
 .It Va jail_ Ns Ao Ar jname Ac Ns Va _flags
 .Pq Vt str
 Set to
@@ -3440,12 +3470,6 @@
 Unset by default.
 When set, sets the interface to use when setting IP address alias.
 Note that the alias is created at jail startup and removed at jail shutdown.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _netmask
-.Pq Vt str
-Set to
-.Li 255.255.255.255
-by default.
-This is the IP netmask to use when setting IP address alias.
 .It Va jail_ Ns Ao Ar jname Ac Ns Va _fib
 .Pq Vt str
 Unset by default.

==== //depot/projects/vimage/src/share/man/man7/Makefile#2 (text+ko) ====

@@ -1,8 +1,9 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/share/man/man7/Makefile,v 1.33 2007/10/12 10:35:24 ru Exp $
+# $FreeBSD: src/share/man/man7/Makefile,v 1.34 2009/01/30 15:14:58 gabor Exp $
 
 #MISSING: eqnchar.7 ms.7 term.7
-MAN=	ascii.7 \
+MAN=	adding_user.7 \
+	ascii.7 \
 	bsd.snmpmod.mk.7 \
 	build.7 \
 	clocks.7 \

==== //depot/projects/vimage/src/share/man/man7/build.7#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man7/build.7,v 1.49 2009/01/05 16:25:36 keramida Exp $
+.\" $FreeBSD: src/share/man/man7/build.7,v 1.51 2009/01/23 18:35:09 imp Exp $
 .\"
-.Dd January 5, 2009
+.Dd January 23, 2009
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -335,6 +335,25 @@
 .Xr make 1
 variables:
 .Bl -tag -width ".Va SUBDIR_OVERRIDE"
+.It Va KERNCONF
+Overrides which kernel to build and install for the various kernel
+make targets.
+It defaults to
+.Cm GENERIC .
+.It Va KERNFAST
+If set, the build target
+.Cm buildkernel
+defaults to setting 
+.Va NO_KERNELCLEAN ,
+.Va NO_KERNELCONFIG
+and
+.Va NO_KERNELDEPEND .
+When set to a value other than
+.Cm 1
+then 
+.Va KERNCONF 
+is set to the value of 
+.Va KERNFAST .
 .It Va LOCAL_DIRS
 If set, this variable supplies a list of additional directories to
 build, relative to the root of the source tree.
@@ -370,6 +389,8 @@
 .Va TARGET
 is also set, in which case it defaults to the appropriate
 value for that platform.
+Typically, one only needs to set 
+.Va TARGET .
 .El
 .Pp
 Builds under directory

==== //depot/projects/vimage/src/share/man/man7/tuning.7#2 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.76 2007/11/09 09:25:36 ru Exp $
+.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.79 2009/01/27 00:23:43 trhodes Exp $
 .\"
-.Dd November 19, 2007
+.Dd January 23, 2009
 .Dt TUNING 7
 .Os
 .Sh NAME
@@ -402,6 +402,19 @@
 on the system.
 .Pp
 The
+.Va kern.ipc.maxpipekva
+loader tunable is used to set a hard limit on the
+amount of kernel address space allocated to mapping of pipe buffers.
+Use of the mapping allows the kernel to eliminate a copy of the
+data from writer address space into the kernel, directly copying
+the content of mapped buffer to the reader.
+Increasing this value to a higher setting, such as `25165824' might
+improve performance on systems where space for mapping pipe buffers
+is quickly exhausted.
+This exhaustion is not fatal; however, and it will only cause pipes to
+to fall back to using double-copy.
+.Pp
+The
 .Va kern.ipc.shm_use_phys
 sysctl defaults to 0 (off) and may be set to 0 (off) or 1 (on).
 Setting

==== //depot/projects/vimage/src/share/man/man8/Makefile#2 (text+ko) ====

@@ -1,8 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/share/man/man8/Makefile,v 1.36 2006/08/29 09:12:48 danger Exp $
+# $FreeBSD: src/share/man/man8/Makefile,v 1.37 2009/01/30 15:14:58 gabor Exp $
 
-MAN=	adding_user.8 \
-	crash.8 \
+MAN=	crash.8 \
 	diskless.8 \
 	intro.8 \
 	MAKEDEV.8 \

==== //depot/projects/vimage/src/share/man/man9/kthread.9#2 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" (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/share/man/man9/kthread.9,v 1.18 2008/04/29 22:43:15 julian Exp $
+.\" $FreeBSD: src/share/man/man9/kthread.9,v 1.19 2009/01/27 00:22:16 trhodes Exp $
 .\"
-.Dd October 26, 2007
+.Dd January 26, 2009
 .Dt KTHREAD 9
 .Os
 .Sh NAME
@@ -43,12 +43,6 @@
 .Fn kthread_start "const void *udata"
 .Ft void
 .Fn kthread_shutdown "void *arg" "int howto"
-.Ft int
-.Fo kthread_add
-.Fa "void (*func)(void *)" "void *arg" "struct proc *procp"
-.Fa "struct thread **newtdpp" "int flags" "int pages"
-.Fa "const char *fmt" ...
-.Fc
 .Ft void
 .Fn kthread_exit "void"
 .Ft int
@@ -57,7 +51,14 @@
 .Fn kthread_suspend "struct thread *td" "int timo"
 .Ft void
 .Fn kthread_suspend_check "struct thread *td"
+.In sys/unistd.h
 .Ft int
+.Fo kthread_add
+.Fa "void (*func)(void *)" "void *arg" "struct proc *procp"
+.Fa "struct thread **newtdpp" "int flags" "int pages"
+.Fa "const char *fmt" ...
+.Fc
+.Ft int
 .Fo kproc_kthread_add
 .Fa "void (*func)(void *)" "void *arg"
 .Fa "struct proc **procptr" "struct thread **tdptr"
@@ -142,8 +143,12 @@
 then it is ignored.
 The
 .Fa flags
-argument specifies a set of flags as described in
-.Xr rfork 2 .
+argument may be set to
+.Dv RFSTOPPED
+to leave the thread in a stopped state.
+The caller must call
+.Fn sched_add
+to start the thread.
 The
 .Fa pages
 argument specifies the size of the new kernel thread's stack in pages.
@@ -274,23 +279,10 @@
 .Fn kthread_add
 function will fail if:
 .Bl -tag -width Er
-.It Bq Er EAGAIN
-The system-imposed limit on the total
-number of processes under execution would be exceeded.
-The limit is given by the
-.Xr sysctl 3
-MIB variable
-.Dv KERN_MAXPROC .
-.It Bq Er EINVAL
-The
-.Dv RFCFDG
-flag was specified in the
-.Fa flags
-parameter.
+.It Bq Er ENOMEM
+Memory for a thread's stack could not be allocated.
 .El
 .Sh SEE ALSO
-.Xr rfork 2 ,
-.Xr exit1 9 ,
 .Xr kproc 9 ,
 .Xr SYSINIT 9 ,
 .Xr wakeup 9

==== //depot/projects/vimage/src/sys/amd64/amd64/cpu_switch.S#12 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.165 2009/01/20 12:07:49 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.166 2009/01/31 11:37:21 obrien Exp $
  */
 
 #include <machine/asmacros.h>
@@ -260,12 +260,12 @@
 	jmp	do_tss
 
 store_seg:
-	movl	%gs,PCB_GS(%r8)
+	mov	%gs,PCB_GS(%r8)
 	testl	$PCB_GS32BIT,PCB_FLAGS(%r8)
 	jnz	2f
-1:	movl	%ds,PCB_DS(%r8)
-	movl	%es,PCB_ES(%r8)
-	movl	%fs,PCB_FS(%r8)
+1:	mov	%ds,PCB_DS(%r8)
+	mov	%es,PCB_ES(%r8)
+	mov	%fs,PCB_FS(%r8)
 	jmp	done_store_seg
 2:	movq	PCPU(GS32P),%rax
 	movq	(%rax),%rax
@@ -277,11 +277,11 @@
 	jnz	2f
 1:	movl	$MSR_GSBASE,%ecx
 	rdmsr
-	movl	PCB_GS(%r8),%gs
+	mov	PCB_GS(%r8),%gs
 	wrmsr
-	movl	PCB_DS(%r8),%ds
-	movl	PCB_ES(%r8),%es
-	movl	PCB_FS(%r8),%fs
+	mov	PCB_DS(%r8),%ds
+	mov	PCB_ES(%r8),%es
+	mov	PCB_FS(%r8),%fs
 	jmp	restore_fsbase
 	/* Restore userland %gs while preserving kernel gsbase */
 2:	movq	PCPU(GS32P),%rax

==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#9 (text+ko) ====

@@ -31,7 +31,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.136 2009/01/14 14:20:08 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.137 2009/02/03 09:01:45 jkoshy Exp $
  */
 
 #include "opt_atpic.h"
@@ -383,22 +383,24 @@
  * NMI handling is special.
  *
  * First, NMIs do not respect the state of the processor's RFLAGS.IF
- * bit and the NMI handler may be invoked at any time, including when
- * the processor is in a critical section with RFLAGS.IF == 0.  In
- * particular, this means that the processor's GS.base values could be
- * inconsistent on entry to the handler, and so we need to read
- * MSR_GSBASE to determine if a 'swapgs' is needed.  We use '%ebx', a
- * C-preserved register, to remember whether to swap GS back on the
- * exit path.
+ * bit.  The NMI handler may be entered at any time, including when
+ * the processor is in a critical section with RFLAGS.IF == 0.
+ * The processor's GS.base value could be invalid on entry to the
+ * handler.
  *
  * Second, the processor treats NMIs specially, blocking further NMIs
- * until an 'iretq' instruction is executed.  We therefore need to
- * execute the NMI handler with interrupts disabled to prevent a
- * nested interrupt from executing an 'iretq' instruction and
- * inadvertently taking the processor out of NMI mode.
+ * until an 'iretq' instruction is executed.  We thus need to execute
+ * the NMI handler with interrupts disabled, to prevent a nested interrupt
+ * from executing an 'iretq' instruction and inadvertently taking the
+ * processor out of NMI mode.
  *
- * Third, the NMI handler runs on its own stack (tss_ist1), shared
- * with the double fault handler.
+ * Third, the NMI handler runs on its own stack (tss_ist2). The canonical
+ * GS.base value for the processor is stored just above the bottom of its
+ * NMI stack.  For NMIs taken from kernel mode, the current value in
+ * the processor's GS.base is saved at entry to C-preserved register %r12,
+ * the canonical value for GS.base is then loaded into the processor, and
+ * the saved value is restored at exit time.  For NMIs taken from user mode,
+ * the cheaper 'SWAPGS' instructions are used for swapping GS.base.
  */
 
 IDTVEC(nmi)
@@ -423,12 +425,22 @@
 	movq	%r15,TF_R15(%rsp)
 	xorl	%ebx,%ebx
 	testb	$SEL_RPL_MASK,TF_CS(%rsp)
-	jnz	nmi_needswapgs		/* we came from userland */
+	jnz	nmi_fromuserspace
+	/*
+	 * We've interrupted the kernel.  Preserve GS.base in %r12.
+	 */
 	movl	$MSR_GSBASE,%ecx
 	rdmsr
-	cmpl	$VM_MAXUSER_ADDRESS >> 32,%edx
-	jae	nmi_calltrap		/* GS.base holds a kernel VA */
-nmi_needswapgs:
+	movq	%rax,%r12
+	shlq	$32,%rdx
+	orq	%rdx,%r12
+	/* Retrieve and load the canonical value for GS.base. */
+	movq	TF_SIZE(%rsp),%rdx
+	movl	%edx,%eax
+	shrq	$32,%rdx
+	wrmsr
+	jmp	nmi_calltrap
+nmi_fromuserspace:
 	incl	%ebx
 	swapgs
 /* Note: this label is also used by ddb and gdb: */
@@ -439,14 +451,19 @@
 	MEXITCOUNT
 #ifdef HWPMC_HOOKS
 	/*
-	 * Check if the current trap was from user mode and if so
-	 * whether the current thread needs a user call chain to be
-	 * captured. We are still in NMI mode at this point.
+	 * Capture a userspace callchain if needed.
+	 * 
+	 * - Check if the current trap was from user mode.
+	 * - Check if the current thread is valid.
+	 * - Check if the thread requires a user call chain to be
+	 *   captured.
+	 *
+	 * We are still in NMI mode at this point.
 	 */
-	testb	$SEL_RPL_MASK,TF_CS(%rsp)
-	jz	nocallchain
-	movq	PCPU(CURTHREAD),%rax	/* curthread present? */
-	orq	%rax,%rax
+	testl	%ebx,%ebx
+	jz	nocallchain	/* not from userspace */
+	movq	PCPU(CURTHREAD),%rax
+	orq	%rax,%rax	/* curthread present? */
 	jz	nocallchain
 	testl	$TDP_CALLCHAIN,TD_PFLAGS(%rax) /* flagged for capture? */
 	jz	nocallchain
@@ -498,8 +515,18 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list