From owner-p4-projects@FreeBSD.ORG Sun Oct 12 12:29:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A33BC106568B; Sun, 12 Oct 2008 12:29:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E0C91065689 for ; Sun, 12 Oct 2008 12:29:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 39E0C8FC1C for ; Sun, 12 Oct 2008 12:29:33 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9CCTXpF042627 for ; Sun, 12 Oct 2008 12:29:33 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9CCTWXh042624 for perforce@freebsd.org; Sun, 12 Oct 2008 12:29:32 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 12 Oct 2008 12:29:32 GMT Message-Id: <200810121229.m9CCTWXh042624@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Oct 2008 12:29:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=151282 Change 151282 by ed@ed_dull on 2008/10/12 12:29:03 IFC. Affected files ... .. //depot/projects/mpsafetty/UPDATING#11 integrate .. //depot/projects/mpsafetty/etc/Makefile#3 integrate .. //depot/projects/mpsafetty/etc/etc.mips/ttys#3 integrate .. //depot/projects/mpsafetty/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/mpsafetty/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/Makefile#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.3#5 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/mpsafetty/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/mpsafetty/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/mpsafetty/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/mpsafetty/lib/libpmc/pmc.k7.3#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.k8.3#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.p5.3#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.p6.3#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/mpsafetty/lib/libutil/pty.c#3 integrate .. //depot/projects/mpsafetty/libexec/rtld-elf/mips/reloc.c#2 integrate .. //depot/projects/mpsafetty/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/mpsafetty/release/Makefile#2 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/mpsafetty/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/mpsafetty/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/mpsafetty/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/mpsafetty/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/mpsafetty/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/mpsafetty/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/mpsafetty/share/Makefile#3 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#12 integrate .. //depot/projects/mpsafetty/share/man/man4/ae.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/ata.4#3 integrate .. //depot/projects/mpsafetty/share/man/man4/bce.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/ddb.4#8 integrate .. //depot/projects/mpsafetty/share/man/man4/em.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/igb.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/jme.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/mmc.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/mpsafetty/share/man/man4/u3g.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/vlan.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/vr.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/wpi.4#3 integrate .. //depot/projects/mpsafetty/share/man/man5/Makefile#2 integrate .. //depot/projects/mpsafetty/share/man/man5/nullfs.5#1 branch .. //depot/projects/mpsafetty/share/misc/committers-src.dot#7 integrate .. //depot/projects/mpsafetty/share/mk/bsd.kmod.mk#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#5 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/mpsafetty/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/mpsafetty/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#7 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#11 integrate .. //depot/projects/mpsafetty/sys/conf/files#17 integrate .. //depot/projects/mpsafetty/sys/conf/newvers.sh#4 integrate .. //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#9 delete .. //depot/projects/mpsafetty/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/mpsafetty/sys/dev/ata/ata-sata.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/mpsafetty/sys/dev/drm/drm.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mii/miidevs#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmc.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcreg.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcvar.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/sio/sio.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#1 branch .. //depot/projects/mpsafetty/sys/dev/usb/uark.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umass.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umct.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/geom_vfs.h#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/GENERIC#10 integrate .. //depot/projects/mpsafetty/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_bus.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/subr_witness.c#9 integrate .. //depot/projects/mpsafetty/sys/kern/sys_socket.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/mpsafetty/sys/libkern/qdivrem.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#13 integrate .. //depot/projects/mpsafetty/sys/modules/ae/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ata/ata/Makefile#2 delete .. //depot/projects/mpsafetty/sys/modules/ata/atacore/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atadevel/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atadevel/ata-devel.c#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/ata/atapci/Makefile.inc#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ehci/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/ohci/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/u3g/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/uhci/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/usb/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/wpifw/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/mpsafetty/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/mpsafetty/sys/sys/bufobj.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/pmc.h#3 integrate .. //depot/projects/mpsafetty/sys/sys/un.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#6 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/mpsafetty/sys/vm/vm_object.c#4 integrate .. //depot/projects/mpsafetty/tools/regression/netinet/udpzerobyte/Makefile#1 branch .. //depot/projects/mpsafetty/tools/regression/netinet/udpzerobyte/udpzerobyte.c#1 branch .. //depot/projects/mpsafetty/tools/regression/sockets/fstat/Makefile#1 branch .. //depot/projects/mpsafetty/tools/regression/sockets/fstat/fstat.c#1 branch .. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#11 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#10 integrate .. //depot/projects/mpsafetty/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/agent.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/cachelib.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/cacheplcs.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/config.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/hashtable.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/mp_rs_query.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/mp_ws_query.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/nscd.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/nscdcli.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/nscd/query.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/pmcstat/pmcstat.8#3 integrate .. //depot/projects/mpsafetty/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/devices.c#3 integrate Differences ... ==== //depot/projects/mpsafetty/UPDATING#11 (text+ko) ==== @@ -22,6 +22,21 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081009: + The uhci, ohci, ehci and slhci USB Host controller drivers have + been put into separate modules. If you load the usb module + separately through loader.conf you will need to load the + appropriate *hci module as well. E.g. for a UHCI-based USB 2.0 + controller add the following to loader.conf: + + uhci_load="YES" + ehci_load="YES" + +20081009: + The ABI used by the PMC toolset has changed. Please keep + userland (libpmc(3)) and the kernel module (hwpmc(4)) in + sync. + 20080820: The TTY subsystem of the kernel has been replaced by a new implementation, which provides better scalability and an @@ -59,6 +74,11 @@ option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh command line. + Please note that the sequence of keys offered for + authentication has been changed as well. You may want to + specify IdentityFile in a different order to revert this + behavior. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1018,7 +1038,7 @@ - + @@ -1126,4 +1146,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ +$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ ==== //depot/projects/mpsafetty/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $ +# $FreeBSD: src/etc/Makefile,v 1.371 2008/10/08 13:28:02 des Exp $ .include @@ -251,6 +251,7 @@ .endif cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* . + cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* . cd ${DESTDIR}/usr/share/man; \ set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; \ ==== //depot/projects/mpsafetty/etc/etc.mips/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.3 2008/08/24 08:41:29 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.4 2008/10/12 06:58:03 imp Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -33,10 +33,10 @@ console none unknown off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyU0 "/usr/libexec/getty std.9600" dialup off secure -ttyU1 "/usr/libexec/getty std.9600" dialup off secure -ttyU2 "/usr/libexec/getty std.9600" dialup off secure -ttyU3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.115200" dialup on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu3 "/usr/libexec/getty std.115200" dialup off secure # Pseudo terminals ttyp0 none network ttyp1 none network ==== //depot/projects/mpsafetty/etc/mtree/BSD.usr.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.335 2008/07/28 17:42:37 antoine Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.336 2008/10/08 13:28:02 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -740,6 +740,46 @@ cat9 .. .. + en.UTF-8 uname=root + cat1 + .. + cat1aout + .. + cat2 + .. + cat3 + .. + cat4 + amd64 + .. + arm + .. + i386 + .. + powerpc + .. + sparc64 + .. + .. + cat5 + .. + cat6 + .. + cat7 + .. + cat8 + amd64 + .. + i386 + .. + powerpc + .. + sparc64 + .. + .. + cat9 + .. + .. ja uname=root cat1 .. ==== //depot/projects/mpsafetty/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.270 2008/08/02 20:11:56 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.272 2008/10/08 19:39:22 phk Exp $ % ======================================================================= || || @@ -23951,6 +23951,9 @@ that kidnaped Europa. -- Marcus Tullius Cicero % +I like paying taxes. With them I buy civilization. + -- Oliver Wendell Holmes +% I like to believe that people in the long run are going to do more to promote peace than our governments. Indeed, I think that people want peace so much that one of these days governments had better get out of @@ -26583,6 +26586,9 @@ % If you can lead it to water and force it to drink, it isn't a horse. % +If you can not say it, you can not whistle it, either. + -- Wittgenstein +% If you can read this, you're too close. % If you can survive death, you can probably survive anything. ==== //depot/projects/mpsafetty/gnu/usr.bin/man/man/man.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.68 2008/05/14 17:18:12 ru Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.69 2008/10/08 13:16:20 des Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -105,6 +105,7 @@ {"KOI8-R", "koi8-r"}, {"ISO8859-1", "latin1"}, {"ISO8859-15", "latin1"}, + {"UTF-8", "utf8"}, {NULL} }; #endif ==== //depot/projects/mpsafetty/lib/libpmc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpmc/Makefile,v 1.11 2008/09/16 16:57:14 jkoshy Exp $ +# $FreeBSD: src/lib/libpmc/Makefile,v 1.12 2008/10/04 12:27:49 jkoshy Exp $ LIB= pmc @@ -24,6 +24,10 @@ MAN+= pmclog.3 # PMC-dependent manual pages +MAN+= pmc.atom.3 +MAN+= pmc.core.3 +MAN+= pmc.core2.3 +MAN+= pmc.iaf.3 MAN+= pmc.k7.3 MAN+= pmc.k8.3 MAN+= pmc.p4.3 ==== //depot/projects/mpsafetty/lib/libpmc/libpmc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.16 2008/09/17 04:13:14 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.17 2008/10/09 14:55:45 jkoshy Exp $"); #include #include @@ -59,6 +59,10 @@ static int p6_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif +#if defined(__amd64__) || defined(__i386__) +static int tsc_allocate_pmc(enum pmc_event _pe, char *_ctrspec, + struct pmc_op_pmcallocate *_pmc_config); +#endif #define PMC_CALL(cmd, params) \ syscall(pmc_syscall, PMC_OP_##cmd, (params)) @@ -77,23 +81,96 @@ static const struct pmc_event_alias *pmc_mdep_event_aliases; /* - * The pmc_event_descr table maps symbolic names known to the user + * The pmc_event_descr structure maps symbolic names known to the user * to integer codes used by the PMC KLD. */ struct pmc_event_descr { const char *pm_ev_name; enum pmc_event pm_ev_code; - enum pmc_class pm_ev_class; +}; + +/* + * The pmc_class_descr structure maps class name prefixes for + * event names to event tables and other PMC class data. + */ +struct pmc_class_descr { + const char *pm_evc_name; + size_t pm_evc_name_size; + enum pmc_class pm_evc_class; + const struct pmc_event_descr *pm_evc_event_table; + size_t pm_evc_event_table_size; + int (*pm_evc_allocate_pmc)(enum pmc_event _pe, + char *_ctrspec, struct pmc_op_pmcallocate *_pa); +}; + +#define PMC_TABLE_SIZE(N) (sizeof(N)/sizeof(N[0])) +#define PMC_EVENT_TABLE_SIZE(N) PMC_TABLE_SIZE(N##_event_table) + +#undef __PMC_EV +#define __PMC_EV(C,N) { #N, PMC_EV_ ## C ## _ ## N }, + +/* + * PMC_MDEP_TABLE(NAME, CLASS, ADDITIONAL_CLASSES...) + * + * Build an event descriptor table and a list of valid PMC classes. + */ +#define PMC_MDEP_TABLE(N,C,...) \ + static const struct pmc_event_descr N##_event_table[] = \ + { \ + __PMC_EV_##C() \ + }; \ + static const enum pmc_class N##_pmc_classes[] = { \ + PMC_CLASS_##C, __VA_ARGS__ \ + } + +PMC_MDEP_TABLE(k7, K7, PMC_CLASS_TSC); +PMC_MDEP_TABLE(k8, K8, PMC_CLASS_TSC); +PMC_MDEP_TABLE(p4, P4, PMC_CLASS_TSC); +PMC_MDEP_TABLE(p5, P5, PMC_CLASS_TSC); +PMC_MDEP_TABLE(p6, P6, PMC_CLASS_TSC); + +static const struct pmc_event_descr tsc_event_table[] = +{ + __PMC_EV_TSC() }; -static const struct pmc_event_descr -pmc_event_table[] = +#undef PMC_CLASS_TABLE_DESC +#define PMC_CLASS_TABLE_DESC(N, C) { \ + .pm_evc_name = #N "-", \ + .pm_evc_name_size = sizeof(#N "-") - 1, \ + .pm_evc_class = PMC_CLASS_##C , \ + .pm_evc_event_table = N##_event_table , \ + .pm_evc_event_table_size = \ + PMC_EVENT_TABLE_SIZE(N), \ + .pm_evc_allocate_pmc = N##_allocate_pmc \ + } + +static const struct pmc_class_descr pmc_class_table[] = { -#undef __PMC_EV -#define __PMC_EV(C,N,EV) { #EV, PMC_EV_ ## C ## _ ## N, PMC_CLASS_ ## C }, - __PMC_EVENTS() +#if defined(__i386__) + PMC_CLASS_TABLE_DESC(k7, K7), +#endif +#if defined(__i386__) || defined(__amd64__) + PMC_CLASS_TABLE_DESC(k8, K8), + PMC_CLASS_TABLE_DESC(p4, P4), +#endif +#if defined(__i386__) + PMC_CLASS_TABLE_DESC(p5, P5), + PMC_CLASS_TABLE_DESC(p6, P6), +#endif +#if defined(__i386__) || defined(__amd64__) + PMC_CLASS_TABLE_DESC(tsc, TSC) +#endif }; +static size_t pmc_event_class_table_size = + PMC_TABLE_SIZE(pmc_class_table); + +#undef PMC_CLASS_TABLE_DESC + +static const enum pmc_class *pmc_mdep_class_list; +static size_t pmc_mdep_class_list_size; + /* * Mapping tables, mapping enumeration values to human readable * strings. @@ -111,9 +188,14 @@ __PMC_CLASSES() }; -static const char * pmc_cputype_names[] = { +struct pmc_cputype_map { + enum pmc_class pm_cputype; + const char *pm_name; +}; + +static const struct pmc_cputype_map pmc_cputype_names[] = { #undef __PMC_CPU -#define __PMC_CPU(S, D) #S , +#define __PMC_CPU(S, V, D) { .pm_cputype = PMC_CPU_##S, .pm_name = #S } , __PMC_CPUS() }; @@ -139,11 +221,6 @@ static struct pmc_cpuinfo cpu_info; /* filled in by pmc_init() */ - -/* Architecture dependent event parsing */ -static int (*pmc_mdep_allocate_pmc)(enum pmc_event _pe, char *_ctrspec, - struct pmc_op_pmcallocate *_pmc_config); - /* Event masks for events */ struct pmc_masks { const char *pm_name; @@ -167,7 +244,8 @@ return (-1); c = 0; /* count of mask keywords seen */ while ((r = strsep(&q, "+")) != NULL) { - for (pm = pmask; pm->pm_name && strcmp(r, pm->pm_name); pm++) + for (pm = pmask; pm->pm_name && strcasecmp(r, pm->pm_name); + pm++) ; if (pm->pm_name == NULL) /* not found */ return (-1); @@ -215,14 +293,7 @@ uint32_t count, unitmask; pmc_config->pm_md.pm_amd.pm_amd_config = 0; - pmc_config->pm_caps |= PMC_CAP_READ; - - if (pe == PMC_EV_TSC_TSC) { - /* TSC events must be unqualified. */ - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); if (pe == PMC_EV_K7_DC_REFILLS_FROM_L2 || pe == PMC_EV_K7_DC_REFILLS_FROM_SYSTEM || @@ -232,8 +303,6 @@ } else unitmask = has_unitmask = 0; - pmc_config->pm_caps |= PMC_CAP_WRITE; - while ((p = strsep(&ctrspec, ",")) != NULL) { if (KWPREFIXMATCH(p, K7_KW_COUNT "=")) { q = strchr(p, '='); @@ -514,16 +583,9 @@ uint32_t count, evmask; const struct pmc_masks *pm, *pmask; - pmc_config->pm_caps |= PMC_CAP_READ; + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); pmc_config->pm_md.pm_amd.pm_amd_config = 0; - if (pe == PMC_EV_TSC_TSC) { - /* TSC events must be unqualified. */ - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } - pmask = NULL; evmask = 0; @@ -597,8 +659,6 @@ break; /* no options defined */ } - pmc_config->pm_caps |= PMC_CAP_WRITE; - while ((p = strsep(&ctrspec, ",")) != NULL) { if (KWPREFIXMATCH(p, K8_KW_COUNT "=")) { q = strchr(p, '='); @@ -1005,22 +1065,14 @@ uint32_t evmask, cccractivemask; const struct pmc_masks *pm, *pmask; - pmc_config->pm_caps |= PMC_CAP_READ; + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); pmc_config->pm_md.pm_p4.pm_p4_cccrconfig = pmc_config->pm_md.pm_p4.pm_p4_escrconfig = 0; - if (pe == PMC_EV_TSC_TSC) { - /* TSC must not be further qualified */ - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } - pmask = NULL; evmask = 0; cccractivemask = 0x3; has_tag = has_busreqtype = 0; - pmc_config->pm_caps |= PMC_CAP_WRITE; #define __P4SETMASK(M) do { \ pmask = p4_mask_##M; \ @@ -1166,13 +1218,13 @@ if (*++q == '\0') /* skip '=' */ return (-1); - if (strcmp(q, P4_KW_ACTIVE_NONE) == 0) + if (strcasecmp(q, P4_KW_ACTIVE_NONE) == 0) cccractivemask = 0x0; - else if (strcmp(q, P4_KW_ACTIVE_SINGLE) == 0) + else if (strcasecmp(q, P4_KW_ACTIVE_SINGLE) == 0) cccractivemask = 0x1; - else if (strcmp(q, P4_KW_ACTIVE_BOTH) == 0) + else if (strcasecmp(q, P4_KW_ACTIVE_BOTH) == 0) cccractivemask = 0x2; - else if (strcmp(q, P4_KW_ACTIVE_ANY) == 0) + else if (strcasecmp(q, P4_KW_ACTIVE_ANY) == 0) cccractivemask = 0x3; else return (-1); @@ -1442,16 +1494,9 @@ int count, n; const struct pmc_masks *pm, *pmask; - pmc_config->pm_caps |= PMC_CAP_READ; + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); pmc_config->pm_md.pm_ppro.pm_ppro_config = 0; - if (pe == PMC_EV_TSC_TSC) { - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } - - pmc_config->pm_caps |= PMC_CAP_WRITE; evmask = 0; #define P6MASKSET(M) pmask = p6_mask_ ## M @@ -1638,6 +1683,93 @@ #endif +#if defined(__i386__) || defined(__amd64__) +static int +tsc_allocate_pmc(enum pmc_event pe, char *ctrspec, + struct pmc_op_pmcallocate *pmc_config) +{ + if (pe != PMC_EV_TSC_TSC) + return (-1); + + /* TSC events must be unqualified. */ + if (ctrspec && *ctrspec != '\0') + return (-1); + + pmc_config->pm_md.pm_amd.pm_amd_config = 0; + pmc_config->pm_caps |= PMC_CAP_READ; + + return (0); +} +#endif + +/* + * Match an event name `name' with its canonical form. + * + * Matches are case insensitive and spaces, underscores and hyphen + * characters are considered to match each other. + * + * Returns 1 for a match, 0 otherwise. + */ + +static int +pmc_match_event_name(const char *name, const char *canonicalname) +{ + int cc, nc; + const unsigned char *c, *n; + + c = (const unsigned char *) canonicalname; + n = (const unsigned char *) name; + + for (; (nc = *n) && (cc = *c); n++, c++) { + + if (toupper(nc) == cc) + continue; + + if ((nc == ' ' || nc == '_' || nc == '-') && + (cc == ' ' || cc == '_' || cc == '-')) + continue; + + return (0); + } + + if (*n == '\0' && *c == '\0') + return (1); + + return (0); +} + +/* + * Match an event name against all the event named supported by a + * PMC class. + * + * Returns an event descriptor pointer on match or NULL otherwise. + */ +static const struct pmc_event_descr * +pmc_match_event_class(const char *name, + const struct pmc_class_descr *pcd) +{ + size_t n; + const struct pmc_event_descr *ev; + + ev = pcd->pm_evc_event_table; + for (n = 0; n < pcd->pm_evc_event_table_size; n++, ev++) + if (pmc_match_event_name(name, ev->pm_ev_name)) + return (ev); + + return (NULL); +} + +static int +pmc_mdep_is_compatible_class(enum pmc_class pc) +{ + size_t n; + + for (n = 0; n < pmc_mdep_class_list_size; n++) + if (pmc_mdep_class_list[n] == pc) + return (1); + return (0); +} + /* * API entry points */ @@ -1646,12 +1778,14 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, uint32_t flags, int cpu, pmc_id_t *pmcid) { + size_t n; int retval; - enum pmc_event pe; char *r, *spec_copy; const char *ctrname; - const struct pmc_event_alias *p; + const struct pmc_event_descr *ev; + const struct pmc_event_alias *alias; struct pmc_op_pmcallocate pmc_config; + const struct pmc_class_descr *pcd; spec_copy = NULL; retval = -1; @@ -1664,9 +1798,9 @@ /* replace an event alias with the canonical event specifier */ if (pmc_mdep_event_aliases) - for (p = pmc_mdep_event_aliases; p->pm_alias; p++) - if (!strcmp(ctrspec, p->pm_alias)) { - spec_copy = strdup(p->pm_spec); + for (alias = pmc_mdep_event_aliases; alias->pm_alias; alias++) + if (!strcasecmp(ctrspec, alias->pm_alias)) { + spec_copy = strdup(alias->pm_spec); break; } @@ -1676,19 +1810,43 @@ r = spec_copy; ctrname = strsep(&r, ","); - /* look for the given counter name */ - for (pe = PMC_EVENT_FIRST; pe < (PMC_EVENT_LAST+1); pe++) - if (!strcmp(ctrname, pmc_event_table[pe].pm_ev_name)) + /* + * If a explicit class prefix was given by the user, restrict the + * search for the event to the specified PMC class. + */ + ev = NULL; + for (n = 0; n < pmc_event_class_table_size; n++) { + pcd = &pmc_class_table[n]; + if (pmc_mdep_is_compatible_class(pcd->pm_evc_class) && + strncasecmp(ctrname, pcd->pm_evc_name, + pcd->pm_evc_name_size) == 0) { + if ((ev = pmc_match_event_class(ctrname + + pcd->pm_evc_name_size, pcd)) == NULL) { + errno = EINVAL; + goto out; + } break; + } + } + + /* + * Otherwise, search for this event in all compatible PMC + * classes. + */ + for (n = 0; ev == NULL && n < pmc_event_class_table_size; n++) { + pcd = &pmc_class_table[n]; + if (pmc_mdep_is_compatible_class(pcd->pm_evc_class)) + ev = pmc_match_event_class(ctrname, pcd); + } - if (pe > PMC_EVENT_LAST) { + if (ev == NULL) { errno = EINVAL; goto out; } bzero(&pmc_config, sizeof(pmc_config)); - pmc_config.pm_ev = pmc_event_table[pe].pm_ev_code; - pmc_config.pm_class = pmc_event_table[pe].pm_ev_class; + pmc_config.pm_ev = ev->pm_ev_code; + pmc_config.pm_class = pcd->pm_evc_class; pmc_config.pm_cpu = cpu; pmc_config.pm_mode = mode; pmc_config.pm_flags = flags; @@ -1696,7 +1854,7 @@ if (PMC_IS_SAMPLING_MODE(mode)) pmc_config.pm_caps |= PMC_CAP_INTERRUPT; - if (pmc_mdep_allocate_pmc(pe, r, &pmc_config) < 0) { + if (pcd->pm_evc_allocate_pmc(ev->pm_ev_code, r, &pmc_config) < 0) { errno = EINVAL; goto out; } @@ -1817,28 +1975,28 @@ switch (cl) { case PMC_CLASS_TSC: - ev = &pmc_event_table[PMC_EV_TSC_TSC]; - count = 1; + ev = tsc_event_table; + count = PMC_EVENT_TABLE_SIZE(tsc); break; case PMC_CLASS_K7: - ev = &pmc_event_table[PMC_EV_K7_FIRST]; - count = PMC_EV_K7_LAST - PMC_EV_K7_FIRST + 1; + ev = k7_event_table; + count = PMC_EVENT_TABLE_SIZE(k7); break; case PMC_CLASS_K8: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 12 12:42:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A47A106568C; Sun, 12 Oct 2008 12:42:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1DC791065687 for ; Sun, 12 Oct 2008 12:42:47 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFE6A8FC19 for ; Sun, 12 Oct 2008 12:42:46 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9CCgkd2043819 for ; Sun, 12 Oct 2008 12:42:46 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9CCgkg8043817 for perforce@freebsd.org; Sun, 12 Oct 2008 12:42:46 GMT (envelope-from bz@freebsd.org) Date: Sun, 12 Oct 2008 12:42:46 GMT Message-Id: <200810121242.m9CCgkg8043817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 151283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Oct 2008 12:42:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=151283 Change 151283 by bz@bz_dumpster on 2008/10/12 12:42:32 IFC -Dt Affected files ... .. //depot/projects/s390/usr.bin/ar/Makefile#4 branch .. //depot/projects/s390/usr.bin/ar/ar.1#3 branch .. //depot/projects/s390/usr.bin/ar/ar.c#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Oct 13 07:00:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D283106569B; Mon, 13 Oct 2008 07:00:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50FF61065689 for ; Mon, 13 Oct 2008 07:00:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F5DC8FC0C for ; Mon, 13 Oct 2008 07:00:25 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9D70P3F038913 for ; Mon, 13 Oct 2008 07:00:25 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9D70PlU038910 for perforce@freebsd.org; Mon, 13 Oct 2008 07:00:25 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 13 Oct 2008 07:00:25 GMT Message-Id: <200810130700.m9D70PlU038910@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 151300 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 07:00:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=151300 Change 151300 by pgj@kolbasz on 2008/10/13 07:00:08 Add Hungarian translation of chapter "Tools" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#2 (text+ko) ==== @@ -31,172 +31,238 @@ --> - Tools - - The FDP uses a number of different software tools to help - manage the FreeBSD documentation, convert it to different output - formats, and so on. You will need to use these tools yourself if - you are to work with the FreeBSD documentation. + Eszközök + + Az FDP a &os; dokumentációját + többféle eszköz segítségével + tartja karban, alakítja át + különbözõ kimeneti formátumokra és + így tovább. Ha tehát a &os; + dokumentációjával akarunk dolgozni, akkor + mindezekre az eszközökre nekünk is + szükségünk lesz. + + Ezek az eszközök a &os; csomag- és + portgyûjteményében is megtalálhatóak, + ami így nagyban megkönnyíti a + telepítésüket. - All these tools are available as FreeBSD Ports and Packages, - greatly simplifying the work you have to do to install - them. - - You will need to install these tools before you work through - any of the examples in later chapters. The actual usage of these - tools is covered in later chapters. + Tehát érdemes elvégeznünk a + telepítésüket mielõtt foglalkoznánk a + késõbbi fejezetekben található + példákkal. Az egyes programok konkrét + használatával is majd ezekben a fejezetekben fogunk + részletesebben foglalkozni. - Use <filename role="package">textproc/docproj</filename> if possible + Lehetõség szerint a <filename + role="package">textproc/docproj</filename> portot + használjuk - You can save yourself a lot of time if you install the - textproc/docproj port. This is a - meta-port which does not contain any software - itself. Instead, it depends on various other ports being installed - correctly. Installing this port should - automatically download and install all of the packages listed in this - chapter that you need. + A textproc/docproj port + telepítésével rengeteg idõt és + fáradalmat megtakaríthatunk magunknak. Ez egy + ún. metaport, amely önmaga nem + tartalmaz semmilyen szoftvert, helyette azonban függ az + egyébként telepítendõ portoktól. + Így tehát csupán ezen port + telepítésével automatikusan le + kellene töltõdnie és + települnie kellene a fejezetben + ismertetett összes csomagnak. - One of the packages that you might need is the JadeTeX macro set. - In turn, this macro set requires &tex; to be installed. &tex; is a large - package, and you only need it if you want to produce Postscript or PDF - output. + Az egyik telepítésre javasolt csomag a + JadeTeX elnevezésû + makrókészlet, amelynek viszont szüksége + van a &tex; csomagra. A &tex; egy viszonylag nagy + méretû csomag, ennek a tényleges + telepítését csak abban az esetben javasoljuk, + ha a dokumentációból Postscript vagy PDF + változatot akarunk készíteni. - To save yourself time and space you must specify whether or not you - want JadeTeX (and therefore &tex;) installed when you install this port. - Either do: + Telepítési idõ és + tárterület szempontjából nyilatkoznunk + kell róla, hogy a port részeként a JadeTeX + (és így a &tex;) felkerüljön vagy sem. + Ennek megfelelõen választhatunk: - &prompt.root; make JADETEX=yes install + &prompt.root; make JADETEX=yes install - or + vagy - &prompt.root; make JADETEX=no install + &prompt.root; make JADETEX=no install - as necessary. Alternatively you may install textproc/docproj-jadetex or textproc/docproj-nojadetex. These slave ports - define the JADETEX variable for you, therefore they - will install the same suite of applications on your machine. - Note that you can produce only HTML or ASCII - text output if you do not install JadeTeX. - PostScript or PDF output require &tex;. + Ugyanezt a választást a textproc/docproj-jadetex vagy a + textproc/docproj-nojadetex + portok valamelyikének telepítésével is + megtehetjük. Ezek a segédportok helyettünk + már definiálják a JADETEX + változó értékét, és + ennek megfelelõen telepítik gépünkre az + alkalmazásokat. Ne felejtsük el, hogy ha nem + tesszük fel a JadeTeX csomagot, + akkor csak HTML és ASCII formátumú + dokumentációt leszünk képesek + elõállítani. Postscript vagy PDF + készítéséhez mindenképpen + szükséges a &tex;. - Mandatory tools + Alapeszközök - Software - - These programs are required before you can usefully work with the - FreeBSD documentation, and they will allow you to convert the - documentation to HTML, plain text, and RTF formats. They are all - included in textproc/docproj. - + Szoftverek + + A &os; dokumentációjával csak az ebben + a szakaszban ismertetett programok + segítségével tudunk érdemben + dolgozni. Ezekkel a programokkal tudjuk + lényegében átalakítani a + dokumentációt többek közt egyszerû + ASCII szöveggé, HTML oldalakká vagy RTF + dokumentumokká. Mindegyikük része a + textproc/docproj + csomagnak. + Jade (textproc/jade) - + - A DSSSL implementation. Used for converting marked up - documents to other formats, including HTML and &tex;. + Egy DSSSL implementáció, ezen + keresztül alakíthatóak át a + dokumentumok markupokkal ellátott forrásai + más, például HTML vagy &tex; + formátumokba. - + Tidy (www/tidy) - + - An HTML pretty printer, used to reformat some of the - automatically generated HTML so that it is easier to - follow. + Egy HTML forrásokra alkalmazható + formázó, amellyel a + többi program által automatikusan + létrehozott egyes HTML állományokat + lehet emberek számára könnyebben + érthetõ alakra hozni. - + Links (www/links) - + - A text-mode WWW browser that can also convert - HTML files to plain text. + Egy szöveges módban mûködõ + webböngészõ, amely remekül + használható HTML oldalak egyszerû + szöveges változatainak + létrehozására. peps (graphics/peps) - + - Some of the documentation includes images, some of which are - stored as EPS files. These must be converted to PNG before most - web browsers will display them. + A dokumentációban néhol + találhatóak ábrák, amelyek + némelyike EPS állományokban + tárolódik. A webböngészõk + azonban csak akkor fogják tudni ezeket + megjeleníteni, ha elõtte + átalakítjuk PNG + állományokká. - DTDs and Entities + Dokumentumtípus-definíciók és + egyedek + + Az FDP az itt felsorolt + dokumentumtípus-definíciókat (DTD-ket) + használja. A dokumentációval csak ezek + telepítése után tudunk dolgozni. - These are the DTDs and entity sets used by the FDP. They need to - be installed before you can work with any of the documentation. - HTML DTD (textproc/html) - + - HTML is the markup language of choice for the World Wide - Web, and is used throughout the FreeBSD web site. + A HTML a World Wide Web nyelveként + egységesen elfogadott jelölõnyelv, amely + ezáltal a &os; honlapjának is alapja. - + DocBook DTD (textproc/docbook) - + - DocBook is designed for marking up technical documentation. - All the FreeBSD documentation is written in DocBook. + A DocBook a különféle szakmai + jellegû dokumentációk + készítéséhez + kialakított jelölõnyelv. A &os; teljes + dokumentációja DocBook formátumban + készül. - + - ISO 8879 entities + ISO 8879 szabványú egyedek (textproc/iso8879) - + - 19 of the ISO 8879:1986 character entity sets used by many - DTDs. Includes named mathematical symbols, additional - characters in the Latin character set (accents, diacriticals, - and so on), and Greek symbols. + Az ISO 8879:1986 szabványban + meghatározott karakteregyed-készletek + közül 19 elõfordul számos DTD + részeként. Ezekben szerepelnek matematikai + szimbólumok, a Latin karakterkészletekben + megjelenõ további (ékezetes, + mellékjeles stb.) karakterek és + görög szimbólumok. - Stylesheets + Stíluslapok + + A stíluslapok felhasználásával + tudjuk a képernyõ, a nyomtatás stb. + számára alkalmassá tenni a + dokumentációkat az átalakítás + vagy a formázás során. - The stylesheets are used when converting and formatting the - documentation for display on screen, printing, and so on. - - Modular DocBook Stylesheets + Moduláris DocBook stíluslapok (textproc/dsssl-docbook-modular) - + - The Modular DocBook Stylesheets are used when converting - documentation marked up in DocBook to other formats, such as - HTML or RTF. + A moduláris DocBook stíluslapok + alkalmazásával alakítjuk át a + DocBook formában elõkészített + dokumentációt más, + például HTML vagy RTF + változatúra. @@ -204,72 +270,96 @@ - Optional tools + Kiegészítõ eszközök - You do not need to have any of the following installed. However, - you may find it easier to work with the documentation if you do, and - they may give you more flexibility in the output formats that can be - generated. + Ebben a szakaszban további választható + eszközöket sorolunk fel. Telepítésük + nem kötelezõ, azonban jelentõs + mértékben meg tudják könnyíteni a + munkánkat, illetve a dokumentációból + elõállítható kimeneti formátumok + terén kínálnak nagyobb + rugalmasságot. - Software - + Szoftverek + - JadeTeX and + JadeTeX és teTeX - (print/jadetex and + (print/jadetex és print/teTeX) - + - Jade and - teTeX are used to convert DocBook - documents to DVI, Postscript, and PDF formats. The - JadeTeX macros are needed in order to - do this. + A Jade és a + teTeX alkalmazások + segítségével + alakíthatóak át a DocBook + dokumentumaink DVI, Postscript és PDF + állományokká. Ehhez viszont a + JadeTeX makrókat is + telepítenünk kell. - If you do not intend to convert your documentation to one of - these formats (i.e., HTML, plain text, and RTF are sufficient) - then you do not need to install - JadeTeX and - teTeX. This can be a significant - space and time saver, as teTeX is - over 30MB in size. + Ha az imént említett formátumok + egyikére sincs szükségünk + (tehát elegendõ a HTML, szöveges + és RTF kimenet), akkor nem kell + telepítenünk a + JadeTeX és + teTeX szoftvereket. Ezzel + egyébként viszonylag sok helyet + megspórolhatunk, mivel a + teTeX közel 30 MB + méretû. - If you decide to install - JadeTeX and - teTeX then you will need to - configure teTeX after - JadeTeX has been installed. - print/jadetex/pkg-message contains - detailed instructions explaining what you need to do. + Ha a JadeTeX és a + teTeX + telepítése mellett döntünk, + akkor a JadeTeX + telepítése után megfelelõen be + kell állítanunk a + teTeX alkalmazást. Az + erre vonatkozó részletes + utasításokat a + print/jadetex/pkg-message + állományban olvashatjuk. - + - Emacs or - XEmacs - (editors/emacs or + Emacs vagy + XEmacs + (editors/emacs vagy editors/xemacs) - + - Both these editors include a special mode for editing - documents marked up according to an SGML DTD. This mode - includes commands to reduce the amount of typing you need, and - help reduce the possibility of errors. + Mind a két szövegszerkesztõ tartalmaz + az SGML DTD-hez igazodó speciális + szerkesztési módot. Ebben olyan parancsok + találhatóak, amelyekkel + csökkenthetõ a munka + elvégzéséhez szükséges + gépelés és ezáltal a + hibák keletkezésének + valószínûsége. - You do not need to use them; any text editor can be used to - edit marked up documents. You may find they make you more - efficient. + Egyáltalán nem kötelezõ ezeket + használni. A feladatra bármilyen szabadon + választott szövegszerkesztõ + tökéletesen megfelelõ, viszont a fentiek + némileg megkönnyíthetik a + munkavégzést. - - If anyone has recommendations for other software that is useful - when manipulating SGML documents, please let &a.doceng; know, so they - can be added to this list. + + Ha ismerünk az SGML dokumentumok feldolgozása + során alkalmazható további hasznos + szoftvereket, akkor jelezzük bátran a &a.doceng; + felé és felveszik erre a listára. From owner-p4-projects@FreeBSD.ORG Mon Oct 13 07:04:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06A08106569A; Mon, 13 Oct 2008 07:04:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDE941065691 for ; Mon, 13 Oct 2008 07:04:29 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC5C18FC1D for ; Mon, 13 Oct 2008 07:04:29 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9D74Tfk040303 for ; Mon, 13 Oct 2008 07:04:29 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9D74TN8040301 for perforce@freebsd.org; Mon, 13 Oct 2008 07:04:29 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 13 Oct 2008 07:04:29 GMT Message-Id: <200810130704.m9D74TN8040301@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 151301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 07:04:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=151301 Change 151301 by pgj@kolbasz on 2008/10/13 07:03:33 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/Makefile#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#6 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#16 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/Makefile#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#4 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#9 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/Makefile#3 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/updating/chapter.sgml#4 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/mailing-lists.ent#17 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#23 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#3 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.106 2008/10/12 08:22:53 simon Exp $ # # @@ -88,7 +88,7 @@ msk i386,amd64 mxge i386,amd64 my i386,pc98 -ncr i386,pc98,sparc64,amd64 +ncr i386,pc98,amd64 ncv i386,pc98 nfe i386,amd64 ng_bt3c i386,pc98,amd64 ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#23 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.200 2008/10/06 13:59:02 lstewart Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.202 2008/10/12 09:36:46 blackend Exp $ @@ -36,6 +36,21 @@ 10 + 12 + + + FreeBSD 6.4-RC1 Available + +

The first release candidate of FreeBSD 6.4 is now available. + ISO images for Tier-1 architectures are now available on + most of the + FreeBSD mirror sites.

+ + + + 6 ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -57,13 +57,13 @@ automatically download and install all of the packages listed in this chapter that you need. - One of the packages that you might need is the JadeTeX macro set. + One of the packages that you might need is the JadeTeX macro set. In turn, this macro set requires &tex; to be installed. &tex; is a large package, and you only need it if you want to produce Postscript or PDF output. To save yourself time and space you must specify whether or not you - want JadeTeX (and therefore &tex;) installed when you install this port. + want JadeTeX (and therefore &tex;) installed when you install this port. Either do: &prompt.root; make JADETEX=yes install ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -342,6 +342,7 @@ For a full list of available options, please see the &man.rc.conf.5; manual page. + The /etc/rc.d/jail script can be used to ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#7 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -397,51 +397,51 @@ SVN commit messages for the entire src tree (except for user and projects)"> -svn-src-all"> +svn-src-all"> SVN commit messages for the src tree for head/-current"> -svn-src-head"> +svn-src-head"> SVN commit messages for the src projects tree"> -svn-src-projects"> +svn-src-projects"> SVN commit messages for releases in the src tree"> -svn-src-release"> +svn-src-release"> SVN commit messages for the release engineering / security commits to the src tree"> -svn-src-releng"> +svn-src-releng"> SVN commit messages for all the -stable branches of the src tree"> -svn-src-stable"> +svn-src-stable"> SVN commit messages for only the 6-stable src tree"> -svn-src-stable-6"> +svn-src-stable-6"> SVN commit messages for only the 7-stable src tree"> -svn-src-stable-7"> +svn-src-stable-7"> SVN commit messages for the old stable src trees"> -svn-src-stable-other"> +svn-src-stable-other"> SVN commit messages for the admin / configuration tree"> -svn-src-svnadmin"> +svn-src-svnadmin"> SVN commit messages for the experimental user src tree"> -svn-src-user"> +svn-src-user"> SVN commit messages for the vendor work area tree"> -svn-src-vendor"> +svn-src-vendor"> FreeBSD test mailing list"> ==== //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@

General discussions about the release engineering process or quality assurance issues should be sent to the public freebsd-qa mailing list. - MFC + MFC requests should be sent to re@FreeBSD.org.

==== //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@

General discussions about the release engineering process or quality assurance issues should be sent to the public freebsd-qa mailing list. - MFC + MFC requests should be sent to re@FreeBSD.org.

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#4 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.53 2008/08/21 20:49:47 remko Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.54 2008/10/11 12:40:34 jkois Exp $ @@ -2501,20 +2501,21 @@ - - Strategite - http://www.strategite.fr + + Zelites + http://www.zelites.org - Strategite is a company based in Paris, France. We offer many + Zelites is a company based in Le Mans, France. We offer many services: Support, installation, maintenance, administration, configuration of servers like firewall, VPN, IDS, web server, mail server, DNS or whatever you need. Our services offerings include - a high-level of security using *BSD (like FreeBSD, OpenBSD, NetBSD), - Linux, MacOS and commercial Unix systems is wide and is your - guaranty. For more information, visit our - website, - mail us or phone us at - +33 (0) 140 337 130. + a high-level of security. Our knowledge of *BSD (like FreeBSD, + OpenBSD, NetBSD ..), Linux, MacOS and commercial Unix systems is + wide and is your guaranty. For more information, visit our + website, + mail us or phone us at + +33 (0) 2 43 46 94 24. ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#12 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.200 2008/10/06 13:59:02 lstewart Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.202 2008/10/12 09:36:46 blackend Exp $ @@ -36,6 +36,21 @@ 10 + 12 + + + FreeBSD 6.4-RC1 Available + +

The first release candidate of FreeBSD 6.4 is now available. + ISO images for Tier-1 architectures are now available on + most of the + FreeBSD mirror sites.

+ + + + 6 ==== //depot/projects/docproj_nl/www/share/sgml/release.ent#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -281,7 +284,7 @@ betekend dat het eigenlijk een replica is van elk bestand dat standaard aanwezig is binnen het &os; basissysteem. - + Dit commando zal de gekozen fysieke directory vullen met de benodigde binaire bestanden, bibliotheken, @@ -660,7 +663,7 @@ Elke jail heeft een /s directory, welke gekoppeld zal worden aan het beschrijfbare gedeelte van - het systeem. + het systeem. @@ -793,7 +796,7 @@ voor WRKDIRPREFIX maakt het mogelijk dat port builds gedaan worden op het beschrijfbare gedeelte van elke jail. - + @@ -805,7 +808,7 @@ /etc/rc.conf. Dit voorbeeld demonstreert het creeëren van drie jails: NS, MAIL en WWW. - + Zet het volgende in /etc/fstab @@ -1029,7 +1032,7 @@ &prompt.root; mount -a &prompt.root; /etc/rc.d/jail start - + Gebruik het &man.jls.8; programma om te zien of de jails correct zijn opgestart. Vergeet niet om in elke jail het @@ -1038,4 +1041,4 @@ - + From owner-p4-projects@FreeBSD.ORG Mon Oct 13 19:25:27 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A86FB106568B; Mon, 13 Oct 2008 19:25:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C30A106568A for ; Mon, 13 Oct 2008 19:25:27 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 417F48FC16 for ; Mon, 13 Oct 2008 19:25:27 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DJPR74060947 for ; Mon, 13 Oct 2008 19:25:27 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9DJPRBO060945 for perforce@freebsd.org; Mon, 13 Oct 2008 19:25:27 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 13 Oct 2008 19:25:27 GMT Message-Id: <200810131925.m9DJPRBO060945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 151335 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 19:25:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=151335 Change 151335 by rene@rene_self on 2008/10/13 19:25:13 MFen mailing-lists.ent 1.63 -> 1.64 (revision bump) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#7 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Siebrand Mazeland %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent - %SRCID% 1.63 + %SRCID% 1.64 --> From owner-p4-projects@FreeBSD.ORG Mon Oct 13 20:03:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7B8C106568C; Mon, 13 Oct 2008 20:03:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AD52106568A for ; Mon, 13 Oct 2008 20:03:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8776C8FC23 for ; Mon, 13 Oct 2008 20:03:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DK359t066019 for ; Mon, 13 Oct 2008 20:03:05 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9DK358F066017 for perforce@freebsd.org; Mon, 13 Oct 2008 20:03:05 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Oct 2008 20:03:05 GMT Message-Id: <200810132003.m9DK358F066017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 151336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 20:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=151336 Change 151336 by imp@imp_paco-paco on 2008/10/13 20:02:34 IFC @151335 Affected files ... .. //depot/projects/mips2/src/UPDATING#23 integrate .. //depot/projects/mips2/src/etc/etc.mips/ttys#4 integrate .. //depot/projects/mips2/src/libexec/rtld-elf/mips/reloc.c#5 integrate .. //depot/projects/mips2/src/release/Makefile#12 integrate .. //depot/projects/mips2/src/release/doc/share/misc/dev.archlist.txt#11 integrate .. //depot/projects/mips2/src/release/scripts/package-trees.sh#2 integrate .. //depot/projects/mips2/src/sbin/fsck_ffs/pass5.c#3 integrate .. //depot/projects/mips2/src/share/man/man4/u3g.4#2 integrate .. //depot/projects/mips2/src/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/mips2/src/sys/arm/arm/cpufunc.c#7 integrate .. //depot/projects/mips2/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/mips2/src/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/mips2/src/sys/arm/arm/genassym.c#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/identcpu.c#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/locore.S#6 integrate .. //depot/projects/mips2/src/sys/arm/arm/pmap.c#14 integrate .. //depot/projects/mips2/src/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/mips2/src/sys/arm/include/armreg.h#5 integrate .. //depot/projects/mips2/src/sys/arm/include/cpufunc.h#5 integrate .. //depot/projects/mips2/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/mips2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/mips2/src/sys/conf/ldscript.mips.cfe#4 integrate .. //depot/projects/mips2/src/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/ati_pcigart.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_agpsupport.c#6 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/mips2/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/mips2/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/mips2/src/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmc.c#5 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmcsd.c#6 integrate .. //depot/projects/mips2/src/sys/dev/mmc/mmcvar.h#5 integrate .. //depot/projects/mips2/src/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/mips2/src/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/mips2/src/sys/dev/usb/ubsa.c#12 integrate .. //depot/projects/mips2/src/sys/dev/usb/umct.c#4 integrate .. //depot/projects/mips2/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/mips2/src/sys/fs/hpfs/hpfs_vfsops.c#5 integrate .. //depot/projects/mips2/src/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/mips2/src/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/mips2/src/sys/fs/nwfs/nwfs_io.c#5 integrate .. //depot/projects/mips2/src/sys/fs/portalfs/portal_vnops.c#8 integrate .. //depot/projects/mips2/src/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/mips2/src/sys/fs/udf/udf_vfsops.c#7 integrate .. //depot/projects/mips2/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/mips2/src/sys/geom/geom_vfs.h#2 integrate .. //depot/projects/mips2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#9 integrate .. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate .. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#7 integrate .. //depot/projects/mips2/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_descrip.c#15 integrate .. //depot/projects/mips2/src/sys/kern/subr_bus.c#12 integrate .. //depot/projects/mips2/src/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/mips2/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/mips2/src/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/mips2/src/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#13 integrate .. //depot/projects/mips2/src/sys/mips/mips/machdep.c#43 integrate .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#35 integrate .. //depot/projects/mips2/src/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/mips2/src/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_serv.c#11 integrate .. //depot/projects/mips2/src/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/mips2/src/sys/sys/bufobj.h#6 integrate .. //depot/projects/mips2/src/sys/sys/vnode.h#13 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_snapshot.c#11 integrate .. //depot/projects/mips2/src/sys/ufs/ffs/ffs_vfsops.c#14 integrate .. //depot/projects/mips2/src/sys/vm/vm_object.c#12 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/agent.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/cachelib.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/cacheplcs.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/config.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/hashtable.h#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/mp_rs_query.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/mp_ws_query.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/nscd.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/nscdcli.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/nscd/query.c#3 integrate Differences ... ==== //depot/projects/mips2/src/UPDATING#23 (text+ko) ==== @@ -23,6 +23,16 @@ ln -s aj /etc/malloc.conf.) 20081009: + The uhci, ohci, ehci and slhci USB Host controller drivers have + been put into separate modules. If you load the usb module + separately through loader.conf you will need to load the + appropriate *hci module as well. E.g. for a UHCI-based USB 2.0 + controller add the following to loader.conf: + + uhci_load="YES" + ehci_load="YES" + +20081009: The ABI used by the PMC toolset has changed. Please keep userland (libpmc(3)) and the kernel module (hwpmc(4)) in sync. @@ -1136,4 +1146,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.544 2008/10/10 04:23:40 jkoshy Exp $ +$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ ==== //depot/projects/mips2/src/etc/etc.mips/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.3 2008/08/24 08:41:29 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.4 2008/10/12 06:58:03 imp Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -44,11 +44,10 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyu0 "/usr/libexec/getty std.9600" vt100 on secure -ttyd0 "/usr/libexec/getty std.9600" dialup off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.115200" dialup on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu3 "/usr/libexec/getty std.115200" dialup off secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure # Pseudo terminals ==== //depot/projects/mips2/src/libexec/rtld-elf/mips/reloc.c#5 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $ */ #include -__FBSDID("$FreeBSD: src/libexec/rtld-elf/arm/reloc.c,v 1.4 2005/12/18 19:43:32 kan Exp $"); +__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.2 2008/10/10 05:10:10 imp Exp $"); #include #include ==== //depot/projects/mips2/src/release/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.933 2008/07/07 16:23:04 marcel Exp $ +# $FreeBSD: src/release/Makefile,v 1.934 2008/10/12 02:52:56 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -192,6 +192,7 @@ .undef MAKE_FLOPPIES .if ${TARGET_ARCH} == "i386" MAKE_FLOPPIES= true +MAKE_DVD= SEPARATE_LIVEFS= SPLIT_MFSROOT= .if ${TARGET} == "pc98" @@ -222,6 +223,7 @@ SEPARATE_LIVEFS= .elif ${TARGET_ARCH} == "amd64" MAKE_FLOPPIES= true +MAKE_DVD= FLOPPYSIZE= 1440 FLOPPYSPLITSIZE= 1392 FLOPPYINODE= 40000 @@ -262,6 +264,9 @@ CD_BOOT= ${CD}/bootonly CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 +.if defined(MAKE_DVD) +CD_DVD= ${CD}/dvd +.endif .if !defined(NODOC) CD_DOCS= ${CD}/docs .endif @@ -480,6 +485,7 @@ KERNELS \ KERNELS_BASE \ KERNEL_FLAGS \ + MAKE_DVD \ MAKE_FLOPPIES \ MAKE_ISOS \ NOCDROM \ @@ -922,6 +928,18 @@ find . -depth -print | cpio -dumpl ${CD_LIVEFS} ) ; \ fi \ done +.if defined(MAKE_DVD) + @echo "Building DVD filesystem image as well as CDROM" + @mkdir -p ${CD_DVD}/${BUILDNAME} + @for i in ${DISTRIBUTIONS} ; \ + do \ + if [ -d ${RD}/trees/$${i} ] ; then \ + chflags -R noschg ${RD}/trees/$${i} || true ; \ + ( cd ${RD}/trees/$${i} && \ + find . -depth -print | cpio -dumpl ${CD_DVD} ) ; \ + fi \ + done +.endif @echo "Copy GENERIC kernel to boot area" @cp -Rp ${RD}/kernels/GENERIC/ ${CD_LIVEFS}/boot/kernel @rm -f ${CD_LIVEFS}/boot/kernel/*.symbols @@ -939,7 +957,24 @@ @rm -f ${CD_LIVEFS}/boot/device.hints @cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints .endif +.if defined(MAKE_DVD) + @cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD}/boot/kernel + @rm -f ${CD_DVD}/boot/kernel/*.symbols + @rm -f ${CD_DVD}/.profile + @cp ${.CURDIR}/fixit.profile ${CD_DVD}/.profile + @ln -sf /rescue ${CD_DVD}/stand @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf + @rm -f ${CD_DVD}/boot/loader.conf + @cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD}/boot/mfsroot.gz + @echo 'mfsroot_load="YES"' > ${CD_DVD}/boot/loader.conf + @echo 'mfsroot_type="mfs_root"' >> ${CD_DVD}/boot/loader.conf + @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD}/boot/loader.conf +.if exists(${RD}/trees/base/boot/device.hints) + @rm -f ${CD_DVD}/boot/device.hints + @cp ${RD}/trees/base/boot/device.hints ${CD_DVD}/boot/device.hints +.endif +.endif touch ${.TARGET} # Build disc1 and disc2 cdrom images @@ -974,11 +1009,37 @@ @mkdir -p ${CD_DISC2} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf @echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf +.if defined(MAKE_DVD) +.if defined(MAKE_FLOPPIES) + @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD} +.endif + @cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD}/${BUILDNAME} +.if !defined(NODOC) + @for i in ${DIST_DOCS_ARCH_INDEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \ + ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + cp ${RND}/${RELNOTES_LANG}/$$i/article.html \ + ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ + done + @for i in ${DIST_DOCS_ARCH_DEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \ + ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.html \ + ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ + done + @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD} +.endif + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf + @echo "CD_VOLUME = 1" >> ${CD_DVD}/cdrom.inf +.endif .if !defined(NODOC) echo "Building CDROM docs filesystem image" @mkdir -p ${CD_DOCS} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf @mkdir -p ${CD_DOCS}/usr/share/doc +.if defined(MAKE_DVD) + @mkdir -p ${CD_DVD}/usr/share/doc +.endif @for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \ if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \ -d /usr/doc/$$i ]; then \ @@ -986,6 +1047,10 @@ ${CD_DOCS}/usr/share/doc; \ fi \ done +.if defined(MAKE_DVD) + @cd ${CD_DOCS}/usr/share/doc && find . -print | \ + cpio -dumpl ${CD_DVD}/usr/share/doc +.endif .endif touch ${.TARGET} @@ -1016,6 +1081,9 @@ .if exists(${CD_PACKAGE_TREE}/disc2) CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2 .endif +.if exists(${CD_PACKAGE_TREE}/dvd) +CD_DVD_PKGS= ${CD_PACKAGE_TREE}/dvd +.endif .endif .endif @@ -1035,6 +1103,12 @@ FreeBSD_Packages \ ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ ${CD_DISC2_PKGS} +.if defined(MAKE_DVD) + @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ + FreeBSD_Install \ + ${CD}/${BUILDNAME}-${TARGET}-dvd.iso ${CD_DVD} \ + ${CD_DVD_PKGS} +.endif .if !defined(NODOC) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Documentation \ ==== //depot/projects/mips2/src/release/doc/share/misc/dev.archlist.txt#11 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.106 2008/10/12 08:22:53 simon Exp $ # # @@ -88,7 +88,7 @@ msk i386,amd64 mxge i386,amd64 my i386,pc98 -ncr i386,pc98,sparc64,amd64 +ncr i386,pc98,amd64 ncv i386,pc98 nfe i386,amd64 ng_bt3c i386,pc98,amd64 ==== //depot/projects/mips2/src/release/scripts/package-trees.sh#2 (text+ko) ==== @@ -5,9 +5,9 @@ # contains the master INDEX, it's assigned list of packages, and the # appropriate tree of category symlinks. # -# Usage: package-tress.sh +# Usage: package-trees.sh # -# $FreeBSD: src/release/scripts/package-trees.sh,v 1.2 2005/05/03 04:19:07 marcel Exp $ +# $FreeBSD: src/release/scripts/package-trees.sh,v 1.3 2008/10/13 17:42:21 kensmith Exp $ # Verify the command line if [ $# -ne 4 ]; then ==== //depot/projects/mips2/src/sbin/fsck_ffs/pass5.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.43 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.45 2008/10/13 14:01:05 kib Exp $"); #include #include @@ -48,7 +48,7 @@ #include "fsck.h" -static void check_maps(u_char *, u_char *, int, int, const char *, int *, int, int); +static void check_maps(u_char *, u_char *, int, ufs2_daddr_t, const char *, int *, int, int); void pass5(void) @@ -291,10 +291,17 @@ sump[run]++; } } - cstotal.cs_nffree += newcg->cg_cs.cs_nffree; - cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree; - cstotal.cs_nifree += newcg->cg_cs.cs_nifree; - cstotal.cs_ndir += newcg->cg_cs.cs_ndir; + if (bkgrdflag != 0) { + cstotal.cs_nffree += cg->cg_cs.cs_nffree; + cstotal.cs_nbfree += cg->cg_cs.cs_nbfree; + cstotal.cs_nifree += cg->cg_cs.cs_nifree; + cstotal.cs_ndir += cg->cg_cs.cs_ndir; + } else { + cstotal.cs_nffree += newcg->cg_cs.cs_nffree; + cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree; + cstotal.cs_nifree += newcg->cg_cs.cs_nifree; + cstotal.cs_ndir += newcg->cg_cs.cs_ndir; + } cs = &fs->fs_cs(fs, c); if (cursnapshot == 0 && memcmp(&newcg->cg_cs, cs, sizeof *cs) != 0 && @@ -321,13 +328,17 @@ } if (excessdirs > 0) check_maps(cg_inosused(newcg), cg_inosused(cg), - inomapsize, cg->cg_cgx * fs->fs_ipg, "DIR", + inomapsize, + cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg, + "DIR", freedirs, 0, excessdirs); check_maps(cg_inosused(newcg), cg_inosused(cg), - inomapsize, cg->cg_cgx * fs->fs_ipg, "FILE", + inomapsize, + cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg, "FILE", freefiles, excessdirs, fs->fs_ipg); check_maps(cg_blksfree(cg), cg_blksfree(newcg), - blkmapsize, cg->cg_cgx * fs->fs_fpg, "FRAG", + blkmapsize, + cg->cg_cgx * (ufs2_daddr_t) fs->fs_fpg, "FRAG", freeblks, 0, fs->fs_fpg); } if (cursnapshot == 0 && @@ -407,7 +418,7 @@ u_char *map1, /* map of claimed allocations */ u_char *map2, /* map of determined allocations */ int mapsize, /* size of above two maps */ - int startvalue, /* resource value for first element in map */ + ufs2_daddr_t startvalue, /* resource value for first element in map */ const char *name, /* name of resource found in maps */ int *opcode, /* sysctl opcode to free resource */ int skip, /* number of entries to skip before starting to free */ @@ -415,8 +426,8 @@ { # define BUFSIZE 16 char buf[BUFSIZE]; - long i, j, k, l, m, n, size; - int astart, aend, ustart, uend; + long i, j, k, l, m, size; + ufs2_daddr_t n, astart, aend, ustart, uend; void (*msg)(const char *fmt, ...); if (bkgrdflag) @@ -443,10 +454,12 @@ continue; } if (astart == aend) - (*msg)("ALLOCATED %s %d MARKED FREE\n", + (*msg)("ALLOCATED %s %" PRId64 + " MARKED FREE\n", name, astart); else - (*msg)("%s %sS %d-%d MARKED FREE\n", + (*msg)("%s %sS %" PRId64 "-%" PRId64 + " MARKED FREE\n", "ALLOCATED", name, astart, aend); astart = aend = n; } else { @@ -472,10 +485,12 @@ if (size > limit) size = limit; if (debug && size == 1) - pwarn("%s %s %d MARKED USED\n", + pwarn("%s %s %" PRId64 + " MARKED USED\n", "UNALLOCATED", name, ustart); else if (debug) - pwarn("%s %sS %d-%ld MARKED USED\n", + pwarn("%s %sS %" PRId64 "-%" PRId64 + " MARKED USED\n", "UNALLOCATED", name, ustart, ustart + size - 1); if (bkgrdflag != 0) { @@ -497,9 +512,11 @@ } if (astart != -1) { if (astart == aend) - (*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart); + (*msg)("ALLOCATED %s %" PRId64 + " MARKED FREE\n", name, astart); else - (*msg)("ALLOCATED %sS %d-%d MARKED FREE\n", + (*msg)("ALLOCATED %sS %" PRId64 "-%" PRId64 + " MARKED FREE\n", name, astart, aend); } if (ustart != -1) { @@ -514,10 +531,12 @@ size = limit; if (debug) { if (size == 1) - pwarn("UNALLOCATED %s %d MARKED USED\n", + pwarn("UNALLOCATED %s %" PRId64 + " MARKED USED\n", name, ustart); else - pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n", + pwarn("UNALLOCATED %sS %" PRId64 "-%" PRId64 + " MARKED USED\n", name, ustart, ustart + size - 1); } if (bkgrdflag != 0) { ==== //depot/projects/mips2/src/share/man/man4/u3g.4#2 (text+ko) ==== @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.1 2008/10/09 21:25:01 n_hibma Exp $ +.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.2 2008/10/10 06:26:37 n_hibma Exp $ .\" .Dd October 7, 2008 .Dt U3G 4 @@ -84,7 +84,7 @@ .Nm driver appeared in -.Fx 7.0 . +.Fx 8.0 . The .Xr ubsa 4 manual page was modified for ==== //depot/projects/mips2/src/sys/arm/arm/busdma_machdep.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.38 2008/03/12 15:31:37 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.39 2008/10/13 18:59:59 raj Exp $"); /* * ARM bus dma support routines @@ -629,6 +629,8 @@ newmap->allocbuffer = tmpaddr; cpu_idcache_wbinv_range((vm_offset_t)*vaddr, dmat->maxsize); + cpu_l2cache_wbinv_range((vm_offset_t)*vaddr, + dmat->maxsize); *vaddr = tmpaddr; } else newmap->origbuffer = newmap->allocbuffer = NULL; ==== //depot/projects/mips2/src/sys/arm/arm/cpufunc.c#7 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.22 2007/11/28 22:55:55 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.23 2008/10/13 18:16:54 raj Exp $"); #include #include @@ -357,6 +357,66 @@ arm10_setup /* cpu setup */ }; + +struct cpu_functions feroceon_cpufuncs = { + /* CPU functions */ + + cpufunc_id, /* id */ + cpufunc_nullop, /* cpwait */ + + /* MMU functions */ + + cpufunc_control, /* control */ + cpufunc_domains, /* Domain */ + feroceon_setttb, /* Setttb */ + cpufunc_faultstatus, /* Faultstatus */ + cpufunc_faultaddress, /* Faultaddress */ + + /* TLB functions */ + + armv4_tlb_flushID, /* tlb_flushID */ + arm10_tlb_flushID_SE, /* tlb_flushID_SE */ + armv4_tlb_flushI, /* tlb_flushI */ + arm10_tlb_flushI_SE, /* tlb_flushI_SE */ + armv4_tlb_flushD, /* tlb_flushD */ + armv4_tlb_flushD_SE, /* tlb_flushD_SE */ + + /* Cache operations */ + + armv5_ec_icache_sync_all, /* icache_sync_all */ + armv5_ec_icache_sync_range, /* icache_sync_range */ + + armv5_ec_dcache_wbinv_all, /* dcache_wbinv_all */ + feroceon_dcache_wbinv_range, /* dcache_wbinv_range */ + feroceon_dcache_inv_range, /* dcache_inv_range */ + feroceon_dcache_wb_range, /* dcache_wb_range */ + + armv5_ec_idcache_wbinv_all, /* idcache_wbinv_all */ + feroceon_idcache_wbinv_range, /* idcache_wbinv_all */ + + feroceon_l2cache_wbinv_all, /* l2cache_wbinv_all */ + feroceon_l2cache_wbinv_range, /* l2cache_wbinv_range */ + feroceon_l2cache_inv_range, /* l2cache_inv_range */ + feroceon_l2cache_wb_range, /* l2cache_wb_range */ + + /* Other functions */ + + cpufunc_nullop, /* flush_prefetchbuf */ + armv4_drain_writebuf, /* drain_writebuf */ + cpufunc_nullop, /* flush_brnchtgt_C */ + (void *)cpufunc_nullop, /* flush_brnchtgt_E */ + + (void *)cpufunc_nullop, /* sleep */ + + /* Soft functions */ + + cpufunc_null_fixup, /* dataabt_fixup */ + cpufunc_null_fixup, /* prefetchabt_fixup */ + + arm10_context_switch, /* context_switch */ + + arm10_setup /* cpu setup */ +}; #endif /* CPU_ARM9E || CPU_ARM10 */ #ifdef CPU_ARM10 @@ -933,9 +993,36 @@ } #endif /* CPU_ARM9 */ #if defined(CPU_ARM9E) || defined(CPU_ARM10) - if (cputype == CPU_ID_ARM926EJS || - cputype == CPU_ID_ARM1026EJS) { - cpufuncs = armv5_ec_cpufuncs; + if (cputype == CPU_ID_ARM926EJS || cputype == CPU_ID_ARM1026EJS || + cputype == CPU_ID_MV88FR131 || cputype == CPU_ID_MV88FR571_VD || + cputype == CPU_ID_MV88FR571_41) { + if (cputype == CPU_ID_MV88FR131 || + cputype == CPU_ID_MV88FR571_VD || + cputype == CPU_ID_MV88FR571_41) { + + cpufuncs = feroceon_cpufuncs; + /* + * Workaround for Marvell MV78100 CPU: Cache prefetch + * mechanism may affect the cache coherency validity, + * so it needs to be disabled. + * + * Refer to errata document MV-S501058-00C.pdf (p. 3.1 + * L2 Prefetching Mechanism) for details. + */ + if (cputype == CPU_ID_MV88FR571_VD || + cputype == CPU_ID_MV88FR571_41) { + feroceon_control_ext(0xffffffff, + FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | + FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN | + FC_L2_PREF_DIS); + } else { + feroceon_control_ext(0xffffffff, + FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN | + FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN); + } + } else + cpufuncs = armv5_ec_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */ get_cachetype_cp15(); pmap_pte_init_generic(); ==== //depot/projects/mips2/src/sys/arm/arm/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $"); #include #include @@ -215,6 +215,7 @@ { cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); cpu_tlb_flushID(); return (0); } ==== //depot/projects/mips2/src/sys/arm/arm/genassym.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.12 2008/10/13 18:59:59 raj Exp $"); #include #include #include @@ -79,7 +79,9 @@ ASSYM(CF_CONTROL, offsetof(struct cpu_functions, cf_control)); ASSYM(CF_CONTEXT_SWITCH, offsetof(struct cpu_functions, cf_context_switch)); ASSYM(CF_DCACHE_WB_RANGE, offsetof(struct cpu_functions, cf_dcache_wb_range)); +ASSYM(CF_L2CACHE_WB_RANGE, offsetof(struct cpu_functions, cf_l2cache_wb_range)); ASSYM(CF_IDCACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_idcache_wbinv_all)); +ASSYM(CF_L2CACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_l2cache_wbinv_all)); ASSYM(CF_TLB_FLUSHID_SE, offsetof(struct cpu_functions, cf_tlb_flushID_SE)); ASSYM(CF_ICACHE_SYNC, offsetof(struct cpu_functions, cf_icache_sync_all)); ==== //depot/projects/mips2/src/sys/arm/arm/identcpu.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.13 2008/05/23 04:03:53 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.14 2008/10/13 18:16:54 raj Exp $"); #include #include #include @@ -75,7 +75,8 @@ CPU_CLASS_ARM10EJ, CPU_CLASS_SA1, CPU_CLASS_XSCALE, - CPU_CLASS_ARM11J + CPU_CLASS_ARM11J, + CPU_CLASS_MARVELL }; static const char * const generic_steppings[16] = { @@ -304,6 +305,15 @@ { CPU_ID_ARM1136JSR1, CPU_CLASS_ARM11J, "ARM1136J-S R1", generic_steppings }, + { CPU_ID_MV88FR131, CPU_CLASS_MARVELL, "Feroceon 88FR131", + generic_steppings }, + + { CPU_ID_MV88FR571_VD, CPU_CLASS_MARVELL, "Feroceon 88FR571-VD", + generic_steppings }, + + { CPU_ID_MV88FR571_41, CPU_CLASS_MARVELL, "Early Feroceon 88FR571", + generic_steppings }, + { 0, CPU_CLASS_NONE, NULL, NULL } }; ==== //depot/projects/mips2/src/sys/arm/arm/locore.S#6 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.19 2008/04/08 10:24:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.20 2008/10/13 19:14:14 raj Exp $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE 2048 @@ -245,6 +245,8 @@ ldr r0, .Lcpufuncs mov lr, pc ldr pc, [r0, #CF_IDCACHE_WBINV_ALL] + mov lr, pc + ldr pc, [r0, #CF_L2CACHE_WBINV_ALL] /* * Load the cpu_reset_needs_v4_MMU_disable flag to determine if it's ==== //depot/projects/mips2/src/sys/arm/arm/pmap.c#14 (text+ko) ==== @@ -147,10 +147,11 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.104 2008/10/13 18:59:59 raj Exp $"); #include #include #include +#include #include #include #include @@ -1196,27 +1197,104 @@ } static PMAP_INLINE void +pmap_l2cache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len) +{ + vm_size_t rest; + pd_entry_t *pde; + pt_entry_t *ptep; + + rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len); + + while (len > 0) { + CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d " + "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); + if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) + cpu_l2cache_wb_range(va, rest); + + len -= rest; + va += rest; + + rest = MIN(PAGE_SIZE, len); + } +} + +static PMAP_INLINE void pmap_idcache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len) { - if (pmap_is_current(pm)) + if (pmap_is_current(pm)) { cpu_idcache_wbinv_range(va, len); + pmap_l2cache_wbinv_range(pm, va, len); + } } static PMAP_INLINE void -pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, - boolean_t do_inv, boolean_t rd_only) +pmap_l2cache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len) +{ + vm_size_t rest; + pd_entry_t *pde; + pt_entry_t *ptep; + + rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len); + + while (len > 0) { + CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d " + "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); + if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) + cpu_l2cache_wb_range(va, rest); + + len -= rest; + va += rest; + + rest = MIN(PAGE_SIZE, len); + } +} + +static PMAP_INLINE void +pmap_l2cache_inv_range(pmap_t pm, vm_offset_t va, vm_size_t len) { + vm_size_t rest; + pd_entry_t *pde; + pt_entry_t *ptep; + + rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len); + + while (len > 0) { + CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d " + "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest); + if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) + cpu_l2cache_inv_range(va, rest); + + len -= rest; + va += rest; + rest = MIN(PAGE_SIZE, len); + } +} + +static PMAP_INLINE void +pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv, + boolean_t rd_only) +{ + CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x " + "len 0x%x ", pm, pm == pmap_kernel(), va, len); + CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only); + if (pmap_is_current(pm)) { if (do_inv) { - if (rd_only) + if (rd_only) { cpu_dcache_inv_range(va, len); - else + pmap_l2cache_inv_range(pm, va, len); + } + else { cpu_dcache_wbinv_range(va, len); + pmap_l2cache_wbinv_range(pm, va, len); + } } else - if (!rd_only) + if (!rd_only) { cpu_dcache_wb_range(va, len); + pmap_l2cache_wb_range(pm, va, len); + } } } @@ -1224,16 +1302,20 @@ pmap_idcache_wbinv_all(pmap_t pm) { - if (pmap_is_current(pm)) + if (pmap_is_current(pm)) { cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); + } } static PMAP_INLINE void pmap_dcache_wbinv_all(pmap_t pm) { - if (pmap_is_current(pm)) + if (pmap_is_current(pm)) { cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); + } } /* @@ -2169,6 +2251,8 @@ PTE_SYNC(pdep); cpu_dcache_wbinv_range((vm_offset_t)pdep, sizeof(*pdep)); + cpu_l2cache_wbinv_range((vm_offset_t)pdep, + sizeof(*pdep)); rv = 1; } } else { @@ -2185,6 +2269,8 @@ PTE_SYNC(ptep); cpu_dcache_wbinv_range((vm_offset_t)ptep, sizeof(*ptep)); + cpu_l2cache_wbinv_range((vm_offset_t)ptep, + sizeof(*ptep)); rv = 1; } } @@ -2337,6 +2423,7 @@ } cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); cpu_tlb_flushID(); cpu_cpwait(); @@ -2373,6 +2460,7 @@ mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF); pmap_init_l1(l1, kernel_l1pt); cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); virtual_avail = round_page(virtual_avail); virtual_end = lastaddr; @@ -2402,6 +2490,7 @@ struct pcb *pcb; pmap_idcache_wbinv_all(pmap); + cpu_l2cache_wbinv_all(); pmap_tlb_flushID(pmap); cpu_cpwait(); if (vector_page < KERNBASE) { @@ -2589,6 +2678,7 @@ * rarely */ cpu_dcache_wbinv_all(); + cpu_l2cache_wbinv_all(); cpu_tlb_flushD(); cpu_cpwait(); kernel_vm_end = pmap_curmaxkvaddr; @@ -2614,6 +2704,7 @@ vm_page_lock_queues(); PMAP_LOCK(pmap); cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) { if (pv->pv_flags & PVF_WIRED) { /* The page is wired, cannot remove it now. */ @@ -2726,6 +2817,7 @@ (uint32_t) pte, opte, *pte)); if (l2pte_valid(opte)) { cpu_dcache_wbinv_range(va, PAGE_SIZE); + cpu_l2cache_wbinv_range(va, PAGE_SIZE); cpu_tlb_flushD_SE(va); cpu_cpwait(); } else { @@ -2784,6 +2876,7 @@ opte = *pte; if (l2pte_valid(opte)) { cpu_dcache_wbinv_range(va, PAGE_SIZE); + cpu_l2cache_wbinv_range(va, PAGE_SIZE); cpu_tlb_flushD_SE(va); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Oct 13 20:29:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 094F41065695; Mon, 13 Oct 2008 20:29:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A80451065693 for ; Mon, 13 Oct 2008 20:29:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 958978FC24 for ; Mon, 13 Oct 2008 20:29:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DKTWXN068251 for ; Mon, 13 Oct 2008 20:29:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9DKTW20068249 for perforce@freebsd.org; Mon, 13 Oct 2008 20:29:32 GMT (envelope-from imp@freebsd.org) Date: Mon, 13 Oct 2008 20:29:32 GMT Message-Id: <200810132029.m9DKTW20068249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 151338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 20:29:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=151338 Change 151338 by imp@imp_paco-paco on 2008/10/13 20:28:59 IFC @151337 Affected files ... .. //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#7 integrate .. //depot/projects/mips2/src/sys/arm/include/intr.h#7 integrate .. //depot/projects/mips2/src/sys/arm/include/resource.h#2 integrate .. //depot/projects/mips2/src/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/common.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/mips2/src/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/mips2/src/sys/arm/mv/files.mv#1 branch .. //depot/projects/mips2/src/sys/arm/mv/gpio.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/ic.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/mips2/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/mips2/src/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/mips2/src/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/mips2/src/sys/arm/mv/obio.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/mips2/src/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/mips2/src/sys/arm/mv/rtc.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/std.mv#1 branch .. //depot/projects/mips2/src/sys/arm/mv/timer.c#1 branch .. //depot/projects/mips2/src/sys/arm/mv/twsi.c#1 branch .. //depot/projects/mips2/src/sys/conf/Makefile.arm#9 integrate .. //depot/projects/mips2/src/sys/conf/options.arm#7 integrate .. //depot/projects/mips2/src/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/mips2/src/sys/dev/uart/uart_cpu_mv.c#1 branch Differences ... ==== //depot/projects/mips2/src/sys/arm/arm/elf_trampoline.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.21 2008/08/04 14:37:32 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $"); #include #include #include @@ -73,6 +73,8 @@ #endif #ifdef CPU_XSCALE_81342 #define cpu_l2cache_wbinv_all xscalec3_l2cache_purge +#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY) +#define cpu_l2cache_wbinv_all feroceon_l2cache_wbinv_all #else #define cpu_l2cache_wbinv_all() #endif ==== //depot/projects/mips2/src/sys/arm/include/intr.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.10 2008/09/11 12:36:13 raj Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.11 2008/10/13 20:07:13 raj Exp $ * */ @@ -44,7 +44,9 @@ #elif defined(CPU_XSCALE_PXA2X0) #include #define NIRQ IRQ_GPIO_MAX -#elif defined(CPU_ARM9) +#elif defined(SOC_MV_DISCOVERY) +#define NIRQ 96 +#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD) #define NIRQ 64 #else #define NIRQ 32 ==== //depot/projects/mips2/src/sys/arm/include/resource.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/resource.h,v 1.2 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/resource.h,v 1.3 2008/10/13 20:07:13 raj Exp $ */ #ifndef _MACHINE_RESOURCE_H_ @@ -41,5 +41,6 @@ #define SYS_RES_DRQ 2 /* isa dma lines */ #define SYS_RES_MEMORY 3 /* i/o memory */ #define SYS_RES_IOPORT 4 /* i/o ports */ +#define SYS_RES_GPIO 5 /* general purpose i/o */ #endif /* !_MACHINE_RESOURCE_H_ */ ==== //depot/projects/mips2/src/sys/conf/Makefile.arm#9 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.39 2008/08/04 14:38:38 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.40 2008/10/13 20:07:13 raj Exp $ # # Makefile for FreeBSD # @@ -75,7 +75,8 @@ $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \ $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \ $S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \ - $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S + $S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \ + $S/$M/$M/cpufunc_asm_feroceon.S KERNEL_EXTRA=trampoline KERNEL_EXTRA_INSTALL=kernel.gz.tramp trampoline: ${KERNEL_KO}.tramp ==== //depot/projects/mips2/src/sys/conf/options.arm#7 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.20 2008/06/06 05:08:09 benno Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.21 2008/10/13 20:07:13 raj Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -20,7 +20,11 @@ KERNVIRTADDR opt_global.h LOADERRAMADDR opt_global.h PHYSADDR opt_global.h +PHYSMEM_SIZE opt_global.h SKYEYE_WORKAROUNDS opt_global.h +SOC_MV_DISCOVERY opt_global.h +SOC_MV_KIRKWOOD opt_global.h +SOC_MV_ORION opt_global.h STARTUP_PAGETABLE_ADDR opt_global.h XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h XSACLE_DISABLE_CCNT opt_timer.h From owner-p4-projects@FreeBSD.ORG Mon Oct 13 20:31:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EC5C1065695; Mon, 13 Oct 2008 20:31:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D72F31065689 for ; Mon, 13 Oct 2008 20:31:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C593A8FC17 for ; Mon, 13 Oct 2008 20:31:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DKVYwH068431 for ; Mon, 13 Oct 2008 20:31:34 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9DKVYVQ068429 for perforce@freebsd.org; Mon, 13 Oct 2008 20:31:34 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 13 Oct 2008 20:31:34 GMT Message-Id: <200810132031.m9DKVYVQ068429@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 151339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 20:31:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=151339 Change 151339 by rene@rene_self on 2008/10/13 20:31:10 MFen share/sgml/books.ent 1.1 -> 1.2 (sort of :) ) Checked build. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/books.ent#2 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/books.ent#2 (text+ko) ==== @@ -2,13 +2,15 @@ The FreeBSD Dutch Documentation Project $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/books.ent,v 1.1 2004/12/29 17:42:51 remko Exp $ $FreeBSDnl: nl_NL.ISO8859-1/share/sgml/books.ent,v 1.3 2004/11/10 20:24:32 remko Exp $ - gebaseerd op: 1.1 + + %SOURCE% share/sgml/books.ent + %SRCID% 1.2 --> + +%nl-bookinfo; %man; - -%nl-bookinfo; %bookinfo; From owner-p4-projects@FreeBSD.ORG Mon Oct 13 22:50:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ADA1065678; Mon, 13 Oct 2008 22:50:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98062106564A for ; Mon, 13 Oct 2008 22:50:57 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D75E8FC08 for ; Mon, 13 Oct 2008 22:50:57 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9DMov23093975 for ; Mon, 13 Oct 2008 22:50:57 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9DMovBO093973 for perforce@freebsd.org; Mon, 13 Oct 2008 22:50:57 GMT (envelope-from bz@freebsd.org) Date: Mon, 13 Oct 2008 22:50:57 GMT Message-Id: <200810132250.m9DMovBO093973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 151351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2008 22:50:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=151351 Change 151351 by bz@bz_dumpster on 2008/10/13 22:50:39 IFC -Dt Affected files ... .. //depot/projects/s390/kerberos5/lib/libkafs5/Makefile#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Oct 14 21:14:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9737D106569C; Tue, 14 Oct 2008 21:14:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B6051065693 for ; Tue, 14 Oct 2008 21:14:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 489788FC17 for ; Tue, 14 Oct 2008 21:14:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9ELEjLG092116 for ; Tue, 14 Oct 2008 21:14:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9ELEjte092114 for perforce@freebsd.org; Tue, 14 Oct 2008 21:14:45 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 14 Oct 2008 21:14:45 GMT Message-Id: <200810142114.m9ELEjte092114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 151395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2008 21:14:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=151395 Change 151395 by rene@rene_self on 2008/10/14 21:14:33 Finished translation of Updating chapter (with 4 proposed fixes). Checked build, whitespace (needs spelling/language review). Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#5 (text+ko) ==== @@ -308,38 +308,39 @@ - Major and Minor Upgrades + Grote en kleine upgrades - This process will remove old object files and - libraries which will break most third party applications. - It is recommended that all installed ports either be removed - and re-installed or upgraded later using the - ports-mgmt/portupgrade - utility. Most users will want to run a test build using - the following command: + Dit proces ruimt oude objectbestanden en bibliotheken op + waardoor de meeste applicaties van derde partijen kapot gaan. + Het wordt aangeraden dat alle geïnstalleerde poorten ofwel + verwijderd en geherinstalleerd worden of later ge-upgraded + worden met het hulpmiddel ports-mgmt/portupgrade. De meeste + gebruikers zullen willen proefdraaien met het volgende + commando: &prompt.root; portupgrade -af - This will ensure everything will be re-installed - correctly. Note that setting the - BATCH environment variable to - yes will answer yes to - any prompts during this process, removing the need for - manual intervention during the build process. + Dit zorgt ervoor dat alles juist wordt geherinstalleerd. + Merk op dat het instellen van de omgevingsvariabele + BATCH op yes het antwoord + yes zal geven op alle prompts tijdens dit + proces, waardoor het niet nodig is om handmatig in het + bouwproces in te grijpen. - Major and minor version updates may be performed by - providing freebsd-update with a release - version target, for example, the following command will - update to &os; 6.3: + Updates van grote en kleine versies kunnen worden uitgevoerd + door een uitgaveversie als doel aan + freebsd-update op te geven, het volgende + commando zal bijvoorbeeld updaten naar &os; 6.3: &prompt.root; freebsd-update -r 6.3-RELEASE upgrade - After the command has been received, - freebsd-update will evaluate the - configuration file and current system in an attempt to gather - the information necessary to update the system. A screen - listing will display what components have been detected and - what components have not been detected. For example: + Nadat het commando is ontvangen, zal + freebsd-update het instellingenbestand en het + huidige systeem evalueren in een poging om de benodigde + informatie te verzamelen om het systeem te updaten. Een lijst + op het scherm zal aangeven welke componenten zijn gedetecteeerd + en welke niet. Bijvoorbeeld: Looking up update.FreeBSD.org mirrors... 1 mirrors found. Fetching metadata signature for 6.3-BETA1 from update1.FreeBSD.org... done. @@ -358,68 +359,72 @@ Does this look reasonable (y/n)? y - At this point, freebsd-update will - attempt to download all files required for the upgrade. In - some cases, the user may be prompted with questions regarding - what to install or how to proceed. + Nu zal freebsd-update proberen om alle + bestanden die nodig zijn voor de upgrade te downloaden. In + sommige gevallen kan de gebruiker worden gevraagd wat te + installeren of hoe verder te gaan. - After all patches have been downloaded to the local - system, they will then be applied. This process may take - a while depending on the speed and workload of the machine. - Configuration files will then be merged — this part - of the process requires some user intervention as a file may be - merged or an editor may appear on screen for a manual merge. - The results of every successful merge will be shown to the user - as the process continues. A failed or ignored merge will cause - the process to abort. Users may wish to make a backup of - /etc and manually merge - important files, such as master.passwd - or group at a later time. + Nadat alle patches zijn gedownload naar het plaatselijke + systeem zullen ze worden toegepast. Dit proces kan afhankelijk + van de snelheid en werklast van de machine even duren. Hierna + zullen instellingenbestanden worden samengevoegd — + voor dit gedeelte van het proces is enige tussenkomst van de + gebruiker nodig aangezien een bestand kan worden samengevoegd of + omdat er een tekstverwerker op het kan verschijnen om het + bestand handmatig samen te voegen. Het resultaat van elke + succesvolle samenvoeging zal aan de gebruiker worden getoond + naarmate het proces verdergaat. Een mislukte of genegeerde + samenvoegpoging zal het proces afbreken. Het is mogelijk voor + gebruikers om een reservekopie van /etc te maken en belangrijke + bestanden, zoals master.passwd of + group, later samen te voegen. - The system is not being altered yet, all patching and - merging is happening in another directory. When all - patches have been applied successfully, all configuration - files have been merged and it seems the process will go - smoothly, the changes will need to be committed by the - user. + Het systeem is nog niet veranderd, al het patchen en + samenvoegen gebeurt in een andere map. Wanneer alle patches + succesvol zijn toegepast, alle instellingenbestanden zijn + samengevoegd en het erop lijkt dat het proces soepel verloopt, + dienen de veranderingen verzegeld te worden door de + gebruiker. - Once this process is complete, the upgrade may be committed - to disk using the following command. + Als dit proces eenmaal voltooid is, kan de upgrade aan de + schijf toevertrowud worden met het volgende commando. &prompt.root; freebsd-update install - The kernel and kernel modules will be patched first. At - this point the machine must be rebooted. The following - command may be issued to restart the machine so the new - kernel will be loaded into memory: + De kernel en kernelmodules zullen als eerset gepatcht + worden. hier moet de machine opnieuw opgestart worden. Het + volgende commando kan gegeven worden om de machine te herstarten + en dus de nieuwe kernel in het geheugen te laden: &prompt.root; shutdown -r now - Once the system has come back online, - freebsd-update will need to be started - again. The state of the process has been saved and thus, - freebsd-update will not start from the - beginning, but will remove all old shared libraries and object - files. To continue to this stage, issue the following - command: + Als het systeem weer actief is, moet + freebsd-update nogmaals gestart worden. + De toestand van het proces is opgeslagen en dus zal + freebsd-update niet vooraan beginnen, maar + zal het alle oude gedeelde bibliotheken en objectbestanden + verwijderen. Geef het volgende commando om verder te gaan op + dit punt: &prompt.root; freebsd-update install - Depending on whether any libraries version numbers got - bumped, there may only be two install phases instead of - three. + Afhankelijk van het feit of er versienummers van + bibliotheken zijn opgehoogd, kunnen er slechts twee in plaats + van drie installatiefasen zijn. - All third party software will now need to be rebuilt and - re-installed. This is required as installed software may - depend on libraries which have been removed during the upgrade - process. The - ports-mgmt/portupgrade - command may be used to automate this process. The following - commands may be used to begin this process: + Alle software van derde partijen dient nu opnieuw gebouwd en + geïnstalleerd te worden. Dit is nodig omdat + geïnstalleerde software van bibliotheken afhankelijk kan + zijn die tijdens het upgradeproces zijn verwijderd. Het + commando ports-mgmt/portupgrade kan gebruikt + worden om dit proces te automatiseren. Dit proces kan met de + volgende commando's gestart worden: &prompt.root; portupgrade -f ruby &prompt.root; rm /var/db/pkg/pkgdb.db @@ -427,87 +432,95 @@ &prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db &prompt.root; portupgrade -af - This has completed, finish the upgrade process with a - final call to freebsd-update. Issue the - following command to tie up all loose ends in the upgrade - process: + + Voltooi, nadat dit voltooid is, het upgradeproces met een + laatste aanroep naar freebsd-update. Geef + het volgende commando om alle losse eindjes in het upgradeproces + samen te knopen: &prompt.root; freebsd-update install - Reboot the machine into the new &os; version. The process - is complete. + Start de machine opnieuw op in de nieuwe &os;-versie. Het + proces is voltooid. - System State Comparison + Het vergelijken van systeemtoestanden - The freebsd-update utility may be used - to test the state of the installed &os; version against a - known good copy. This option evaluates the current version - of system utilities, libraries, and configuration files. - To begin the comparison, issue the following command: + Het gereedschap freebsd-update kan + gebruikt worden om de toestand van de geïnstalleerde versie + van &os; met een bekende goede kopie te vergelijken. Deze optie + evalueert de huidige versie van systeemgereedschappen, + bibliotheken, en instellingenbestanden. Geef het volgende + commando om met de vergelijking te beginnen: - &prompt.root; freebsd-update IDS >> outfile.ids + &prompt.root; freebsd-update IDS >> uitvoerbestand.ids - While the command name is IDS it should - in no way be a replacement for an intrusion detection system - such as security/snort. - As freebsd-update stores data on disk, the - possibility of tampering is evident. While this possibility - may be reduced by using the - kern.securelevel setting and storing the - freebsd-update data on a read only file - system when not in use, a better solution would be to - compare the system against a secure disk. Such as a - DVD or securely stored external - USB disk device. + Hoewel de commandonaam IDS is, is het + in geen geval een vervanging voor een indringdetectiesysteem + zoals security/snort. + Aangezien freebsd-update gegevens op schijf + opslaat, is de mogelijkheid om te knoeien duidelijk. Hoewel + deze mogelijkheid verminderd kan worde door de instelling + kern.securelevel te gebruiken en de + gegevens van freebsd-update op een + bestandssysteem dat alleen gelezen kan worden op te slaan + wanneer het niet gebruikt wordt, zou een betere oplossing zijn + om het systeem met een veilige schijf te vergelijken. Zoals + een DVD of een veilig opgeslagen externe + USB-schijf. - The system will now be inspected, and a list of files - along with their &man.sha256.1; hash values, both known values - in the release and the current installed value. This is why - the output has been sent to the - outfile.ids file. It scrolls by too - quickly for eye comparisons, and soon it fills up the console - buffer. + Het systeem zal nu geïnspecteerd worden, samen met een + lijst met hun &man.sha256.1;-hashwaarden, zowel de bekende + waarde in de uitgave en de huidige geïnstalleerde waarde. + + Hierom wordt de uitvoer naar het bestand + uitvoerbestand.ids gezonden. Het scrollt + te snel voorbij om het met het oog te vergelijken, en het vult + al snel de gehele consolebuffer op. - These lines are also extremely long, but the output format - may be parsed quite easily. For instance, to obtain a list of - all files different from those in the release, issue the - following command: + Deze regels zijn ook extreem lang, maar het uitvoerformaat + kan vrij eenvoudig geparsed worden. Geef, om bijvoorbeeld een + lijst van alle bestanden te krijgen die verschillen van die in + de uitgave, het volgende commando: + &prompt.root; cat update.ids | awk '{ print $1 }' | more /etc/master.passwd /etc/motd /etc/passwd /etc/pf.conf - This output has been truncated, many more files exist. - Some of these files have natural modifications, the - /etc/passwd has been modified because - users have been added to the system. In some cases, there - may be other files, such as kernel modules, which differ - as freebsd-update may have updated them. - To exclude specific files or directories, add them to the - IDSIgnorePaths option in + Deze uitvoer is afgekapt, er bestaan veel meer bestanden. + Sommige van deze bestanden hebben natuurlijke veranderingen, het + /etc/passwd is gewijzigd omdat er + gebruikers aan het systeem zijn toegevoegd. In sommige gevallen + kunnen er andere bestanden zijn, zoals kernelmodules, die + verschillen aangezien freebsd-update ze + ge-updated kan hebben. Voeg, om bepaalde bestanden of mappen + uit te sluiten, deze toe aan de optie + IDSIgnorePaths in /etc/freebsd-update.conf. - This system may be used as part of an elaborate upgrade - method, aside from the previously discussed version. + Dit systeem kan gebruikt worden als deel van een uitgebreide + upgrademethode, afgezien van de eerder besproken versie. - Portsnap: A Ports Collection Update Tool + Portsnap: een updategereedschap voor de Portscollectie - The base system of &os; includes a utility for updating - the Ports Collection too: the &man.portsnap.8; utility. Upon - execution, it will connect to a remote site, verify the secure - key, and download a new copy of the ports collection. The key - is used to verify the integrity of all downloaded files, ensuring - they have not been modified in-flight. To download the latest - Ports Collection files, issue the following command: + Het basissysteem van &os; bevat ook een gereedschap om de + Portscollectie bij te werken: het hulpmiddel &man.portsnap.8;. + Wanneer het wordt uitgevoerd, zal het een verbinding maken met een + verre site, de veilige sleutel controleren, en een nieuwe kopie + van de portscollectie downloaden. De sleutel wordt gebruikt om de + integriteit van alle gedownloade bestanden te controleren, om er + zeker van te zijn dat ze niet tijdens het downloaden zijn + gewijzigd. Geef het volgende commando om de nieuwste versie van + de bestanden van de Portscollectie te downloaden: &prompt.root; portsnap fetch Looking up portsnap.FreeBSD.org mirrors... 3 mirrors found. @@ -521,17 +534,17 @@ Applying patches... done. Fetching 133 new ports or files... done. - What this example shows is that &man.portsnap.8; - has found and verified - several patches to the current ports data. This also indicates - that the utility was run previously, if it was a first time - run, the collection would have simply been downloaded. + Dit voorbeeld laat zien dat &man.portsnap.8; verscheidene + patches heeft gevonden en met de huidige portsgegevens heeft + gecontroleerd. Het geeft ook aan dat het gereedschap eerder is + gedraaid, als het voor de eerste keer was gedraaid, had het + simpelweg de collectie gedownload. - When &man.portsnap.8; successfully completes - a fetch operation, the Ports Collection and - subsequent patches exist on the local system that have passed - verification. The updated files may be installed by - typing: + Wanneer &man.portsnap.8; succesvol een + fetch-operatie afrondt, bestaan de + Portscollectie en vervolgpatches op het plaatselijke systeem die + de verificatie doorstaan hebben. De bijgwerkte bestanden kunnen + geïnstalleerd worden door het volgende te typen: &prompt.root; portsnap extract /usr/ports/.cvsignore @@ -547,7 +560,8 @@ /usr/ports/Mk/bsd.cmake.mk ... - The process is now complete, and applications may be - installed or upgraded using the updated Ports Collection. + Het proces is nu compleet, en applicaties kunnen met de + bijgewerkte Portscollectie worden geïnstalleerd of worden + bijgewerkt. From owner-p4-projects@FreeBSD.ORG Wed Oct 15 00:18:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A3A610656A3; Wed, 15 Oct 2008 00:18:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CB15106569E for ; Wed, 15 Oct 2008 00:18:53 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 087B98FC29 for ; Wed, 15 Oct 2008 00:18:53 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9F0IqVD011055 for ; Wed, 15 Oct 2008 00:18:52 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9F0IqSI011051 for perforce@freebsd.org; Wed, 15 Oct 2008 00:18:52 GMT (envelope-from nwhitehorn@freebsd.org) Date: Wed, 15 Oct 2008 00:18:52 GMT Message-Id: <200810150018.m9F0IqSI011051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 151400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Oct 2008 00:18:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=151400 Change 151400 by nwhitehorn@nwhitehorn_trantor on 2008/10/15 00:18:41 IFC after PCI OFW bus merge. Affected files ... .. //depot/projects/ppc-g5/UPDATING#4 integrate .. //depot/projects/ppc-g5/etc/Makefile#3 integrate .. //depot/projects/ppc-g5/etc/etc.mips/ttys#2 integrate .. //depot/projects/ppc-g5/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/ppc-g5/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/man/man/man.c#2 integrate .. //depot/projects/ppc-g5/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/libpmc.c#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.atom.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.core.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.core2.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.iaf.3#1 branch .. //depot/projects/ppc-g5/lib/libpmc/pmc.k7.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.k8.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p4.3#2 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p5.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.p6.3#3 integrate .. //depot/projects/ppc-g5/lib/libpmc/pmc.tsc.3#2 integrate .. //depot/projects/ppc-g5/lib/libstand/Makefile#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/mips/reloc.c#2 integrate .. //depot/projects/ppc-g5/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/ppc-g5/release/Makefile#2 integrate .. //depot/projects/ppc-g5/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/ppc-g5/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#2 integrate .. //depot/projects/ppc-g5/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/ppc-g5/release/doc/share/misc/man2hwnotes.pl#2 integrate .. //depot/projects/ppc-g5/release/scripts/package-trees.sh#2 integrate .. //depot/projects/ppc-g5/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/ppc-g5/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/ppc-g5/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/ppc-g5/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/ppc-g5/share/Makefile#3 integrate .. //depot/projects/ppc-g5/share/man/man4/Makefile#3 integrate .. //depot/projects/ppc-g5/share/man/man4/ae.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/ata.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/bce.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ddb.4#3 integrate .. //depot/projects/ppc-g5/share/man/man4/em.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/igb.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/jme.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/mmc.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/ng_netflow.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/u3g.4#1 branch .. //depot/projects/ppc-g5/share/man/man4/ubsa.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/umass.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/vlan.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/vr.4#2 integrate .. //depot/projects/ppc-g5/share/man/man4/wpi.4#3 integrate .. //depot/projects/ppc-g5/share/man/man5/Makefile#2 integrate .. //depot/projects/ppc-g5/share/man/man5/nullfs.5#1 branch .. //depot/projects/ppc-g5/share/misc/committers-src.dot#3 integrate .. //depot/projects/ppc-g5/share/mk/bsd.kmod.mk#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/Makefile#2 integrate .. //depot/projects/ppc-g5/share/zoneinfo/africa#3 integrate .. //depot/projects/ppc-g5/share/zoneinfo/asia#3 integrate .. //depot/projects/ppc-g5/share/zoneinfo/southamerica#4 integrate .. //depot/projects/ppc-g5/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/ppc-g5/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/ppc-g5/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/locore.S#2 integrate .. //depot/projects/ppc-g5/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/arm/swtch.S#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/ppc-g5/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/ppc-g5/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/ppc-g5/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/ppc-g5/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/ppc-g5/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/ppc-g5/sys/arm/include/armreg.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/ppc-g5/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/include/intr.h#3 integrate .. //depot/projects/ppc-g5/sys/arm/include/metadata.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/include/resource.h#2 integrate .. //depot/projects/ppc-g5/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/common.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/files.mv#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/gpio.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/ic.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/obio.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/rtc.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/std.mv#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/timer.c#1 branch .. //depot/projects/ppc-g5/sys/arm/mv/twsi.c#1 branch .. //depot/projects/ppc-g5/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/boot/arm/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/ppc-g5/sys/boot/arm/uboot/version#1 branch .. //depot/projects/ppc-g5/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/ppc-g5/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/ppc-g5/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/ppc-g5/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/ppc-g5/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/ppc-g5/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/ppc-g5/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/ppc-g5/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/ppc-g5/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/ppc-g5/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/api_public.h#2 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/ppc-g5/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/ppc-g5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/ppc-g5/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/ppc-g5/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/ppc-g5/sys/conf/Makefile.arm#2 integrate .. //depot/projects/ppc-g5/sys/conf/NOTES#4 integrate .. //depot/projects/ppc-g5/sys/conf/files#4 integrate .. //depot/projects/ppc-g5/sys/conf/files.powerpc#5 integrate .. //depot/projects/ppc-g5/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/ppc-g5/sys/conf/options.arm#2 integrate .. //depot/projects/ppc-g5/sys/contrib/pf/net/pf.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/ppc-g5/sys/dev/ata/ata-sata.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/ppc-g5/sys/dev/atkbdc/psm.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_drv.c#5 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/radeon_drv.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/ppc-g5/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/ppc-g5/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/ppc-g5/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sio/sio.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/ppc-g5/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/ppc-g5/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/ehci.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ehcivar.h#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/u3g.c#1 branch .. //depot/projects/ppc-g5/sys/dev/usb/uark.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/umass.c#3 integrate .. //depot/projects/ppc-g5/sys/dev/usb/umct.c#2 integrate .. //depot/projects/ppc-g5/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/ppc-g5/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/portalfs/portal_vnops.c#4 integrate .. //depot/projects/ppc-g5/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/ppc-g5/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/ppc-g5/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/ppc-g5/sys/geom/geom_vfs.h#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/ppc-g5/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/ppc-g5/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/ppc-g5/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/ppc-g5/sys/i386/linux/linux.h#2 integrate .. //depot/projects/ppc-g5/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/kern_thr.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_bus.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/subr_firmware.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/sys_socket.c#2 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/ppc-g5/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/ppc-g5/sys/libkern/qdivrem.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/ppc-g5/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/ppc-g5/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/ppc-g5/sys/modules/Makefile#4 integrate .. //depot/projects/ppc-g5/sys/modules/ata/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ata/ata/Makefile#2 delete .. //depot/projects/ppc-g5/sys/modules/ata/atacore/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atadevel/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atadevel/ata-devel.c#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/ata/atapci/Makefile.inc#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ehci/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/ohci/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/modules/u3g/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/uhci/Makefile#1 branch .. //depot/projects/ppc-g5/sys/modules/usb/Makefile#3 integrate .. //depot/projects/ppc-g5/sys/modules/wpifw/Makefile#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/ppc-g5/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/ppc-g5/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/ppc-g5/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/ppc-g5/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/ppc-g5/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/ppc-g5/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/ppc-g5/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/nexus.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/include/nexusvar.h#2 delete .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_pcib_pci.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/ofw/ofw_syscons.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/cpcht.c#4 edit .. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorth.c#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/powermac/uninorthvar.h#4 integrate .. //depot/projects/ppc-g5/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/ppc-g5/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/ppc-g5/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/ppc-g5/sys/sys/bufobj.h#2 integrate .. //depot/projects/ppc-g5/sys/sys/pmc.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/un.h#3 integrate .. //depot/projects/ppc-g5/sys/sys/vnode.h#4 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_inode.c#3 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/ppc-g5/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/ppc-g5/sys/vm/vm_object.c#2 integrate .. //depot/projects/ppc-g5/tools/regression/netinet/udpzerobyte/Makefile#1 branch .. //depot/projects/ppc-g5/tools/regression/netinet/udpzerobyte/udpzerobyte.c#1 branch .. //depot/projects/ppc-g5/tools/regression/sockets/fstat/Makefile#1 branch .. //depot/projects/ppc-g5/tools/regression/sockets/fstat/fstat.c#1 branch .. //depot/projects/ppc-g5/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/ppc-g5/usr.bin/tftp/extern.h#2 integrate .. //depot/projects/ppc-g5/usr.bin/tftp/main.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/tftp/tftp.c#2 integrate .. //depot/projects/ppc-g5/usr.bin/tftp/tftpsubs.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/Makefile#3 integrate .. //depot/projects/ppc-g5/usr.sbin/gstat/gstat.8#2 integrate .. //depot/projects/ppc-g5/usr.sbin/gstat/gstat.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/agent.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/cachelib.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/cacheplcs.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/config.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/hashtable.h#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/mp_rs_query.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/mp_ws_query.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/nscd.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/nscdcli.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/nscd/query.c#2 integrate .. //depot/projects/ppc-g5/usr.sbin/pmcstat/pmcstat.8#3 integrate .. //depot/projects/ppc-g5/usr.sbin/pmcstat/pmcstat.c#3 integrate .. //depot/projects/ppc-g5/usr.sbin/sysinstall/devices.c#2 integrate Differences ... ==== //depot/projects/ppc-g5/UPDATING#4 (text+ko) ==== @@ -22,6 +22,21 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081009: + The uhci, ohci, ehci and slhci USB Host controller drivers have + been put into separate modules. If you load the usb module + separately through loader.conf you will need to load the + appropriate *hci module as well. E.g. for a UHCI-based USB 2.0 + controller add the following to loader.conf: + + uhci_load="YES" + ehci_load="YES" + +20081009: + The ABI used by the PMC toolset has changed. Please keep + userland (libpmc(3)) and the kernel module (hwpmc(4)) in + sync. + 20080820: The TTY subsystem of the kernel has been replaced by a new implementation, which provides better scalability and an @@ -59,6 +74,11 @@ option to "ssh-dss,ssh-rsa" in ~/.ssh/config or on the ssh command line. + Please note that the sequence of keys offered for + authentication has been changed as well. You may want to + specify IdentityFile in a different order to revert this + behavior. + 20080713: The sio(4) driver has been removed from the i386 and amd64 kernel configuration files. This means uart(4) is now the @@ -1018,7 +1038,7 @@ - + @@ -1126,4 +1146,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.542 2008/09/14 19:25:57 ed Exp $ +$FreeBSD: src/UPDATING,v 1.545 2008/10/10 06:37:51 n_hibma Exp $ ==== //depot/projects/ppc-g5/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.370 2008/09/22 15:37:47 sam Exp $ +# $FreeBSD: src/etc/Makefile,v 1.371 2008/10/08 13:28:02 des Exp $ .include @@ -251,6 +251,7 @@ .endif cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* . + cd ${DESTDIR}/usr/share/man/en.UTF-8; ln -sf ../man* . cd ${DESTDIR}/usr/share/man; \ set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \ while [ $$# -gt 0 ] ; \ ==== //depot/projects/ppc-g5/etc/etc.mips/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.3 2008/08/24 08:41:29 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.4 2008/10/12 06:58:03 imp Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -33,10 +33,10 @@ console none unknown off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyU0 "/usr/libexec/getty std.9600" dialup off secure -ttyU1 "/usr/libexec/getty std.9600" dialup off secure -ttyU2 "/usr/libexec/getty std.9600" dialup off secure -ttyU3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.115200" dialup on secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu3 "/usr/libexec/getty std.115200" dialup off secure # Pseudo terminals ttyp0 none network ttyp1 none network ==== //depot/projects/ppc-g5/etc/mtree/BSD.usr.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.335 2008/07/28 17:42:37 antoine Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.336 2008/10/08 13:28:02 des Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -740,6 +740,46 @@ cat9 .. .. + en.UTF-8 uname=root + cat1 + .. + cat1aout + .. + cat2 + .. + cat3 + .. + cat4 + amd64 + .. + arm + .. + i386 + .. + powerpc + .. + sparc64 + .. + .. + cat5 + .. + cat6 + .. + cat7 + .. + cat8 + amd64 + .. + i386 + .. + powerpc + .. + sparc64 + .. + .. + cat9 + .. + .. ja uname=root cat1 .. ==== //depot/projects/ppc-g5/games/fortune/datfiles/fortunes#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.270 2008/08/02 20:11:56 phk Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.272 2008/10/08 19:39:22 phk Exp $ % ======================================================================= || || @@ -23951,6 +23951,9 @@ that kidnaped Europa. -- Marcus Tullius Cicero % +I like paying taxes. With them I buy civilization. + -- Oliver Wendell Holmes +% I like to believe that people in the long run are going to do more to promote peace than our governments. Indeed, I think that people want peace so much that one of these days governments had better get out of @@ -26583,6 +26586,9 @@ % If you can lead it to water and force it to drink, it isn't a horse. % +If you can not say it, you can not whistle it, either. + -- Wittgenstein +% If you can read this, you're too close. % If you can survive death, you can probably survive anything. ==== //depot/projects/ppc-g5/gnu/usr.bin/man/man/man.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.68 2008/05/14 17:18:12 ru Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.69 2008/10/08 13:16:20 des Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -105,6 +105,7 @@ {"KOI8-R", "koi8-r"}, {"ISO8859-1", "latin1"}, {"ISO8859-15", "latin1"}, + {"UTF-8", "utf8"}, {NULL} }; #endif ==== //depot/projects/ppc-g5/lib/libc/arm/gen/_setjmp.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.4 2008/10/14 09:53:47 raj Exp $"); /* * C library -- _setjmp, _longjmp @@ -101,6 +101,10 @@ /* validation failed, die die die. */ botch: +#if !defined(_STANDALONE) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +#else + b . +#endif ==== //depot/projects/ppc-g5/lib/libpmc/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpmc/Makefile,v 1.11 2008/09/16 16:57:14 jkoshy Exp $ +# $FreeBSD: src/lib/libpmc/Makefile,v 1.12 2008/10/04 12:27:49 jkoshy Exp $ LIB= pmc @@ -24,6 +24,10 @@ MAN+= pmclog.3 # PMC-dependent manual pages +MAN+= pmc.atom.3 +MAN+= pmc.core.3 +MAN+= pmc.core2.3 +MAN+= pmc.iaf.3 MAN+= pmc.k7.3 MAN+= pmc.k8.3 MAN+= pmc.p4.3 ==== //depot/projects/ppc-g5/lib/libpmc/libpmc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.16 2008/09/17 04:13:14 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/lib/libpmc/libpmc.c,v 1.17 2008/10/09 14:55:45 jkoshy Exp $"); #include #include @@ -59,6 +59,10 @@ static int p6_allocate_pmc(enum pmc_event _pe, char *_ctrspec, struct pmc_op_pmcallocate *_pmc_config); #endif +#if defined(__amd64__) || defined(__i386__) +static int tsc_allocate_pmc(enum pmc_event _pe, char *_ctrspec, + struct pmc_op_pmcallocate *_pmc_config); +#endif #define PMC_CALL(cmd, params) \ syscall(pmc_syscall, PMC_OP_##cmd, (params)) @@ -77,23 +81,96 @@ static const struct pmc_event_alias *pmc_mdep_event_aliases; /* - * The pmc_event_descr table maps symbolic names known to the user + * The pmc_event_descr structure maps symbolic names known to the user * to integer codes used by the PMC KLD. */ struct pmc_event_descr { const char *pm_ev_name; enum pmc_event pm_ev_code; - enum pmc_class pm_ev_class; +}; + +/* + * The pmc_class_descr structure maps class name prefixes for + * event names to event tables and other PMC class data. + */ +struct pmc_class_descr { + const char *pm_evc_name; + size_t pm_evc_name_size; + enum pmc_class pm_evc_class; + const struct pmc_event_descr *pm_evc_event_table; + size_t pm_evc_event_table_size; + int (*pm_evc_allocate_pmc)(enum pmc_event _pe, + char *_ctrspec, struct pmc_op_pmcallocate *_pa); +}; + +#define PMC_TABLE_SIZE(N) (sizeof(N)/sizeof(N[0])) +#define PMC_EVENT_TABLE_SIZE(N) PMC_TABLE_SIZE(N##_event_table) + +#undef __PMC_EV +#define __PMC_EV(C,N) { #N, PMC_EV_ ## C ## _ ## N }, + +/* + * PMC_MDEP_TABLE(NAME, CLASS, ADDITIONAL_CLASSES...) + * + * Build an event descriptor table and a list of valid PMC classes. + */ +#define PMC_MDEP_TABLE(N,C,...) \ + static const struct pmc_event_descr N##_event_table[] = \ + { \ + __PMC_EV_##C() \ + }; \ + static const enum pmc_class N##_pmc_classes[] = { \ + PMC_CLASS_##C, __VA_ARGS__ \ + } + +PMC_MDEP_TABLE(k7, K7, PMC_CLASS_TSC); +PMC_MDEP_TABLE(k8, K8, PMC_CLASS_TSC); +PMC_MDEP_TABLE(p4, P4, PMC_CLASS_TSC); +PMC_MDEP_TABLE(p5, P5, PMC_CLASS_TSC); +PMC_MDEP_TABLE(p6, P6, PMC_CLASS_TSC); + +static const struct pmc_event_descr tsc_event_table[] = +{ + __PMC_EV_TSC() }; -static const struct pmc_event_descr -pmc_event_table[] = +#undef PMC_CLASS_TABLE_DESC +#define PMC_CLASS_TABLE_DESC(N, C) { \ + .pm_evc_name = #N "-", \ + .pm_evc_name_size = sizeof(#N "-") - 1, \ + .pm_evc_class = PMC_CLASS_##C , \ + .pm_evc_event_table = N##_event_table , \ + .pm_evc_event_table_size = \ + PMC_EVENT_TABLE_SIZE(N), \ + .pm_evc_allocate_pmc = N##_allocate_pmc \ + } + +static const struct pmc_class_descr pmc_class_table[] = { -#undef __PMC_EV -#define __PMC_EV(C,N,EV) { #EV, PMC_EV_ ## C ## _ ## N, PMC_CLASS_ ## C }, - __PMC_EVENTS() +#if defined(__i386__) + PMC_CLASS_TABLE_DESC(k7, K7), +#endif +#if defined(__i386__) || defined(__amd64__) + PMC_CLASS_TABLE_DESC(k8, K8), + PMC_CLASS_TABLE_DESC(p4, P4), +#endif +#if defined(__i386__) + PMC_CLASS_TABLE_DESC(p5, P5), + PMC_CLASS_TABLE_DESC(p6, P6), +#endif +#if defined(__i386__) || defined(__amd64__) + PMC_CLASS_TABLE_DESC(tsc, TSC) +#endif }; +static size_t pmc_event_class_table_size = + PMC_TABLE_SIZE(pmc_class_table); + +#undef PMC_CLASS_TABLE_DESC + +static const enum pmc_class *pmc_mdep_class_list; +static size_t pmc_mdep_class_list_size; + /* * Mapping tables, mapping enumeration values to human readable * strings. @@ -111,9 +188,14 @@ __PMC_CLASSES() }; -static const char * pmc_cputype_names[] = { +struct pmc_cputype_map { + enum pmc_class pm_cputype; + const char *pm_name; +}; + +static const struct pmc_cputype_map pmc_cputype_names[] = { #undef __PMC_CPU -#define __PMC_CPU(S, D) #S , +#define __PMC_CPU(S, V, D) { .pm_cputype = PMC_CPU_##S, .pm_name = #S } , __PMC_CPUS() }; @@ -139,11 +221,6 @@ static struct pmc_cpuinfo cpu_info; /* filled in by pmc_init() */ - -/* Architecture dependent event parsing */ -static int (*pmc_mdep_allocate_pmc)(enum pmc_event _pe, char *_ctrspec, - struct pmc_op_pmcallocate *_pmc_config); - /* Event masks for events */ struct pmc_masks { const char *pm_name; @@ -167,7 +244,8 @@ return (-1); c = 0; /* count of mask keywords seen */ while ((r = strsep(&q, "+")) != NULL) { - for (pm = pmask; pm->pm_name && strcmp(r, pm->pm_name); pm++) + for (pm = pmask; pm->pm_name && strcasecmp(r, pm->pm_name); + pm++) ; if (pm->pm_name == NULL) /* not found */ return (-1); @@ -215,14 +293,7 @@ uint32_t count, unitmask; pmc_config->pm_md.pm_amd.pm_amd_config = 0; - pmc_config->pm_caps |= PMC_CAP_READ; - - if (pe == PMC_EV_TSC_TSC) { - /* TSC events must be unqualified. */ - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); if (pe == PMC_EV_K7_DC_REFILLS_FROM_L2 || pe == PMC_EV_K7_DC_REFILLS_FROM_SYSTEM || @@ -232,8 +303,6 @@ } else unitmask = has_unitmask = 0; - pmc_config->pm_caps |= PMC_CAP_WRITE; - while ((p = strsep(&ctrspec, ",")) != NULL) { if (KWPREFIXMATCH(p, K7_KW_COUNT "=")) { q = strchr(p, '='); @@ -514,16 +583,9 @@ uint32_t count, evmask; const struct pmc_masks *pm, *pmask; - pmc_config->pm_caps |= PMC_CAP_READ; + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); pmc_config->pm_md.pm_amd.pm_amd_config = 0; - if (pe == PMC_EV_TSC_TSC) { - /* TSC events must be unqualified. */ - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } - pmask = NULL; evmask = 0; @@ -597,8 +659,6 @@ break; /* no options defined */ } - pmc_config->pm_caps |= PMC_CAP_WRITE; - while ((p = strsep(&ctrspec, ",")) != NULL) { if (KWPREFIXMATCH(p, K8_KW_COUNT "=")) { q = strchr(p, '='); @@ -1005,22 +1065,14 @@ uint32_t evmask, cccractivemask; const struct pmc_masks *pm, *pmask; - pmc_config->pm_caps |= PMC_CAP_READ; + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); pmc_config->pm_md.pm_p4.pm_p4_cccrconfig = pmc_config->pm_md.pm_p4.pm_p4_escrconfig = 0; - if (pe == PMC_EV_TSC_TSC) { - /* TSC must not be further qualified */ - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } - pmask = NULL; evmask = 0; cccractivemask = 0x3; has_tag = has_busreqtype = 0; - pmc_config->pm_caps |= PMC_CAP_WRITE; #define __P4SETMASK(M) do { \ pmask = p4_mask_##M; \ @@ -1166,13 +1218,13 @@ if (*++q == '\0') /* skip '=' */ return (-1); - if (strcmp(q, P4_KW_ACTIVE_NONE) == 0) + if (strcasecmp(q, P4_KW_ACTIVE_NONE) == 0) cccractivemask = 0x0; - else if (strcmp(q, P4_KW_ACTIVE_SINGLE) == 0) + else if (strcasecmp(q, P4_KW_ACTIVE_SINGLE) == 0) cccractivemask = 0x1; - else if (strcmp(q, P4_KW_ACTIVE_BOTH) == 0) + else if (strcasecmp(q, P4_KW_ACTIVE_BOTH) == 0) cccractivemask = 0x2; - else if (strcmp(q, P4_KW_ACTIVE_ANY) == 0) + else if (strcasecmp(q, P4_KW_ACTIVE_ANY) == 0) cccractivemask = 0x3; else return (-1); @@ -1442,16 +1494,9 @@ int count, n; const struct pmc_masks *pm, *pmask; - pmc_config->pm_caps |= PMC_CAP_READ; + pmc_config->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); pmc_config->pm_md.pm_ppro.pm_ppro_config = 0; - if (pe == PMC_EV_TSC_TSC) { - if (ctrspec && *ctrspec != '\0') - return (-1); - return (0); - } - - pmc_config->pm_caps |= PMC_CAP_WRITE; evmask = 0; #define P6MASKSET(M) pmask = p6_mask_ ## M @@ -1638,6 +1683,93 @@ #endif +#if defined(__i386__) || defined(__amd64__) +static int +tsc_allocate_pmc(enum pmc_event pe, char *ctrspec, + struct pmc_op_pmcallocate *pmc_config) +{ + if (pe != PMC_EV_TSC_TSC) + return (-1); + + /* TSC events must be unqualified. */ + if (ctrspec && *ctrspec != '\0') + return (-1); + + pmc_config->pm_md.pm_amd.pm_amd_config = 0; + pmc_config->pm_caps |= PMC_CAP_READ; + + return (0); +} +#endif + +/* + * Match an event name `name' with its canonical form. + * + * Matches are case insensitive and spaces, underscores and hyphen + * characters are considered to match each other. + * + * Returns 1 for a match, 0 otherwise. + */ + +static int +pmc_match_event_name(const char *name, const char *canonicalname) +{ + int cc, nc; + const unsigned char *c, *n; + + c = (const unsigned char *) canonicalname; + n = (const unsigned char *) name; + + for (; (nc = *n) && (cc = *c); n++, c++) { + + if (toupper(nc) == cc) + continue; + + if ((nc == ' ' || nc == '_' || nc == '-') && + (cc == ' ' || cc == '_' || cc == '-')) + continue; + + return (0); + } + + if (*n == '\0' && *c == '\0') + return (1); + + return (0); +} + +/* + * Match an event name against all the event named supported by a + * PMC class. + * + * Returns an event descriptor pointer on match or NULL otherwise. + */ +static const struct pmc_event_descr * +pmc_match_event_class(const char *name, + const struct pmc_class_descr *pcd) +{ + size_t n; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Oct 15 00:21:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C76AA1065689; Wed, 15 Oct 2008 00:21:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8AE8C1065688 for ; Wed, 15 Oct 2008 00:21:56 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 78D2A8FC24 for ; Wed, 15 Oct 2008 00:21:56 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9F0LuxX011339 for ; Wed, 15 Oct 2008 00:21:56 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9F0LunD011337 for perforce@freebsd.org; Wed, 15 Oct 2008 00:21:56 GMT (envelope-from nwhitehorn@freebsd.org) Date: Wed, 15 Oct 2008 00:21:56 GMT Message-Id: <200810150021.m9F0LunD011337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 151401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Oct 2008 00:21:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=151401 Change 151401 by nwhitehorn@nwhitehorn_trantor on 2008/10/15 00:20:55 Move K2 SATA patch to correspond to ATA modularization. Affected files ... .. //depot/projects/ppc-g5/sys/dev/ata/ata-chipset.c#6 delete .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-serverworks.c,v 1.1 2008/10/09 12:56:57 sos Exp $"); +__FBSDID("$FreeBSD: head/sys/dev/ata/chipsets/ata-serverworks.c 183724 2008-10-09 12:56:57Z sos $"); #include "opt_ata.h" #include @@ -57,6 +57,7 @@ static void ata_serverworks_tf_read(struct ata_request *request); static void ata_serverworks_tf_write(struct ata_request *request); static void ata_serverworks_setmode(device_t dev, int mode); +static int ata_serverworks_k2status(device_t dev); /* misc defines */ #define SWKS_33 0 @@ -98,6 +99,16 @@ } static int +ata_serverworks_k2status(device_t dev) +{ + struct ata_channel *ch = device_get_softc(dev); + + ATA_IDX_INL(ch,ATA_STATUS); + + return ata_pci_status(dev); +} + +static int ata_serverworks_chipinit(device_t dev) { struct ata_pci_controller *ctlr = device_get_softc(dev); @@ -186,6 +197,10 @@ /* chip does not reliably do 64K DMA transfers */ ch->dma.max_iosize = 126 * DEV_BSIZE; + /* For K2, we need to do a 4-byte read on the status reg */ + if (ctlr->chip->chipid == ATA_K2) + ch->hw.status = ata_serverworks_k2status; + return 0; } From owner-p4-projects@FreeBSD.ORG Wed Oct 15 01:28:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D93D4106568B; Wed, 15 Oct 2008 01:28:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BADC1065693 for ; Wed, 15 Oct 2008 01:28:03 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89F738FC14 for ; Wed, 15 Oct 2008 01:28:03 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9F1S31Q027078 for ; Wed, 15 Oct 2008 01:28:03 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9F1S3KM027076 for perforce@freebsd.org; Wed, 15 Oct 2008 01:28:03 GMT (envelope-from nwhitehorn@freebsd.org) Date: Wed, 15 Oct 2008 01:28:03 GMT Message-Id: <200810150128.m9F1S3KM027076@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 151403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Oct 2008 01:28:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=151403 Change 151403 by nwhitehorn@nwhitehorn_trantor on 2008/10/15 01:28:02 Make powermac_nvram work on G5 systems by allowing for the #address-cells != 1 case. Affected files ... .. //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/powermac_nvram/powermac_nvram.c#5 (text+ko) ==== @@ -131,19 +131,25 @@ { struct powermac_nvram_softc *sc; phandle_t node; - u_int32_t reg[2]; - int gen0, gen1; + u_int32_t reg[3]; + int gen0, gen1, i; node = ofw_bus_get_node(dev); sc = device_get_softc(dev); - if (OF_getprop(node, "reg", reg, sizeof(reg)) < 8) + if ((i = OF_getprop(node, "reg", reg, sizeof(reg))) < 8) return ENXIO; sc->sc_dev = dev; sc->sc_node = node; - sc->sc_bank0 = (vm_offset_t)pmap_mapdev(reg[0], NVRAM_SIZE * 2); + /* + * Find which byte of reg corresponds to the 32-bit physical address. + * We should probably read #address-cells from /chosen instead. + */ + i = (i/4) - 2; + + sc->sc_bank0 = (vm_offset_t)pmap_mapdev(reg[i], NVRAM_SIZE * 2); sc->sc_bank1 = sc->sc_bank0 + NVRAM_SIZE; gen0 = powermac_nvram_check((void *)sc->sc_bank0); From owner-p4-projects@FreeBSD.ORG Wed Oct 15 15:21:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B00D1065689; Wed, 15 Oct 2008 15:21:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E7BF1065697 for ; Wed, 15 Oct 2008 15:21:11 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F143A8FC1A for ; Wed, 15 Oct 2008 15:21:10 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9FFLADO037332 for ; Wed, 15 Oct 2008 15:21:10 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9FFLAlc037330 for perforce@freebsd.org; Wed, 15 Oct 2008 15:21:10 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 15 Oct 2008 15:21:10 GMT Message-Id: <200810151521.m9FFLAlc037330@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 151417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Oct 2008 15:21:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=151417 Change 151417 by zec@zec_tpx32 on 2008/10/15 15:20:16 Lock the vnet list while iterating through it. Affected files ... .. //depot/projects/vimage/src/sys/netipsec/key.c#26 edit Differences ... ==== //depot/projects/vimage/src/sys/netipsec/key.c#26 (text+ko) ==== @@ -4346,6 +4346,7 @@ VNET_ITERATOR_DECL(vnet_iter); time_t now = time_second; + VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); key_flush_spd(now); @@ -4354,6 +4355,7 @@ key_flush_spacq(now); CURVNET_RESTORE(); } + VNET_LIST_RUNLOCK(); #ifndef IPSEC_DEBUG2 /* do exchange to tick time !! */ From owner-p4-projects@FreeBSD.ORG Wed Oct 15 17:07:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88DBB1065698; Wed, 15 Oct 2008 17:07:59 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33BAA10656A2 for ; Wed, 15 Oct 2008 17:07:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 207078FC1F for ; Wed, 15 Oct 2008 17:07:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9FH7x30058375 for ; Wed, 15 Oct 2008 17:07:59 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9FH7xVL058373 for perforce@freebsd.org; Wed, 15 Oct 2008 17:07:59 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 15 Oct 2008 17:07:59 GMT Message-Id: <200810151707.m9FH7xVL058373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 151420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Oct 2008 17:07:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=151420 Change 151420 by rene@rene_self on 2008/10/15 17:07:42 Complete the translation of the Updating chapter (spelling/language). Fix some minor nits in the English version. Checked build. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#2 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#6 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#2 (text+ko) ==== @@ -408,7 +408,7 @@ &prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db &prompt.root; portupgrade -af - This has completed, finish the upgrade process with a + Once this has completed, finish the upgrade process with a final call to freebsd-update. Issue the following command to tie up all loose ends in the upgrade process: @@ -440,14 +440,14 @@ kern.securelevel setting and storing the freebsd-update data on a read only file system when not in use, a better solution would be to - compare the system against a secure disk. Such as a + compare the system against a secure disk, such as a DVD or securely stored external USB disk device. The system will now be inspected, and a list of files - along with their &man.sha256.1; hash values, both known values - in the release and the current installed value. This is why + along with their &man.sha256.1; hash values, both the known value + in the release and the current installed value, will be printed. This is why the output has been sent to the outfile.ids file. It scrolls by too quickly for eye comparisons, and soon it fills up the console @@ -458,7 +458,7 @@ all files different from those in the release, issue the following command: - &prompt.root; cat update.ids | awk '{ print $1 }' | more + &prompt.root; cat outfile.ids | awk '{ print $1 }' | more /etc/master.passwd /etc/motd /etc/passwd @@ -485,7 +485,7 @@ The base system of &os; includes a utility for updating the Ports Collection too: the &man.portsnap.8; utility. Upon execution, it will connect to a remote site, verify the secure - key, and download a new copy of the ports collection. The key + key, and download a new copy of the Ports Collection. The key is used to verify the integrity of all downloaded files, ensuring they have not been modified in-flight. To download the latest Ports Collection files, issue the following command: ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#6 (text+ko) ==== @@ -61,7 +61,7 @@ Gereedschappen zoals &man.portsnap.8; en &man.freebsd-update.8; hebben het upgradeproces gestroomlijnd. - Deze neiuwe methoden verhogen de productiviteit terwijl ze een + Deze nieuwe methoden verhogen de productiviteit terwijl ze een eenvoudigere interface voor gebruikers bieden. Sommige nieuwe gereedschappen kunnen vanuit &man.cron.8; worden gedraaid waardoor de handmatige tussenkomst van de systeembeheerder wordt @@ -133,7 +133,7 @@ Dit is niet langer het geval aangezien &os; nu een gereedschap heeft dat eenvoudigweg freebsd-update heet. Dit gereedschap biedt twee gescheiden functies. Ten eerste - voorziet het in het toepassen van binaire beveiligins- en + voorziet het in het toepassen van binaire beveiligings- en errata-updates op het basissysteem van &os; zonder de eis om te bouwen en te installeren. Ten tweede ondersteunt het gereedschap kleine en grote uitgave-upgrades. @@ -146,7 +146,7 @@ &man.freebsd-update.8; en &os; 6.3 nodig. Voordat naar een nieuwe uitgave wordt ge-updated, dienen de huidige uitgaveaankondigingen gelezen te worden aangezien ze belangrijke - informatie voor de gewenste uitgave kunnen bevatten. De + informatie over de gewenste uitgave kunnen bevatten. De aankondigingen kunnen op de volgende koppeling bekeken worden: . @@ -171,9 +171,9 @@ Het configuratiebestand Sommige gebruikers willen het configuratiebestand tweaken, - waardoor het proces beter gecontroleerd kan wordne. De opties - zijn goed gedocumenteerd, maar de volgenden is wat extra uitleg - nodig: + waardoor het proces beter gecontroleerd kan worden. De opties + zijn goed gedocumenteerd, maar voor de volgenden is wat extra + uitleg nodig: # Componenten van het basissysteem die bijgewerkt moeten blijven Components src world kernel @@ -192,9 +192,8 @@ op te noemen. Dit kan rampzalige gevolgen hebben aangezien de broncode en de binairen asynchroon kunnen raken. - # Paden die beginnen met iets wat overeenkomt met - een regel in een IgnorePaths -statement zullen genegeerd worden. + # Paden die beginnen met iets wat overeenkomt met een regel in een IgnorePaths +# statement zullen genegeerd worden. IgnorePaths Voeg paden, zoals @@ -206,7 +205,7 @@ overschrijft. # Paden die beginnen met iets wat overeenkomt met een regel in een UpdateIfUnmodified -# statement zullen alleen worden bijgwerkt als de inhoud van het bestand niet is +# statement zullen alleen worden bijgewerkt als de inhoud van het bestand niet is # gewijzigd door de gebruiker (tenzij veranderingen zijn samengevoegd; zie beneden). UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile @@ -218,34 +217,35 @@ freebsd-update instrueert om de veranderingen tijdens het samenvoegen te bewaren. - # Wanneer naar een nieuwe uitgave van &os; wordt ge-upgraded, worden lokale veranderingen van bestanden die overeenkomen met MergeChanges + # Wanneer naar een nieuwe uitgave van &os; wordt ge-upgraded, worden lokale veranderingen van bestanden die overeenkomen met MergeChanges # samengevoegd in de versie van de nieuwe uitgave. MergeChanges /etc/ /var/named/etc/ Lijst van mappen met instellingenbestanden waar freebsd-update moet proberen om in samen te voegen. Het proces van bestanden samenvoegen is een serie - van &man.diff.1;-patches ongeveer gelijk aan &man.mergemaster.8; - met minder opties, de samenvoegingen worden ofwel geaccepteerd, - openen een tekstverwerker, of zorgen ervoor dat - freebsd-update afbreekt. Maak in geval van - twijfel een reservekopie van freebsd-update afbreekt. Maak in + geval van twijfel een reservekopie van /etc en accepteer de samenvoegingen. In staat meer informatie over het commando mergemaster. # Map waarin de gedownloade updates en tijdelijke bestanden -# die door een &os; Update worden gebruikt worden opgeslagen. +# die door een &os; Update worden gebruikt worden worden opgeslagen. # WorkDir /var/db/freebsd-update Dit is de map waarin alle patches en tijdelijke bestanden worden geplaatst. In het geval dat de gebruiker een - versie-upgrade uitvoert, dient deze locate tenminste een + versie-upgrade uitvoert, dient deze locatie tenminste een gigabyte aan vrije schijfruimte te hebben. - # Wanneer tussen uitgaven wordt ge-upgraded, dient de lijst van Componenten dan -# strikt gelezen te worden (StrictComponents yes) of slechts als een lisjt van componenten + # Wanneer tussen uitgaven wordt ge-upgraded, dient de lijst van Componenten dan +# strikt gelezen te worden (StrictComponents yes) of slechts als een lijst van componenten + # die geïnstalleerd *kunnen* worden en waarvan &os; Update uit dient te zoeken # welke daadwerkelijk zijn geïnstalleerd en die te upgraden (StrictComponents no)? # StrictComponents no @@ -262,7 +262,8 @@ Beveiligingspatches Beveiligingspatches staan op een verre machine en kunnen met - het volgende commando gedownload en geïnstalleerd worden: + het volgende commando gedownload en geïnstalleerd + worden: &prompt.root; freebsd-update fetch &prompt.root; freebsd-update install @@ -292,18 +293,18 @@ &prompt.root; freebsd-update rollback - Eenmaal voltooid, dinet het systeem herstart te worden als + Eenmaal voltooid, dient het systeem herstart te worden als de kernel of enige kernelmodule is gewijzigd. Dit stelt &os; in staat om de nieuwe binairen in het geheugen te laden. De freebsd-update werkt alleen met de kernel GENERIC. Als er wijzigingen aan - de GENERIC kernel zijn gemaakt of er een + de kernel GENERIC zijn gemaakt of er een eigen kernel is geïnstalleerd, wordt freebsd-update niet voltooid — - het zal falen in de eerste zaak en een fout produceren in de - laatste. + het zal falen in het eerste geval en een fout produceren in + het laatste. @@ -339,7 +340,7 @@ freebsd-update het instellingenbestand en het huidige systeem evalueren in een poging om de benodigde informatie te verzamelen om het systeem te updaten. Een lijst - op het scherm zal aangeven welke componenten zijn gedetecteeerd + op het scherm zal aangeven welke componenten zijn gedetecteerd en welke niet. Bijvoorbeeld: Looking up update.FreeBSD.org mirrors... 1 mirrors found. @@ -370,10 +371,10 @@ zullen instellingenbestanden worden samengevoegd — voor dit gedeelte van het proces is enige tussenkomst van de gebruiker nodig aangezien een bestand kan worden samengevoegd of - omdat er een tekstverwerker op het kan verschijnen om het + omdat er een tekstverwerker op het scherm kan verschijnen om het bestand handmatig samen te voegen. Het resultaat van elke succesvolle samenvoeging zal aan de gebruiker worden getoond - naarmate het proces verdergaat. Een mislukte of genegeerde + naarmate het proces verder gaat. Een mislukte of genegeerde samenvoegpoging zal het proces afbreken. Het is mogelijk voor gebruikers om een reservekopie van /etc te maken en belangrijke @@ -390,12 +391,12 @@ Als dit proces eenmaal voltooid is, kan de upgrade aan de - schijf toevertrowud worden met het volgende commando. + schijf toevertrouwd worden met het volgende commando. &prompt.root; freebsd-update install - De kernel en kernelmodules zullen als eerset gepatcht - worden. hier moet de machine opnieuw opgestart worden. Het + De kernel en kernelmodules zullen als eerste gepatcht + worden. Nu moet de machine opnieuw opgestart worden. Het volgende commando kan gegeven worden om de machine te herstarten en dus de nieuwe kernel in het geheugen te laden: @@ -432,7 +433,6 @@ &prompt.root; rm /var/db/pkg/pkgdb.db /usr/ports/INDEX-*.db &prompt.root; portupgrade -af - Voltooi, nadat dit voltooid is, het upgradeproces met een laatste aanroep naar freebsd-update. Geef het volgende commando om alle losse eindjes in het upgradeproces @@ -462,21 +462,20 @@ zoals security/snort. Aangezien freebsd-update gegevens op schijf opslaat, is de mogelijkheid om te knoeien duidelijk. Hoewel - deze mogelijkheid verminderd kan worde door de instelling + deze mogelijkheid verminderd kan worden door de instelling kern.securelevel te gebruiken en de gegevens van freebsd-update op een bestandssysteem dat alleen gelezen kan worden op te slaan - wanneer het niet gebruikt wordt, zou een betere oplossing zijn - om het systeem met een veilige schijf te vergelijken. Zoals - een DVD of een veilig opgeslagen externe - USB-schijf. + wanneer deze niet gebruikt worden, zou een betere oplossing + zijn om het systeem met een veilige schijf te vergelijken, + zoals een DVD of een veilig opgeslagen + externe USB-schijf. - Het systeem zal nu geïnspecteerd worden, samen met een - lijst met hun &man.sha256.1;-hashwaarden, zowel de bekende - waarde in de uitgave en de huidige geïnstalleerde waarde. - - Hierom wordt de uitvoer naar het bestand + Het systeem zal nu geïnspecteerd worden, en er zal een + lijst van hun &man.sha256.1;-hashwaarden, zowel de bekende + waarde in de uitgave en de huidige geïnstalleerde waarde, + afgebeeld worden. Hierom wordt de uitvoer naar het bestand uitvoerbestand.ids gezonden. Het scrollt te snel voorbij om het met het oog te vergelijken, en het vult al snel de gehele consolebuffer op. @@ -486,8 +485,7 @@ lijst van alle bestanden te krijgen die verschillen van die in de uitgave, het volgende commando: - - &prompt.root; cat update.ids | awk '{ print $1 }' | more + &prompt.root; cat uitvoerbestand.ids | awk '{ print $1 }' | more /etc/master.passwd /etc/motd /etc/passwd @@ -516,7 +514,7 @@ Portscollectie bij te werken: het hulpmiddel &man.portsnap.8;. Wanneer het wordt uitgevoerd, zal het een verbinding maken met een verre site, de veilige sleutel controleren, en een nieuwe kopie - van de portscollectie downloaden. De sleutel wordt gebruikt om de + van de Portscollectie downloaden. De sleutel wordt gebruikt om de integriteit van alle gedownloade bestanden te controleren, om er zeker van te zijn dat ze niet tijdens het downloaden zijn gewijzigd. Geef het volgende commando om de nieuwste versie van @@ -535,16 +533,17 @@ Fetching 133 new ports or files... done. Dit voorbeeld laat zien dat &man.portsnap.8; verscheidene - patches heeft gevonden en met de huidige portsgegevens heeft + patches heeft gevonden en deze met de huidige portsgegevens heeft gecontroleerd. Het geeft ook aan dat het gereedschap eerder is gedraaid, als het voor de eerste keer was gedraaid, had het simpelweg de collectie gedownload. Wanneer &man.portsnap.8; succesvol een fetch-operatie afrondt, bestaan de - Portscollectie en vervolgpatches op het plaatselijke systeem die - de verificatie doorstaan hebben. De bijgwerkte bestanden kunnen - geïnstalleerd worden door het volgende te typen: + Portscollectie en de vervolgpatches die de verificatie doorstaan + hebben op het plaatselijke systeem. De bijgewerkte bestanden + kunnen geïnstalleerd worden door het volgende te + typen: &prompt.root; portsnap extract /usr/ports/.cvsignore From owner-p4-projects@FreeBSD.ORG Wed Oct 15 19:43:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 564711065695; Wed, 15 Oct 2008 19:43:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00CF51065696 for ; Wed, 15 Oct 2008 19:43:38 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E2E9E8FC0A for ; Wed, 15 Oct 2008 19:43:37 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9FJhbvP080393 for ; Wed, 15 Oct 2008 19:43:37 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9FJhbqu080391 for perforce@freebsd.org; Wed, 15 Oct 2008 19:43:37 GMT (envelope-from peter-gmail@wemm.org) Date: Wed, 15 Oct 2008 19:43:37 GMT Message-Id: <200810151943.m9FJhbqu080391@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 151428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Oct 2008 19:43:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=151428 Change 151428 by peter@peter_daintree on 2008/10/15 19:43:23 Merge valgrind-3.2.3@8674 amd64 instruction decode fix. (allows 7 prefixes as generated by gcc for mega-nops as code alignment fillers) Affected files ... .. //depot/projects/valgrind/Makefile.am#3 integrate .. //depot/projects/valgrind/VEX/priv/guest-amd64/toIR.c#2 integrate .. //depot/projects/valgrind/configure.in#4 integrate .. //depot/projects/valgrind/glibc-2.6.supp#1 branch .. //depot/projects/valgrind/glibc-2.7.supp#1 branch .. //depot/projects/valgrind/massif/ms_main.c#2 integrate .. //depot/projects/valgrind/xfree-4.supp#2 integrate Differences ... ==== //depot/projects/valgrind/Makefile.am#3 (text+ko) ==== @@ -18,6 +18,7 @@ SUPP_FILES = \ glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp glibc-2.5.supp \ + glibc-2.6.supp glibc-2.7.supp \ xfree-3.supp xfree-4.supp dist_val_DATA = $(SUPP_FILES) default.supp ==== //depot/projects/valgrind/VEX/priv/guest-amd64/toIR.c#2 (text+ko) ==== @@ -8355,7 +8355,7 @@ as many invalid combinations as possible. */ n_prefixes = 0; while (True) { - if (n_prefixes > 5) goto decode_failure; + if (n_prefixes > 7) goto decode_failure; pre = getUChar(delta); switch (pre) { case 0x66: pfx |= PFX_66; break; ==== //depot/projects/valgrind/configure.in#4 (text+ko) ==== @@ -385,6 +385,26 @@ ], glibc="2.5") +AC_EGREP_CPP([GLIBC_26], [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 6) + GLIBC_26 + #endif +#endif +], +glibc="2.6") + +AC_EGREP_CPP([GLIBC_27], [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 7) + GLIBC_27 + #endif +#endif +], +glibc="2.7") + AC_MSG_CHECKING([the glibc version]) case "${glibc}" in @@ -412,9 +432,20 @@ DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}" ;; + 2.6) + AC_MSG_RESULT(2.5 family) + AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x]) + DEFAULT_SUPP="glibc-2.6.supp ${DEFAULT_SUPP}" + ;; + 2.7) + AC_MSG_RESULT(2.7 family) + AC_DEFINE([GLIBC_2_7], 1, [Define to 1 if you're using glibc 2.7.x]) + DEFAULT_SUPP="glibc-2.7.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + ;; *) AC_MSG_RESULT(unsupported version) - AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5]) + AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.7]) ;; esac ;; ==== //depot/projects/valgrind/massif/ms_main.c#2 (text+ko) ==== @@ -1665,15 +1665,18 @@ if (VG_(clo_verbosity) > 1) { tl_assert(n_xpts > 0); // always have alloc_xpt VG_(message)(Vg_DebugMsg, " allocs: %u", n_allocs); - VG_(message)(Vg_DebugMsg, "zeroallocs: %u (%d%%)", n_zero_allocs, - n_zero_allocs * 100 / n_allocs ); + if ( n_allocs ) + VG_(message)(Vg_DebugMsg, "zeroallocs: %u (%d%%)", n_zero_allocs, + n_zero_allocs * 100 / n_allocs ); VG_(message)(Vg_DebugMsg, " frees: %u", n_frees); VG_(message)(Vg_DebugMsg, " XPts: %u (%d B)", n_xpts, n_xpts*sizeof(XPt)); - VG_(message)(Vg_DebugMsg, " bot-XPts: %u (%d%%)", n_bot_xpts, - n_bot_xpts * 100 / n_xpts); - VG_(message)(Vg_DebugMsg, " top-XPts: %u (%d%%)", alloc_xpt->n_children, - alloc_xpt->n_children * 100 / n_xpts); + if ( n_xpts ) + VG_(message)(Vg_DebugMsg, " bot-XPts: %u (%d%%)", n_bot_xpts, + n_bot_xpts * 100 / n_xpts); + if ( n_xpts ) + VG_(message)(Vg_DebugMsg, " top-XPts: %u (%d%%)", alloc_xpt->n_children, + alloc_xpt->n_children * 100 / n_xpts); VG_(message)(Vg_DebugMsg, "c-reallocs: %u", n_children_reallocs); VG_(message)(Vg_DebugMsg, "snap-frees: %u", n_snapshot_frees); VG_(message)(Vg_DebugMsg, "atmp censi: %u", n_attempted_censi); ==== //depot/projects/valgrind/xfree-4.supp#2 (text+ko) ==== @@ -134,10 +134,33 @@ } { + struct with uninitialized paddings - libxcb + Memcheck:Param + writev(vector[...]) + obj:/lib*/libc-2.6*.so + obj:/usr/lib*/libxcb.so.1.0.0 + obj:/usr/lib*/libxcb.so.1.0.0 + fun:xcb_send_request + fun:_X* +} + +{ + struct with uninitialized paddings - libxcb + Memcheck:Param + writev(vector[...]) + obj:/lib*/libc-2.6*.so + obj:/usr/lib*/libxcb.so.1.0.0 + obj:/usr/lib*/libxcb.so.1.0.0 + obj:/usr/lib*/libxcb.so.1.0.0 + fun:xcb_* + fun:_X* +} + +{ another struct with uninitialized paddings Memcheck:Param write(buf) - fun:* + obj:* fun:_IceTransSocketWrite fun:_IceTransWrite fun:_IceWrite @@ -165,23 +188,13 @@ Xorg 6.8.1 ICE uninit __write* padding Memcheck:Param write(buf) - fun:__write* + obj:* fun:_IceTransWrite fun:_IceWrite fun:IceFlush } { - Xorg 6.8.1 ICE uninit write padding - Memcheck:Param - write(buf) - fun:write - fun:_IceTransWrite - fun:_IceWrite - fun:IceFlush -} - -{ Xorg 6.8.1 writev uninit padding Memcheck:Param writev(vector[...]) @@ -202,6 +215,8 @@ fun:_XSend } + + # There's something strange about a % 127 in XftFontOpenInfo # (hashing) which gcc turns into a multiply by 33818641 and # some other guff instead. I don't understand it enough to From owner-p4-projects@FreeBSD.ORG Thu Oct 16 00:02:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E0091065697; Thu, 16 Oct 2008 00:02:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DF441065693 for ; Thu, 16 Oct 2008 00:02:16 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EE1588FC28 for ; Thu, 16 Oct 2008 00:02:15 +0000 (UTC) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G02FnO016427 for ; Thu, 16 Oct 2008 00:02:15 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G020tD016414 for perforce@freebsd.org; Thu, 16 Oct 2008 00:02:00 GMT (envelope-from wsalamon@computer.org) Date: Thu, 16 Oct 2008 00:02:00 GMT Message-Id: <200810160002.m9G020tD016414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 151434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2008 00:02:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=151434 Change 151434 by wsalamon@vh2 on 2008/10/16 00:01:55 Integrate the Audit-MAC branch from parent, bring in all recent changes. Affected files ... .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/dump_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/minidump_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/param.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/segments.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_genassym.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/dump_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/intr.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/armreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/intr.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/metadata.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/pcpu.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/resource.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/common.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/files.mv#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/gpio.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/ic.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/obio.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/rtc.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/std.mv#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/timer.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/mv/twsi.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/arm/uboot/version#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/devopen.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/metadata.c#3 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/powerpc/uboot/start.S#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/common/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/console.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/elf_freebsd.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/reboot.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/boot/uboot/lib/time.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/cam.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/dev/dtrace/dtrace_clone.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_futex.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_misc.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#11 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.amd64#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.i386#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.ia64#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.mips#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.pc98#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips.cfe#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/newvers.sh#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#9 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.mips#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.sparc64#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf_subr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pfvar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/rdma/rdma_cma.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_command.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_command.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_main.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/db_textdump.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpi_support/acpi_fujitsu.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/agp/agp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/agp/agpreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aha/aha_isa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aha/aha_mca.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/amr/amr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-chipset.c#6 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-sata.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bm/if_bm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cp/if_cp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_ael1002.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_common.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_mc5.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_t3_hw.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_tn1010.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_vsc7323.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_vsc8211.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/common/cxgb_xgmac.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_adapter.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_t3fw.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_auth.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_context.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_dma.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_drawable.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_fops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_ioctl.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_lock.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_memory.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_pci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_pciids.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_scatter.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_sysctl.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/drm_vm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_drm.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_drv.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_irq.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/i915_suspend.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_dma.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mach64_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/mga_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/r128_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/savage_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/sis_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/drm/tdfx_drv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/esp/ncr53c9x.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/esp/ncr53c9xreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/esp/ncr53c9xvar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/fb/fb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/firewire/fwdev.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_piv.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ic/i8251.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iicbus/ds133x.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iicbus/ds1672.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iscsi/initiator/isc_cam.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/jme/if_jme.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/jme/if_jmereg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/joy/joy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/k8temp/k8temp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/le/lebuffer_sbus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/led/led.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/atphy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ciphy.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mly/mly.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/bridge.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcbrvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mse/mse.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/eth_z8e.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/ethp_z8e.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/rss_eth_z8e.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mxge/rss_ethp_z8e.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfereg.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pbio/pbio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppbconf.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppbconf.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc_acpi.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc_isa.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppc_puc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppcreg.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ppc/ppcvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sbni/if_sbni.c#3 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sbni/if_sbni_isa.c#3 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sbni/if_sbni_pci.c#3 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sbni/if_sbnireg.h#3 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sbni/if_sbnivar.h#3 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/si/si.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/hda/hda_reg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/hda/hdac.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/speaker/spkr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehcivar.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/u3g.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uark.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ubsa.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ulpt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/umass.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/umct.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ums.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/urio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uscanner.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/dev/xen/netfront/netfront.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/coda/coda_fbsd.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/devfs/devfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/hpfs/hpfs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/ntfs/ntfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/portalfs/portal_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/procfs/procfs_map.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom_dev.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom_io.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/geom_vfs.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_bsd.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_gpt.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_pc98.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/bios/apm.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/NOTES#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/XEN#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/bios.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/minidump_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/param.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/proc.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/evtchn.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/xenpmap.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/xen/xenvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/isa.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_locore.s#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/locore.s#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/mp_machdep.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/mptable.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/i386/xen/xen_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/dump_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/sal.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/imgact_aout.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_main.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_conf.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_exec.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_exit.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_jail.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lock.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_priv.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_resource.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_sig.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_synch.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thread.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_xxx.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_bus.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_clist.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_firmware.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_rman.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#9 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sys_generic.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sys_process.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sys_socket.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/syscalls.master#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/systrace_args.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_pts.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/libkern/memcmp.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/libkern/qdivrem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/admpci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/if_admsw.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/if_admswvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/obio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/std.adm5120#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/uart_bus_adm5120.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/uart_cpu_adm5120.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/adm5120/uart_dev_adm5120.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/idt/idtpci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/idt/if_kr.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/idt/obio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/idt/std.idt#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/idt/uart_bus_rc32434.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/param.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/files.malta#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/gt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/gt_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/malta_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/obio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/std.malta#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/uart_bus_maltausart.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/uart_cpu_maltausart.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/malta/yamon.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/in_cksum.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/intr_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mp_machdep.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/pmap.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/support.S#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/trap.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/sentry5/obio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/sentry5/s5_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/sentry5/uart_bus_sbusart.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/mips/sentry5/uart_cpu_sbusart.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#9 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ae/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/ata/Makefile#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atacore/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atadevel/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atadevel/ata-devel.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/cxgb_t3fw/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/toecore/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/tom/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ehci/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ohci/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/sbni/Makefile#3 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/slhci/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/u3g/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/uhci/Makefile#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan/Makefile#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wpifw/Makefile#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_bridge.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_clone.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_clone.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ef.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_faith.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_gif.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_gif.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_gre.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_lagg.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_loop.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_mib.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_stf.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_tap.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_tap.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_tun.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_var.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_vlan.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/raw_cb.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/raw_usrreq.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/route.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/route.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/rtsock.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net/vnet.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ddb.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ht.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_phy.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan_sta.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_wds.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/atm/ng_atm.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netflow/ng_netflow.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netflow/ng_netflow.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_device.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_gif.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_iface.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pipe.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_pipe.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tty.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_tty.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_gif.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.h#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_var.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip6.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw_nat.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_input.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_ipsec.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_options.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_offload.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/vinet.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/dest6.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/frag6.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_gif.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_pcb.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_rmx.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/route6.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/scope6.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/vinet6.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/ipsec.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/key.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/keysock.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/vipsec.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/xform_ah.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netipx/ipx.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/netsmb/smb_dev.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_diskless.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/olpt.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/include/bus.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/clock.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/machdep.c#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mp_cpudep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/nexus.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/swtch.S#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/dbdma.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/nexusvar.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/pte.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/smp.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/ofw/ofw_pci.c#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/ofw/ofw_pci.h#2 delete .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/ofw/ofw_pcibus.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/ofw/ofw_syscons.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/ata_dbdma.c#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/ata_dbdma.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/dbdma.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/dbdmavar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/macio.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/autoconf.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/syncicache.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/psim/openpic_iobus.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/rpc/authunix_prot.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_pipe.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_syscalls.c#7 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/cpufunc.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/dcr.h#1 branch .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/pcpu.h#4 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/smp.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/tick.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/tlb.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/trap.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/schizo.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Oct 16 06:21:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E037E106568F; Thu, 16 Oct 2008 06:21:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3C291065689 for ; Thu, 16 Oct 2008 06:21:41 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 919268FC20 for ; Thu, 16 Oct 2008 06:21:41 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G6Lfhl079235 for ; Thu, 16 Oct 2008 06:21:41 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G6LfDv079233 for perforce@freebsd.org; Thu, 16 Oct 2008 06:21:41 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 16 Oct 2008 06:21:41 GMT Message-Id: <200810160621.m9G6LfDv079233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 151438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2008 06:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=151438 Change 151438 by pgj@kolbasz on 2008/10/16 06:21:27 Add separate links for Hungarian translations of different books and articles on the web page Affected files ... .. //depot/projects/docproj_hu/www/hu/docs/books.sgml#15 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docs/books.sgml#15 (text+ko) ==== @@ -52,15 +52,15 @@ Egy tanulmány a &os; Projekt szervezeti felépítésérõl.

-

A FreeBSD GYIK - (faq)
+

A FreeBSD GYIK + (faq) [magyarul]
Gyakran Ismételt Kérdések és a rájuk adott válaszok minden — a &os;-t érintõ — témáról.

A &os; kézikönyv - (handbook)
+ href="&url.books;/handbook/index.html">A &os; kézikönyv + (handbook) [magyarul]
Egy folyamatosan fejlõdõ, átfogó információforrás &os; felhasználóknak.

@@ -154,8 +154,8 @@ a munkájuk megkezdéséhez.

A Compiz Fusion telepítése és használata - (compiz-fusion)
+ href="&url.articles;/compiz-fusion/index.html">A Compiz Fusion telepítése és használata + (compiz-fusion) [magyarul]
Hogyan telepítsük és használjuk a Compiz Fusion kompozit ablakkezelõt &os; alatt.

@@ -206,8 +206,8 @@ bonyolultabb funkcióit.

Tûzfal létrehozása betárcsázós kapcsolatokhoz &os;-vel - (dialup-firewall)
+ href="&url.articles;/dialup-firewall/index.html">Tûzfal létrehozása betárcsázós kapcsolatokhoz &os;-vel + (dialup-firewall) [magyarul]
Hogyan állítsunk be egy tûzfalat a PPP és az ipfw használatával dinamikusan kiosztott IP-címek esetén.

@@ -227,8 +227,8 @@ megjelenítéséhez.

A BSD bemutatása - (explaining-bsd)
+ href="&url.articles;/explaining-bsd/index.html">A BSD bemutatása + (explaining-bsd) [magyarul]
A válasz arra a kérdésre, hogy mi az a BSD.

@@ -281,8 +281,8 @@ írhatunk saját GEOM-osztályt.

Naplózó UFS használata asztali számítógépeken - (gjournal-desktop)
+ href="&url.articles;/gjournal-desktop/index.html">Naplózó UFS használata asztali számítógépeken + (gjournal-desktop) [magyarul]
A naplózást engedélyezõ UFS partíciók létrehozását otthoni környezetben bemutató leírás.

@@ -308,8 +308,9 @@ ellenõrzésére.

&os; Laptopon - (laptop)
Hogyan használjunk &os;-t egy laptopon.

+ href="&url.articles;/laptop/index.html">&os; Laptopon + (laptop) [magyarul]
+ Hogyan használjunk &os;-t egy laptopon.

LDAP hitelesítés @@ -320,8 +321,8 @@ hitelesítsün felhasználókat.

&os;: Egy nyílt forrású alternatíva a Linux mellett - (linux-comparison)
+ href="&url.articles;/linux-comparison/index.html">&os;: Egy nyílt forrású alternatíva a Linux mellett + (linux-comparison) [magyarul]
Elmagyarázza a Linux és a &os; közti különbségeket.

@@ -333,8 +334,8 @@ mûködésérõl.

&os; gyorstalpaló Linux felhasználóknak - (linux-users)
+ href="&url.articles;/linux-users/index.html">&os; gyorstalpaló Linux felhasználóknak + (linux-users) [magyarul]
Egy bevezetõ jellegû úmutató a Linux felhasználói számára.

@@ -353,8 +354,8 @@ használatába &os; alatt.

A &os; telepítése és használata más operációs rendszerekkel együtt - (multi-os)
+ href="&url.articles;/multi-os/index.html">A &os; telepítése és használata más operációs rendszerekkel együtt + (multi-os) [magyarul]
Hogyan telepítsük a &os;-t más operációs rendszer mellé, ugyanarra a számítógépre.

@@ -502,8 +503,8 @@ és CD-ROM olvasókat.

Válasszuk ki a nekünk igazán megfelelõ &os; verziót! - (version-guide)
+ href="&url.articles;/version-guide/index.html">Válasszuk ki a nekünk igazán megfelelõ &os; verziót! + (version-guide) [magyarul]
Hogyan válasszuk ki az igényeinek megfelelõ &os; verziót. Elmagyarázza a kiadások és a fejlesztési ágak rendszerét, From owner-p4-projects@FreeBSD.ORG Thu Oct 16 06:23:43 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D91AE1065691; Thu, 16 Oct 2008 06:23:43 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3A91065687 for ; Thu, 16 Oct 2008 06:23:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C1448FC12 for ; Thu, 16 Oct 2008 06:23:43 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G6Nh7W079404 for ; Thu, 16 Oct 2008 06:23:43 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G6NhFi079402 for perforce@freebsd.org; Thu, 16 Oct 2008 06:23:43 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 16 Oct 2008 06:23:43 GMT Message-Id: <200810160623.m9G6NhFi079402@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 151439 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2008 06:23:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=151439 Change 151439 by pgj@kolbasz on 2008/10/16 06:22:59 Refactor Hungarian translation of word "markup" Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#3 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#3 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/overview/chapter.sgml#3 (text+ko) ==== @@ -309,7 +309,7 @@ - A forrásban használt markupokat a + A forrásban használt jelölõket a lint cél segítségével ellenõrizhetjük. Ilyenkor anélkül tudjuk megtalálni a ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/tools/chapter.sgml#3 (text+ko) ==== @@ -140,9 +140,9 @@ Egy DSSSL implementáció, ezen keresztül alakíthatóak át a - dokumentumok markupokkal ellátott forrásai - más, például HTML vagy &tex; - formátumokba. + dokumentumok jelölõkkel ellátott + forrásai más, például HTML + vagy &tex; formátumokba. From owner-p4-projects@FreeBSD.ORG Thu Oct 16 06:54:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BBE0106568F; Thu, 16 Oct 2008 06:54:15 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EDC910656A0 for ; Thu, 16 Oct 2008 06:54:15 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0BD3F8FC17 for ; Thu, 16 Oct 2008 06:54:15 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G6sEuv081633 for ; Thu, 16 Oct 2008 06:54:14 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G6sEW8081631 for perforce@freebsd.org; Thu, 16 Oct 2008 06:54:14 GMT (envelope-from ed@FreeBSD.org) Date: Thu, 16 Oct 2008 06:54:14 GMT Message-Id: <200810160654.m9G6sEW8081631@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 151440 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2008 06:54:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=151440 Change 151440 by ed@ed_dull on 2008/10/16 06:53:42 IFC yesterday's TTY changes. Affected files ... .. //depot/projects/mpsafetty/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/mpsafetty/lib/libstand/Makefile#2 integrate .. //depot/projects/mpsafetty/libexec/rtld-elf/mips/reloc.c#3 integrate .. //depot/projects/mpsafetty/release/Makefile#3 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/mpsafetty/release/scripts/package-trees.sh#2 integrate .. //depot/projects/mpsafetty/sbin/fsck_ffs/pass5.c#2 integrate .. //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/mpsafetty/share/man/man4/ddb.4#9 integrate .. //depot/projects/mpsafetty/share/man/man4/u3g.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/ubsa.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/umass.4#2 integrate .. //depot/projects/mpsafetty/share/zoneinfo/Makefile#3 integrate .. //depot/projects/mpsafetty/share/zoneinfo/africa#4 integrate .. //depot/projects/mpsafetty/share/zoneinfo/asia#4 integrate .. //depot/projects/mpsafetty/share/zoneinfo/southamerica#5 integrate .. //depot/projects/mpsafetty/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/genassym.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/identcpu.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/locore.S#2 integrate .. //depot/projects/mpsafetty/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/arm/swtch.S#3 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/mpsafetty/sys/arm/include/armreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/mpsafetty/sys/arm/include/cpufunc.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/intr.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/include/metadata.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/include/resource.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/common.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/files.mv#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/gpio.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/ic.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/obio.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/rtc.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/std.mv#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/timer.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/twsi.c#1 branch .. //depot/projects/mpsafetty/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/Makefile#4 integrate .. //depot/projects/mpsafetty/sys/boot/arm/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/mpsafetty/sys/boot/arm/uboot/version#1 branch .. //depot/projects/mpsafetty/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/mpsafetty/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/mpsafetty/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/mpsafetty/sys/conf/Makefile.arm#3 integrate .. //depot/projects/mpsafetty/sys/conf/files.powerpc#4 integrate .. //depot/projects/mpsafetty/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/mpsafetty/sys/conf/options.arm#2 integrate .. //depot/projects/mpsafetty/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_drv.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_fops.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_linux_list.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_pciids.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/jme/if_jmereg.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/mpsafetty/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/mpsafetty/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/umass.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/mpsafetty/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux.h#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_exit.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_sig.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thr.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thread.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/sys_process.c#2 integrate .. //depot/projects/mpsafetty/sys/kern/tty.c#53 integrate .. //depot/projects/mpsafetty/sys/mips/conf/SENTRY5#3 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/nexus.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/aim/ofw_machdep.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/nexusvar.h#2 delete .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pci.c#2 delete .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pci.h#2 delete .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_pcibus.c#1 branch .. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#4 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/grackle.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/hrowpic.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/openpic_macio.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/psim/openpic_iobus.c#2 integrate .. //depot/projects/mpsafetty/sys/sys/proc.h#8 integrate .. //depot/projects/mpsafetty/sys/sys/tty.h#22 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/mpsafetty/usr.bin/tftp/extern.h#2 integrate .. //depot/projects/mpsafetty/usr.bin/tftp/main.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/tftp/tftp.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/tftp/tftpsubs.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/globals.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/package.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/sysinstall/sysinstall.h#3 integrate Differences ... ==== //depot/projects/mpsafetty/lib/libc/arm/gen/_setjmp.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.3 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/gen/_setjmp.S,v 1.4 2008/10/14 09:53:47 raj Exp $"); /* * C library -- _setjmp, _longjmp @@ -101,6 +101,10 @@ /* validation failed, die die die. */ botch: +#if !defined(_STANDALONE) bl PIC_SYM(_C_LABEL(longjmperror), PLT) bl PIC_SYM(_C_LABEL(abort), PLT) b . - 8 /* Cannot get here */ +#else + b . +#endif ==== //depot/projects/mpsafetty/lib/libstand/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.62 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.63 2008/10/14 09:53:47 raj Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -32,6 +32,9 @@ .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -m32 -I. .endif +.if ${MACHINE_ARCH} == "arm" +CFLAGS+= -msoft-float -DSOFTFLOAT -D_STANDALONE +.endif # standalone components and stuff we have modified locally SRCS+= zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ @@ -48,12 +51,17 @@ # string functions from libc .PATH: ${.CURDIR}/../libc/string .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" + ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "amd64" || \ + ${MACHINE_ARCH} == "arm" SRCS+= bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ memcpy.c memmove.c memset.c qdivrem.c rindex.c strcat.c strchr.c \ strcmp.c strcpy.c strcspn.c strlen.c strncat.c strncmp.c strncpy.c \ strpbrk.c strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c .endif +.if ${MACHINE_ARCH} == "arm" +.PATH: ${.CURDIR}/../libc/arm/gen +SRCS+= divsi3.S +.endif .if ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../libc/ia64/string SRCS+= bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \ ==== //depot/projects/mpsafetty/libexec/rtld-elf/mips/reloc.c#3 (text+ko) ==== @@ -1,7 +1,36 @@ /* $NetBSD: mdreloc.c,v 1.23 2003/07/26 15:04:38 mrg Exp $ */ +/* $NetBSD: mips_reloc.c,v 1.53 2008/07/24 04:39:25 matt Exp $ */ + +/* + * Copyright 1997 Michael L. Hitch + * Portions copyright 2002 Charles M. Hannum + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include -__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.2 2008/10/10 05:10:10 imp Exp $"); +__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.3 2008/10/13 20:24:03 imp Exp $"); #include #include @@ -35,21 +64,33 @@ int open(); int _open(); +/* + * It is possible for the compiler to emit relocations for unaligned data. + * We handle this situation with these inlines. + */ +#define RELOC_ALIGNED_P(x) \ + (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) + static __inline Elf_Addr load_ptr(void *where) { - Elf_Addr res; + if (__predict_true(RELOC_ALIGNED_P(where))) + return *(Elf_Addr *)where; + else { + Elf_Addr res; - memcpy(&res, where, sizeof(res)); - - return (res); + (void)memcpy(&res, where, sizeof(res)); + return res; + } } -void +static __inline void store_ptr(void *where, Elf_Addr val) { - - memcpy(where, &val, sizeof(val)); + if (__predict_true(RELOC_ALIGNED_P(where))) + *(Elf_Addr *)where = val; + else + (void)memcpy(where, &val, sizeof(val)); } void @@ -149,13 +190,6 @@ } /* - * It is possible for the compiler to emit relocations for unaligned data. - * We handle this situation with these inlines. - */ -#define RELOC_ALIGNED_P(x) \ - (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) - -/* * Process non-PLT relocations */ int ==== //depot/projects/mpsafetty/release/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.934 2008/10/12 02:52:56 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.935 2008/10/14 02:13:12 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -265,7 +265,7 @@ CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 .if defined(MAKE_DVD) -CD_DVD= ${CD}/dvd +CD_DVD1= ${CD}/dvd1 .endif .if !defined(NODOC) CD_DOCS= ${CD}/docs @@ -930,13 +930,13 @@ done .if defined(MAKE_DVD) @echo "Building DVD filesystem image as well as CDROM" - @mkdir -p ${CD_DVD}/${BUILDNAME} + @mkdir -p ${CD_DVD1}/${BUILDNAME} @for i in ${DISTRIBUTIONS} ; \ do \ if [ -d ${RD}/trees/$${i} ] ; then \ chflags -R noschg ${RD}/trees/$${i} || true ; \ ( cd ${RD}/trees/$${i} && \ - find . -depth -print | cpio -dumpl ${CD_DVD} ) ; \ + find . -depth -print | cpio -dumpl ${CD_DVD1} ) ; \ fi \ done .endif @@ -958,21 +958,21 @@ @cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints .endif .if defined(MAKE_DVD) - @cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD}/boot/kernel - @rm -f ${CD_DVD}/boot/kernel/*.symbols - @rm -f ${CD_DVD}/.profile - @cp ${.CURDIR}/fixit.profile ${CD_DVD}/.profile - @ln -sf /rescue ${CD_DVD}/stand + @cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel + @rm -f ${CD_DVD1}/boot/kernel/*.symbols + @rm -f ${CD_DVD1}/.profile + @cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile + @ln -sf /rescue ${CD_DVD1}/stand @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf - @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf - @rm -f ${CD_DVD}/boot/loader.conf - @cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD}/boot/mfsroot.gz - @echo 'mfsroot_load="YES"' > ${CD_DVD}/boot/loader.conf - @echo 'mfsroot_type="mfs_root"' >> ${CD_DVD}/boot/loader.conf - @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD}/boot/loader.conf + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf + @rm -f ${CD_DVD1}/boot/loader.conf + @cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz + @echo 'mfsroot_load="YES"' > ${CD_DVD1}/boot/loader.conf + @echo 'mfsroot_type="mfs_root"' >> ${CD_DVD1}/boot/loader.conf + @echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD1}/boot/loader.conf .if exists(${RD}/trees/base/boot/device.hints) - @rm -f ${CD_DVD}/boot/device.hints - @cp ${RD}/trees/base/boot/device.hints ${CD_DVD}/boot/device.hints + @rm -f ${CD_DVD1}/boot/device.hints + @cp ${RD}/trees/base/boot/device.hints ${CD_DVD1}/boot/device.hints .endif .endif touch ${.TARGET} @@ -1011,26 +1011,26 @@ @echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf .if defined(MAKE_DVD) .if defined(MAKE_FLOPPIES) - @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD} + @cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD1} .endif - @cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD}/${BUILDNAME} + @cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD1}/${BUILDNAME} .if !defined(NODOC) @for i in ${DIST_DOCS_ARCH_INDEP}; do \ cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \ - ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ cp ${RND}/${RELNOTES_LANG}/$$i/article.html \ - ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ + ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ done @for i in ${DIST_DOCS_ARCH_DEP}; do \ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \ - ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.html \ - ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ + ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \ done - @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD} + @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD1} .endif - @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf - @echo "CD_VOLUME = 1" >> ${CD_DVD}/cdrom.inf + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf + @echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf .endif .if !defined(NODOC) echo "Building CDROM docs filesystem image" @@ -1038,7 +1038,7 @@ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf @mkdir -p ${CD_DOCS}/usr/share/doc .if defined(MAKE_DVD) - @mkdir -p ${CD_DVD}/usr/share/doc + @mkdir -p ${CD_DVD1}/usr/share/doc .endif @for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \ if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \ @@ -1049,7 +1049,7 @@ done .if defined(MAKE_DVD) @cd ${CD_DOCS}/usr/share/doc && find . -print | \ - cpio -dumpl ${CD_DVD}/usr/share/doc + cpio -dumpl ${CD_DVD1}/usr/share/doc .endif .endif touch ${.TARGET} @@ -1081,8 +1081,8 @@ .if exists(${CD_PACKAGE_TREE}/disc2) CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2 .endif -.if exists(${CD_PACKAGE_TREE}/dvd) -CD_DVD_PKGS= ${CD_PACKAGE_TREE}/dvd +.if exists(${CD_PACKAGE_TREE}/dvd1) +CD_DVD1_PKGS= ${CD_PACKAGE_TREE}/dvd1 .endif .endif .endif @@ -1106,8 +1106,8 @@ .if defined(MAKE_DVD) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_Install \ - ${CD}/${BUILDNAME}-${TARGET}-dvd.iso ${CD_DVD} \ - ${CD_DVD_PKGS} + ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \ + ${CD_DVD1_PKGS} .endif .if !defined(NODOC) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ ==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.339 2008/10/06 21:52:11 simon Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.340 2008/10/13 21:02:19 brueffer Exp $ 2000 @@ -822,6 +822,13 @@ 2200BG/2915ABG MiniPCI and 2225BG PCI network adapters (&man.iwi.4; driver) + [&arch.i386;, &arch.amd64;] Intel Wireless WiFi Link + 4965AGN IEEE 802.11n PCI network adapters + (&man.iwn.4; driver) + + [&arch.i386;, &arch.amd64;] Marvell Libertas IEEE 802.11b/g + PCI network adapters (&man.malo.4; driver) + &hwlist.ral; [&arch.i386;, &arch.pc98;] Raytheon Raylink 2.4GHz ==== //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1094 2008/10/08 16:46:36 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1095 2008/10/15 12:02:32 edwin Exp $ 2000 @@ -455,8 +455,8 @@ 8.14.1 to 8.14.3. The timezone database has been updated from - the tzdata2007h release to - the tzdata2008b release. + the tzdata2008b release to + the tzdata2008h release. WPA Supplicant has been updated from 0.5.8 to 0.5.10. ==== //depot/projects/mpsafetty/release/scripts/package-trees.sh#2 (text+ko) ==== @@ -5,9 +5,9 @@ # contains the master INDEX, it's assigned list of packages, and the # appropriate tree of category symlinks. # -# Usage: package-tress.sh +# Usage: package-trees.sh # -# $FreeBSD: src/release/scripts/package-trees.sh,v 1.2 2005/05/03 04:19:07 marcel Exp $ +# $FreeBSD: src/release/scripts/package-trees.sh,v 1.3 2008/10/13 17:42:21 kensmith Exp $ # Verify the command line if [ $# -ne 4 ]; then ==== //depot/projects/mpsafetty/sbin/fsck_ffs/pass5.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.43 2006/10/31 22:06:56 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.45 2008/10/13 14:01:05 kib Exp $"); #include #include @@ -48,7 +48,7 @@ #include "fsck.h" -static void check_maps(u_char *, u_char *, int, int, const char *, int *, int, int); +static void check_maps(u_char *, u_char *, int, ufs2_daddr_t, const char *, int *, int, int); void pass5(void) @@ -291,10 +291,17 @@ sump[run]++; } } - cstotal.cs_nffree += newcg->cg_cs.cs_nffree; - cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree; - cstotal.cs_nifree += newcg->cg_cs.cs_nifree; - cstotal.cs_ndir += newcg->cg_cs.cs_ndir; + if (bkgrdflag != 0) { + cstotal.cs_nffree += cg->cg_cs.cs_nffree; + cstotal.cs_nbfree += cg->cg_cs.cs_nbfree; + cstotal.cs_nifree += cg->cg_cs.cs_nifree; + cstotal.cs_ndir += cg->cg_cs.cs_ndir; + } else { + cstotal.cs_nffree += newcg->cg_cs.cs_nffree; + cstotal.cs_nbfree += newcg->cg_cs.cs_nbfree; + cstotal.cs_nifree += newcg->cg_cs.cs_nifree; + cstotal.cs_ndir += newcg->cg_cs.cs_ndir; + } cs = &fs->fs_cs(fs, c); if (cursnapshot == 0 && memcmp(&newcg->cg_cs, cs, sizeof *cs) != 0 && @@ -321,13 +328,17 @@ } if (excessdirs > 0) check_maps(cg_inosused(newcg), cg_inosused(cg), - inomapsize, cg->cg_cgx * fs->fs_ipg, "DIR", + inomapsize, + cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg, + "DIR", freedirs, 0, excessdirs); check_maps(cg_inosused(newcg), cg_inosused(cg), - inomapsize, cg->cg_cgx * fs->fs_ipg, "FILE", + inomapsize, + cg->cg_cgx * (ufs2_daddr_t) fs->fs_ipg, "FILE", freefiles, excessdirs, fs->fs_ipg); check_maps(cg_blksfree(cg), cg_blksfree(newcg), - blkmapsize, cg->cg_cgx * fs->fs_fpg, "FRAG", + blkmapsize, + cg->cg_cgx * (ufs2_daddr_t) fs->fs_fpg, "FRAG", freeblks, 0, fs->fs_fpg); } if (cursnapshot == 0 && @@ -407,7 +418,7 @@ u_char *map1, /* map of claimed allocations */ u_char *map2, /* map of determined allocations */ int mapsize, /* size of above two maps */ - int startvalue, /* resource value for first element in map */ + ufs2_daddr_t startvalue, /* resource value for first element in map */ const char *name, /* name of resource found in maps */ int *opcode, /* sysctl opcode to free resource */ int skip, /* number of entries to skip before starting to free */ @@ -415,8 +426,8 @@ { # define BUFSIZE 16 char buf[BUFSIZE]; - long i, j, k, l, m, n, size; - int astart, aend, ustart, uend; + long i, j, k, l, m, size; + ufs2_daddr_t n, astart, aend, ustart, uend; void (*msg)(const char *fmt, ...); if (bkgrdflag) @@ -443,10 +454,12 @@ continue; } if (astart == aend) - (*msg)("ALLOCATED %s %d MARKED FREE\n", + (*msg)("ALLOCATED %s %" PRId64 + " MARKED FREE\n", name, astart); else - (*msg)("%s %sS %d-%d MARKED FREE\n", + (*msg)("%s %sS %" PRId64 "-%" PRId64 + " MARKED FREE\n", "ALLOCATED", name, astart, aend); astart = aend = n; } else { @@ -472,10 +485,12 @@ if (size > limit) size = limit; if (debug && size == 1) - pwarn("%s %s %d MARKED USED\n", + pwarn("%s %s %" PRId64 + " MARKED USED\n", "UNALLOCATED", name, ustart); else if (debug) - pwarn("%s %sS %d-%ld MARKED USED\n", + pwarn("%s %sS %" PRId64 "-%" PRId64 + " MARKED USED\n", "UNALLOCATED", name, ustart, ustart + size - 1); if (bkgrdflag != 0) { @@ -497,9 +512,11 @@ } if (astart != -1) { if (astart == aend) - (*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart); + (*msg)("ALLOCATED %s %" PRId64 + " MARKED FREE\n", name, astart); else - (*msg)("ALLOCATED %sS %d-%d MARKED FREE\n", + (*msg)("ALLOCATED %sS %" PRId64 "-%" PRId64 + " MARKED FREE\n", name, astart, aend); } if (ustart != -1) { @@ -514,10 +531,12 @@ size = limit; if (debug) { if (size == 1) - pwarn("UNALLOCATED %s %d MARKED USED\n", + pwarn("UNALLOCATED %s %" PRId64 + " MARKED USED\n", name, ustart); else - pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n", + pwarn("UNALLOCATED %sS %" PRId64 "-%" PRId64 + " MARKED USED\n", name, ustart, ustart + size - 1); } if (bkgrdflag != 0) { ==== //depot/projects/mpsafetty/sbin/ipfw/ipfw2.c#6 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.130 2008/09/27 15:58:54 rik Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.132 2008/10/14 17:59:39 maxim Exp $ */ #include @@ -6035,6 +6035,9 @@ lrule = IPFW_DEFAULT_RULE; /* max ipfw rule number */ ac--; av++; + if (test_only) + return; + /* Parse parameters. */ for (cmd = IP_FW_NAT_GET_LOG, do_cfg = 0; ac != 0; ac--, av++) { if (!strncmp(av[0], "config", strlen(av[0]))) { ==== //depot/projects/mpsafetty/share/man/man4/ddb.4#9 (text+ko) ==== @@ -58,7 +58,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.59 2008/10/04 14:12:09 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.60 2008/10/15 16:58:35 ed Exp $ .\" .Dd October 4, 2008 .Dt DDB 4 @@ -540,6 +540,13 @@ addresses for the process and not show other information. .\" .Pp +.It Ic show Cm all ttys +Show all TTY's within the system. +Output is similar to +.Xr pstat 8 , +but also includes the address of the TTY structure. +.\" +.Pp .It Ic show Cm allchains Show the same information like "show lockchain" does, but for every thread in the system. @@ -963,10 +970,8 @@ .El .\" .Pp -.It Ic show Cm ttys -Show all TTY's within the system. -Output is similar to -.Xr pstat 8 . +.It Ic show Cm tty Ar addr +Display the contents of a TTY structure in a readable form. .\" .Pp .It Ic show Cm turnstile Ar addr ==== //depot/projects/mpsafetty/share/man/man4/u3g.4#2 (text+ko) ==== @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.2 2008/10/10 06:26:37 n_hibma Exp $ +.\" $FreeBSD: src/share/man/man4/u3g.4,v 1.5 2008/10/15 21:47:01 n_hibma Exp $ .\" .Dd October 7, 2008 .Dt U3G 4 @@ -66,35 +66,46 @@ .It Vodafone Mobile Connect Card 3G .It +Qualcomm Inc. CDMA MSM +.It Huawei E220 (E270?) .It Huawei Mobile +.It +Novatal MC950D +.It +Sierra cards .El +(See /sys/dev/u3g.c for the complete list of supported cards for each vendor +mentioned above). .Pp The supported 3G cards provide the necessary modem port for ppp, pppd, or mpd connections as well as extra ports (depending on the specific device) to provide other functions (diagnostic port, SIM toolkit port) +.Pp +In some of these devices a mass storage device supported by the +.Xr umass 4 +driver is present which contains Windows and Mac OSX drivers. This device is +hidden, unless the machine was booted in verbose (see +.Xr boot 8 ). .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , .Xr usb 4 , -.Xr ubsa 4 .Sh HISTORY The .Nm driver appeared in -.Fx 8.0 . -The -.Xr ubsa 4 -manual page was modified for -.Nm -by +.Fx 8.0 , +is based on the uark driver, and written by .An Andrea Guzzo Aq aguzzo@anywi.com in September 2008. .Sh AUTHORS The .Nm driver was written by -.An Andrea Guzzo Aq aguzzo@anywi.com . +.An Andrea Guzzo Aq aguzzo@anywi.com +and +.An Nick Hibma Aq n_hibma@freebsd.org . Hardware for testing provided by AnyWi Technologies, Leiden, NL. ==== //depot/projects/mpsafetty/share/man/man4/ubsa.4#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" 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/ubsa.4,v 1.13 2008/06/18 20:50:30 attilio Exp $ +.\" $FreeBSD: src/share/man/man4/ubsa.4,v 1.14 2008/10/13 20:43:08 n_hibma Exp $ .\" .Dd March 28, 2008 .Dt UBSA 4 @@ -85,28 +85,8 @@ .It GoHubs GoCOM232 .It -Huawei Technologies Mobile card (3G) -.It -Novatel Wireless Merlin U740 (only basic modem port supported) -.It -Option Globetrotter 3G (aka Vodafone Mobile Connect Card 3G) -.It -Option Globetrotter 3G Quad -.It -Option Globetrotter 3G Fusion (no WLAN support, only basic 3G modem port) -.It -Option Globetrotter 3G Fusion Quad (no WLAN support) -.It -Option Globetrotter Max 3.6 -.It Peracom single port serial adapter -.It -Qualcomm, Inc. ZTE CDMA Technologies MSM .El -.Pp -The supported 3G cards provide the necessary modem port for ppp, -pppd, or mpd connections; other functions of these cards (diagnostic port, -SIM toolkit port, WLAN) are not supported. .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , ==== //depot/projects/mpsafetty/share/man/man4/umass.4#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" 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/umass.4,v 1.44 2006/11/22 21:30:02 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/umass.4,v 1.45 2008/10/13 20:43:08 n_hibma Exp $ .\" .Dd November 22, 2006 .Dt UMASS 4 @@ -85,6 +85,8 @@ .It GREEN HOUSE USB Flash Memory "PicoDrive" GH-UFD32M, 64M, 128M .It +Huawei Mobile (SD slot) +.It IBM 32MB USB Memory Key (P/N 22P5296) .It IBM 256MB USB Drive (MSYSTEM DiskOnKey2) ==== //depot/projects/mpsafetty/share/zoneinfo/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/zoneinfo/Makefile,v 1.23 2008/08/08 04:37:43 edwin Exp $ +# $FreeBSD: src/share/zoneinfo/Makefile,v 1.24 2008/10/14 04:09:33 edwin Exp $ # # HOW TO UPDATE THE ZONEINFO DATA @@ -17,17 +17,15 @@ # $ cd ~/svn/vendor/tzdata # $ svn cp svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist \ # svn+ssh://svn.freebsd.org/base/vendor/tzdata/tzdata2008X -# $ svn update +# $ svn update # Commit message: "Tag of tzdata2008X" # # Merge-from-vendor # -# $ cd ~svn/head/share/zoneinfo +# $ cd ~/svn/head/share/zoneinfo # $ svn update -# $ svn merge --accept=postpone \ +# $ svn merge -c X --accept=postpone \ # svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist . -# $ svn diff --no-diff-deleted \ -# --old=svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist --new=. -# $ svn commit +# $ svn update # Commit message: "MFV of tzdata2008X" # CLEANFILES+= yearistype ==== //depot/projects/mpsafetty/share/zoneinfo/africa#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# @(#)africa 8.16 +# @(#)africa 8.17 # 

 
 # This data is by no means authoritative; if you think you know better,
@@ -453,11 +453,19 @@
 # year 2008 - 2009 will, therefore, be effective as from 26 October 2008
 # and end on 29 March 2009.
 
+# From Ed Maste (2008-10-07):
+# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+# beginning / ending of summer time is 2 o'clock standard time in the
+# morning of the last Sunday of October / last Sunday of March.
+# 
+# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
 Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	max	-	Oct	lastSun	2:00	1:00	S
-Rule Mauritius	2009	max	-	Mar	lastSun	2:00	0	-
+Rule Mauritius	2008	max	-	Oct	lastSun	2:00s	1:00	S
+Rule Mauritius	2009	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
 			4:00 Mauritius	MU%sT	# Mauritius Time

==== //depot/projects/mpsafetty/share/zoneinfo/asia#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)asia	8.23
+# @(#)asia	8.24
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -1957,8 +1957,20 @@
 # compilers can't handle  or having multiple Rules (a la Israel).
 # For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
 
+# From Steffen Thorsen (2008-10-07):
+# Syria has now officially decided to end DST on 2008-11-01 this year,
+# according to the following article in the Syrian Arab News Agency (SANA).
+#
+# The article is in Arabic, and seems to tell that they will go back to
+# winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
+# clocks back 60 minutes).
+#
+# 
+# http://sana.sy/ara/2/2008/10/07/195459.htm
+# 
+
 Rule	Syria	2008	max	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2008	max	-	Oct	1	0:00	0	-
+Rule	Syria	2008	max	-	Nov	1	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq

==== //depot/projects/mpsafetty/share/zoneinfo/southamerica#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# @(#)southamerica	8.29
+# @(#)southamerica	8.30
 # 
 
 # This data is by no means authoritative; if you think you know better,
@@ -177,6 +177,22 @@
 # http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
 # 
 
+# From Rodrigo Severo (2008-10-06):
+# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+# ...

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

From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 07:00:21 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A65271065690; Thu, 16 Oct 2008 07:00:21 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6955D1065677
	for ; Thu, 16 Oct 2008 07:00:21 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5856E8FC13
	for ; Thu, 16 Oct 2008 07:00:21 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G70Lex082116
	for ; Thu, 16 Oct 2008 07:00:21 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G70LGV082114
	for perforce@freebsd.org; Thu, 16 Oct 2008 07:00:21 GMT
	(envelope-from ed@FreeBSD.org)
Date: Thu, 16 Oct 2008 07:00:21 GMT
Message-Id: <200810160700.m9G70LGV082114@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151441 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 16 Oct 2008 07:00:21 -0000

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

Change 151441 by ed@ed_dull on 2008/10/16 06:59:38

	Revert the ucom(4) changes. It seems the USB folks are already
	taking care of ucom(4) again.

Affected files ...

.. //depot/projects/mpsafetty/sys/dev/usb/ucom.c#8 integrate

Differences ...

==== //depot/projects/mpsafetty/sys/dev/usb/ucom.c#8 (text+ko) ====

@@ -128,7 +128,6 @@
 static tsw_open_t ucomtty_open;
 static tsw_close_t ucomtty_close;
 static tsw_outwakeup_t ucomtty_outwakeup;
-static tsw_inwakeup_t ucomtty_inwakeup;
 static tsw_ioctl_t ucomtty_ioctl;
 static tsw_param_t ucomtty_param;
 static tsw_modem_t ucomtty_modem;
@@ -139,7 +138,6 @@
 	.tsw_open	= ucomtty_open,
 	.tsw_close	= ucomtty_close,
 	.tsw_outwakeup	= ucomtty_outwakeup,
-	.tsw_inwakeup	= ucomtty_inwakeup,
 	.tsw_ioctl	= ucomtty_ioctl,
 	.tsw_param	= ucomtty_param,
 	.tsw_modem	= ucomtty_modem,
@@ -499,6 +497,10 @@
 		return (error);
 	}
 
+#if 0
+	ttsetwater(tp);
+#endif
+
 	if (t->c_cflag & CRTS_IFLOW) {
 		sc->sc_state |= UCS_RTS_IFLOW;
 	} else if (sc->sc_state & UCS_RTS_IFLOW) {
@@ -506,6 +508,10 @@
 		(void)ucomtty_modem(tp, SER_RTS, 0);
 	}
 
+#if 0
+	ttyldoptim(tp);
+#endif
+
 	uerr = ucomstartread(sc);
 	if (uerr != USBD_NORMAL_COMPLETION)
 		return (EIO);
@@ -545,6 +551,24 @@
 	if (sc->sc_oxfer == NULL)
 		return;
 
+	/* XXX: hardware flow control. We should use inwakeup here. */
+#if 0
+	if (tp->t_state & TS_TBLOCK) {
+		if (ISSET(sc->sc_mcr, SER_RTS) &&
+		    ISSET(sc->sc_state, UCS_RTS_IFLOW)) {
+			DPRINTF(("ucomtty_outwakeup: clear RTS\n"));
+			(void)ucomtty_modem(tp, 0, SER_RTS);
+		}
+	} else {
+		if (!ISSET(sc->sc_mcr, SER_RTS) &&
+		    tp->t_rawq.c_cc <= tp->t_ilowat &&
+		    ISSET(sc->sc_state, UCS_RTS_IFLOW)) {
+			DPRINTF(("ucomtty_outwakeup: set RTS\n"));
+			(void)ucomtty_modem(tp, SER_RTS, 0);
+		}
+	}
+#endif
+
 	if (sc->sc_state & UCS_TXBUSY)
 		return;
 
@@ -574,22 +598,35 @@
 	}
 }
 
+#if 0
 static void
-ucomtty_inwakeup(struct tty *tp)
+ucomstop(struct tty *tp, int flag)
 {
 	struct ucom_softc *sc = tty_softc(tp);
+	int s;
 
-	DPRINTF(("ucomtty_inwakeup: sc = %p\n", sc));
+	DPRINTF(("ucomstop: %d\n", flag));
 
-	if (sc->sc_dying)
-		return;
+	if ((flag & FREAD) && (sc->sc_state & UCS_RXSTOP) == 0) {
+		DPRINTF(("ucomstop: read\n"));
+		ucomstopread(sc);
+		ucomstartread(sc);
+	}
 
-	if (!ISSET(sc->sc_mcr, SER_RTS) &&
-	    ISSET(sc->sc_state, UCS_RTS_IFLOW)) {
-		DPRINTF(("ucomtty_outwakeup: set RTS\n"));
-		(void)ucomtty_modem(tp, SER_RTS, 0);
+	if (flag & FWRITE) {
+		DPRINTF(("ucomstop: write\n"));
+		if (ISSET(tp->t_state, TS_BUSY)) {
+			/* XXX do what? */
+			if (!ISSET(tp->t_state, TS_TTSTOP))
+				SET(tp->t_state, TS_FLUSH);
+		}
 	}
+
+	ucomtty_outwakeup(tp);
+
+	DPRINTF(("ucomstop: done\n"));
 }
+#endif
 
 static void
 ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
@@ -627,6 +664,13 @@
 		    cc, sc->sc_obufactive);
 
 	sc->sc_state &= ~UCS_TXBUSY;
+#if 0
+	CLR(tp->t_state, TS_BUSY);
+	if (ISSET(tp->t_state, TS_FLUSH))
+		CLR(tp->t_state, TS_FLUSH);
+	else
+		ndflush(&tp->t_outq, cc);
+#endif
 	ucomtty_outwakeup(tp);
 }
 
@@ -701,11 +745,9 @@
 	while (cc > 0) {
 		DPRINTFN(7, ("ucomreadcb: char = 0x%02x\n", *cp));
 		if (ttydisc_rint(tp, *cp, 0) == -1) {
-			if (ISSET(sc->sc_mcr, SER_RTS) &&
-			    ISSET(sc->sc_state, UCS_RTS_IFLOW)) {
-				DPRINTF(("ucomtty_outwakeup: clear RTS\n"));
-				(void)ucomtty_modem(tp, 0, SER_RTS);
-			}
+			/* XXX what should we do? */
+			printf("%s: lost %d chars\n",
+			       device_get_nameunit(sc->sc_dev), cc);
 			break;
 		}
 		cc--;
@@ -719,6 +761,12 @@
 		printf("%s: read start failed\n", device_get_nameunit(sc->sc_dev));
 		/* XXX what should we dow now? */
 	}
+
+#if 0
+	if ((sc->sc_state & UCS_RTS_IFLOW) && !ISSET(sc->sc_mcr, SER_RTS)
+	    && !(tp->t_state & TS_TBLOCK))
+		ucomtty_modem(tp, SER_RTS, 0);
+#endif
 }
 
 static void

From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 07:23:45 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7E66F10656E5; Thu, 16 Oct 2008 07:23:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41A481065690
	for ; Thu, 16 Oct 2008 07:23:45 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 222FC8FC33
	for ; Thu, 16 Oct 2008 07:23:45 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9G7Njxt084976
	for ; Thu, 16 Oct 2008 07:23:45 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9G7NjWD084974
	for perforce@freebsd.org; Thu, 16 Oct 2008 07:23:45 GMT
	(envelope-from ed@FreeBSD.org)
Date: Thu, 16 Oct 2008 07:23:45 GMT
Message-Id: <200810160723.m9G7NjWD084974@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151442 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 16 Oct 2008 07:23:45 -0000

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

Change 151442 by ed@ed_dull on 2008/10/16 07:23:11

	Finally take some time to write the ttydisc_getc(9) manpage.

Affected files ...

.. //depot/projects/mpsafetty/share/man/man9/Makefile#9 edit
.. //depot/projects/mpsafetty/share/man/man9/ttydisc_getc.9#3 edit

Differences ...

==== //depot/projects/mpsafetty/share/man/man9/Makefile#9 (text+ko) ====

@@ -1180,6 +1180,7 @@
 	timeout.9 untimeout.9
 MLINKS+=tty_alloc.9 tty_makedev.9 \
 	tty_alloc.9 tty_rel_gone.9 \
+	ttydisc_getc.9 ttydisc_getc_poll.9 \
 	ttydisc_getc.9 ttydisc_getc_uio.9 \
 	ttydisc_rint.9 ttydisc_can_bypass.9 \
 	ttydisc_rint.9 ttydisc_rint_bypass.9 \

==== //depot/projects/mpsafetty/share/man/man9/ttydisc_getc.9#3 (text+ko) ====

@@ -29,15 +29,73 @@
 .Os
 .Sh NAME
 .Nm ttydisc_getc ,
+.Nm ttydisc_getc_poll ,
 .Nm ttydisc_getc_uio
 .Nd "TTY character transmission"
 .Sh SYNOPSIS
 .In sys/tty.h
 .Ft size_t
 .Fn ttydisc_getc "struct tty *tp" "void *buf" "size_t len"
+.Ft size_t
+.Fn ttydisc_getc_poll "struct tty *tp"
 .Ft int
 .Fn ttydisc_getc_uio "struct tty *tp" "struct uio *uio"
 .Sh DESCRIPTION
+The 
+.Fn ttydisc_getc
+and
+.Fn ttydisc_getc_uio
+are used to obtain data from the output buffer of TTY
+.Fa tp .
+This data can then be physically sent by the device driver.
+.Pp
+The
+.Fn ttydisc_getc
+function copies
+.Fa len
+bytes of data to
+.Fa buf .
+The TTY lock must be held when calling
+.Fn ttydisc_getc .
+.Pp
+The
+.Fn ttydisc_getc_uio
+is an optimised version that copies data directly to userspace.
+The
+.Fa uio
+argument points to an I/O vector.
+Like
+.Fn ttydisc_getc ,
+this function also requires the TTY lock to be held, but during its
+invocation may be dropped, which is required to copy data to userspace.
+.Pp
+The
+.Fn ttydisc_getc_poll
+function returns an estimate of the amount of data that is stored in the
+output buffers of TTY
+.Fa tp .
+Device drivers should not rely on it being accurate.
+It should only be used by drivers like
+.Xr pts 4
+to implement
+.Xr select 2 .
+.Sh RETURN VALUES
+The
+.Fn ttydisc_getc
+function returns the amount of bytes that have been copied to
+.Fa buf .
+.Pp
+The
+.Fn ttydisc_getc_poll
+function returns the amount of bytes that are still present inside the
+TTY output buffers.
+.Pp
+The
+.Fn ttydisc_getc_uio
+function returns 0 when data has been copied to userspace successfully.
+It may return an error number when an error occurs, such as a failing
+call to
+.Xr uiomove 9 .
 .Sh SEE ALSO
 .Xr tty_alloc 9 ,
 .Xr tty_lock 9 ,

From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 13:29:00 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E940E106568C; Thu, 16 Oct 2008 13:28:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB60C1065687
	for ; Thu, 16 Oct 2008 13:28:59 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 981A18FC08
	for ; Thu, 16 Oct 2008 13:28:59 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9GDSxhT040417
	for ; Thu, 16 Oct 2008 13:28:59 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9GDSw9r040415
	for perforce@freebsd.org; Thu, 16 Oct 2008 13:28:58 GMT
	(envelope-from zec@tel.fer.hr)
Date: Thu, 16 Oct 2008 13:28:58 GMT
Message-Id: <200810161328.m9GDSw9r040415@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151453 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 16 Oct 2008 13:29:00 -0000

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

Change 151453 by zec@zec_tpx32 on 2008/10/16 13:28:21

	IFC @ 151449

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_spi.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/include/cpufunc.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/intr.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/resource.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/Makefile#4 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/at91/boot2/boot2.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/at91/boot2/centipad_board.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/at91/boot2/kb920x_board.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/Makefile.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/common/load_elf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#7 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/bootinfo64.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/api_public.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#10 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#12 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#4 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options.arm#2 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_aereg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_aevar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/aha/aha_isa.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/aha/aha_mca.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-chipset.c#9 delete
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-sata.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acard.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-amd.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ati.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ite.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-micron.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-national.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/psm.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/ati_pcigart.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_agpsupport.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_atomic.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_auth.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_context.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_dma.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drawable.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_fops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_ioctl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_linux_list.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_memory.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sysctl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_vm.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drm.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_suspend.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/tdfx_drv.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hptiop/hptiop.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jme.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jmereg.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/mii/atphy.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/bridge.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcbrvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcvar.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sym/sym_hipd.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_mv.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ehcivar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ohci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/slhci_pccard.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/u3g.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/usb/uark.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ubsa.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/ukbd.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/umass.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/umct.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_node.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/fdescfs/fdesc_vnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_io.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/portalfs/portal_vnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_vfs.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_vfs.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#8 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/vm_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_firmware.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_sockbuf.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/libkern/qdivrem.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/Makefile#9 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ae/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ata/ata/Makefile#2 delete
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atacore/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atadevel/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atadevel/ata-devel.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/Makefile.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ehci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/ohci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/slhci/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/u3g/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/uhci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#3 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/wpifw/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netflow/ng_netflow.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/ofw_machdep.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/nexusvar.h#2 delete
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pci.c#2 delete
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pci.h#2 delete
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_pcibus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/ata_kauai.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/grackle.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/macio.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/openpic_macio.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/uninorth.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/uninorthvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/psim/iobus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/bufobj.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/pmc.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/proc.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/tty.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/un.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#4 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.258 2008/09/11 18:33:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
@@ -280,6 +280,14 @@
 	 */
 	bcopy(td0->td_frame, td->td_frame, sizeof(struct trapframe));
 
+	/* If the current thread has the trap bit set (i.e. a debugger had
+	 * single stepped the process to the system call), we need to clear
+	 * the trap flag from the new frame. Otherwise, the new thread will
+	 * receive a (likely unexpected) SIGTRAP when it executes the first
+	 * instruction after returning to userland.
+	 */
+	td->td_frame->tf_rflags &= ~PSL_T;
+
 	/*
 	 * Set registers for trampoline to user mode.  Leave space for the
 	 * return address on stack.  These are the kernel mode register values.

==== //depot/projects/vimage-commit2/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.507 2008/08/20 08:31:58 ed Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.508 2008/10/03 10:31:31 stas Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -200,6 +200,7 @@
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
 device		miibus		# MII bus support
+device		ae		# Attansic/Atheros L2 FastEthernet
 device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet

==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#2 (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.17 2008/04/08 09:45:47 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.18 2008/10/14 07:59:23 kib Exp $
  */
 
 #ifndef _AMD64_LINUX_H_
@@ -880,4 +880,15 @@
 	(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES |	\
 	LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
 
+/* robust futexes */
+struct linux_robust_list {
+	l_uintptr_t			next;
+};
+
+struct linux_robust_list_head {
+	struct linux_robust_list	list;
+	l_ulong				futex_offset;
+	l_uintptr_t			pending_list;
+};
+
 #endif /* !_AMD64_LINUX_H_ */

==== //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.38 2008/03/12 15:31:37 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.39 2008/10/13 18:59:59 raj Exp $");
 
 /*
  * ARM bus dma support routines
@@ -629,6 +629,8 @@
 			newmap->allocbuffer = tmpaddr;
 			cpu_idcache_wbinv_range((vm_offset_t)*vaddr, 
 			    dmat->maxsize);
+			cpu_l2cache_wbinv_range((vm_offset_t)*vaddr,
+			    dmat->maxsize);
 			*vaddr = tmpaddr;
 		} else
 			newmap->origbuffer = newmap->allocbuffer = NULL;

==== //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc.c#2 (text+ko) ====

@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.22 2007/11/28 22:55:55 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.23 2008/10/13 18:16:54 raj Exp $");
 
 #include 
 #include 
@@ -357,6 +357,66 @@
 	arm10_setup			/* cpu setup		*/
 
 };
+
+struct cpu_functions feroceon_cpufuncs = {
+	/* CPU functions */
+
+	cpufunc_id,			/* id			*/
+	cpufunc_nullop,			/* cpwait		*/
+
+	/* MMU functions */
+
+	cpufunc_control,		/* control		*/
+	cpufunc_domains,		/* Domain		*/
+	feroceon_setttb,		/* Setttb		*/
+	cpufunc_faultstatus,		/* Faultstatus		*/
+	cpufunc_faultaddress,		/* Faultaddress		*/
+
+	/* TLB functions */
+
+	armv4_tlb_flushID,		/* tlb_flushID		*/
+	arm10_tlb_flushID_SE,		/* tlb_flushID_SE	*/
+	armv4_tlb_flushI,		/* tlb_flushI		*/
+	arm10_tlb_flushI_SE,		/* tlb_flushI_SE	*/
+	armv4_tlb_flushD,		/* tlb_flushD		*/
+	armv4_tlb_flushD_SE,		/* tlb_flushD_SE	*/
+
+	/* Cache operations */
+
+	armv5_ec_icache_sync_all,	/* icache_sync_all	*/
+	armv5_ec_icache_sync_range,	/* icache_sync_range	*/
+
+	armv5_ec_dcache_wbinv_all,	/* dcache_wbinv_all	*/
+	feroceon_dcache_wbinv_range,	/* dcache_wbinv_range	*/
+	feroceon_dcache_inv_range,	/* dcache_inv_range	*/
+	feroceon_dcache_wb_range,	/* dcache_wb_range	*/
+
+	armv5_ec_idcache_wbinv_all,	/* idcache_wbinv_all	*/
+	feroceon_idcache_wbinv_range,	/* idcache_wbinv_all	*/
+
+	feroceon_l2cache_wbinv_all,	/* l2cache_wbinv_all    */
+	feroceon_l2cache_wbinv_range,	/* l2cache_wbinv_range  */
+	feroceon_l2cache_inv_range,	/* l2cache_inv_range    */
+	feroceon_l2cache_wb_range,	/* l2cache_wb_range     */
+
+	/* Other functions */
+
+	cpufunc_nullop,			/* flush_prefetchbuf	*/
+	armv4_drain_writebuf,		/* drain_writebuf	*/
+	cpufunc_nullop,			/* flush_brnchtgt_C	*/
+	(void *)cpufunc_nullop,		/* flush_brnchtgt_E	*/
+
+	(void *)cpufunc_nullop,		/* sleep		*/
+
+	/* Soft functions */
+
+	cpufunc_null_fixup,		/* dataabt_fixup	*/
+	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
+
+	arm10_context_switch,		/* context_switch	*/
+
+	arm10_setup			/* cpu setup		*/
+};
 #endif /* CPU_ARM9E || CPU_ARM10 */
 
 #ifdef CPU_ARM10
@@ -933,9 +993,36 @@
 	}
 #endif /* CPU_ARM9 */
 #if defined(CPU_ARM9E) || defined(CPU_ARM10)
-	if (cputype == CPU_ID_ARM926EJS ||
-	    cputype == CPU_ID_ARM1026EJS) {
-		cpufuncs = armv5_ec_cpufuncs;
+	if (cputype == CPU_ID_ARM926EJS || cputype == CPU_ID_ARM1026EJS ||
+	    cputype == CPU_ID_MV88FR131 || cputype == CPU_ID_MV88FR571_VD ||
+	    cputype == CPU_ID_MV88FR571_41) {
+		if (cputype == CPU_ID_MV88FR131 ||
+		    cputype == CPU_ID_MV88FR571_VD ||
+		    cputype == CPU_ID_MV88FR571_41) {
+
+			cpufuncs = feroceon_cpufuncs;
+			/*
+			 * Workaround for Marvell MV78100 CPU: Cache prefetch
+			 * mechanism may affect the cache coherency validity,
+			 * so it needs to be disabled.
+			 *
+			 * Refer to errata document MV-S501058-00C.pdf (p. 3.1
+			 * L2 Prefetching Mechanism) for details.
+			 */
+			if (cputype == CPU_ID_MV88FR571_VD ||
+			    cputype == CPU_ID_MV88FR571_41) {
+				feroceon_control_ext(0xffffffff,
+				    FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
+				    FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN |
+				    FC_L2_PREF_DIS);
+			} else {
+				feroceon_control_ext(0xffffffff,
+				    FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
+				    FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN);
+			}
+		} else
+			cpufuncs = armv5_ec_cpufuncs;
+
 		cpu_reset_needs_v4_MMU_disable = 1;	/* V4 or higher */
 		get_cachetype_cp15();
 		pmap_pte_init_generic();

==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $");
 
 #include 
 #include 
@@ -215,6 +215,7 @@
 {
 
 	cpu_idcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	cpu_tlb_flushID();
 	return (0);
 }

==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.21 2008/08/04 14:37:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $");
 #include 
 #include 
 #include 
@@ -73,6 +73,8 @@
 #endif
 #ifdef CPU_XSCALE_81342
 #define cpu_l2cache_wbinv_all	xscalec3_l2cache_purge
+#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
+#define cpu_l2cache_wbinv_all	feroceon_l2cache_wbinv_all
 #else
 #define cpu_l2cache_wbinv_all()	
 #endif

==== //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.12 2008/10/13 18:59:59 raj Exp $");
 #include 
 #include 
 #include 
@@ -79,7 +79,9 @@
 ASSYM(CF_CONTROL, offsetof(struct cpu_functions, cf_control));
 ASSYM(CF_CONTEXT_SWITCH, offsetof(struct cpu_functions, cf_context_switch));
 ASSYM(CF_DCACHE_WB_RANGE, offsetof(struct cpu_functions, cf_dcache_wb_range));
+ASSYM(CF_L2CACHE_WB_RANGE, offsetof(struct cpu_functions, cf_l2cache_wb_range));
 ASSYM(CF_IDCACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_idcache_wbinv_all));
+ASSYM(CF_L2CACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_l2cache_wbinv_all));
 ASSYM(CF_TLB_FLUSHID_SE, offsetof(struct cpu_functions, cf_tlb_flushID_SE));
 ASSYM(CF_ICACHE_SYNC, offsetof(struct cpu_functions, cf_icache_sync_all));
 

==== //depot/projects/vimage-commit2/src/sys/arm/arm/identcpu.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.13 2008/05/23 04:03:53 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.14 2008/10/13 18:16:54 raj Exp $");
 #include 
 #include 
 #include 
@@ -75,7 +75,8 @@
 	CPU_CLASS_ARM10EJ,
 	CPU_CLASS_SA1,
 	CPU_CLASS_XSCALE,
-	CPU_CLASS_ARM11J
+	CPU_CLASS_ARM11J,
+	CPU_CLASS_MARVELL
 };
 
 static const char * const generic_steppings[16] = {
@@ -304,6 +305,15 @@
 	{ CPU_ID_ARM1136JSR1,	CPU_CLASS_ARM11J,	"ARM1136J-S R1",
 	  generic_steppings },
 
+	{ CPU_ID_MV88FR131,	CPU_CLASS_MARVELL,	"Feroceon 88FR131",
+	  generic_steppings },
+
+	{ CPU_ID_MV88FR571_VD,	CPU_CLASS_MARVELL,	"Feroceon 88FR571-VD",
+	  generic_steppings },
+
+	{ CPU_ID_MV88FR571_41,	CPU_CLASS_MARVELL,	"Early Feroceon 88FR571",
+	  generic_steppings },
+
 	{ 0, CPU_CLASS_NONE, NULL, NULL }
 };
 

==== //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #include 
 #include 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.19 2008/04/08 10:24:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.21 2008/10/14 10:11:14 raj Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
@@ -66,6 +66,13 @@
 ENTRY_NP(btext)
 
 ASENTRY_NP(_start)
+
+/*
+ * Move metadata ptr to r12 (ip)
+ */
+
+	mov	ip, r0
+
 #if defined (FLASHADDR) && defined(LOADERRAMADDR)
 	/* Check if we're running from flash. */
 	ldr	r7, =FLASHADDR
@@ -170,6 +177,8 @@
 	ldr	pc, .Lvirt_done
 
 virt_done:
+	mov	r0, ip			/* Load argument: metadata ptr */
+
 	mov	fp, #0			/* trace back starts here */
 	bl	_C_LABEL(initarm)	/* Off we go */
 
@@ -245,6 +254,8 @@
 	ldr	r0, .Lcpufuncs
 	mov	lr, pc
 	ldr	pc, [r0, #CF_IDCACHE_WBINV_ALL]
+	mov	lr, pc
+	ldr	pc, [r0, #CF_L2CACHE_WBINV_ALL]
 
 	/*
 	 * Load the cpu_reset_needs_v4_MMU_disable flag to determine if it's

==== //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#3 (text+ko) ====

@@ -147,10 +147,11 @@
 #include "opt_vm.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.104 2008/10/13 18:59:59 raj Exp $");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1196,27 +1197,104 @@
 }
 
 static PMAP_INLINE void
+pmap_l2cache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
+{
+	vm_size_t rest;
+	pd_entry_t *pde;
+	pt_entry_t *ptep;
+
+	rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+	while (len > 0) {
+		CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d "
+		    "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+		if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+		    cpu_l2cache_wb_range(va, rest);
+
+		len -= rest;
+		va += rest;
+
+		rest = MIN(PAGE_SIZE, len);
+	}
+}
+
+static PMAP_INLINE void
 pmap_idcache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
 {
 
-	if (pmap_is_current(pm))
+	if (pmap_is_current(pm)) {
 		cpu_idcache_wbinv_range(va, len);
+		pmap_l2cache_wbinv_range(pm, va, len);
+	}
 }
 
 static PMAP_INLINE void
-pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len,
-    boolean_t do_inv, boolean_t rd_only)
+pmap_l2cache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len)
+{
+	vm_size_t rest;
+	pd_entry_t *pde;
+	pt_entry_t *ptep;
+
+	rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+	while (len > 0) {
+		CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
+		    "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+		if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+		    cpu_l2cache_wb_range(va, rest);
+
+		len -= rest;
+		va += rest;
+
+		rest = MIN(PAGE_SIZE, len);
+	}
+}
+
+static PMAP_INLINE void
+pmap_l2cache_inv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
 {
+	vm_size_t rest;
+	pd_entry_t *pde;
+	pt_entry_t *ptep;
+
+	rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+	while (len > 0) {
+		CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
+		    "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+		if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) 
+		    cpu_l2cache_inv_range(va, rest);
+
+		len -= rest;
+		va += rest;
 
+		rest = MIN(PAGE_SIZE, len);
+	}
+}
+
+static PMAP_INLINE void
+pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv,
+    boolean_t rd_only)
+{
+	CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x "
+	    "len 0x%x ", pm, pm == pmap_kernel(), va, len);
+	CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only);
+
 	if (pmap_is_current(pm)) {
 		if (do_inv) {
-			if (rd_only)
+			if (rd_only) {
 				cpu_dcache_inv_range(va, len);
-			else
+				pmap_l2cache_inv_range(pm, va, len);
+			}
+			else {
 				cpu_dcache_wbinv_range(va, len);
+				pmap_l2cache_wbinv_range(pm, va, len);
+			}
 		} else
-		if (!rd_only)
+		if (!rd_only) {
 			cpu_dcache_wb_range(va, len);
+			pmap_l2cache_wb_range(pm, va, len);
+		}
 	}
 }
 
@@ -1224,16 +1302,20 @@
 pmap_idcache_wbinv_all(pmap_t pm)
 {
 
-	if (pmap_is_current(pm))
+	if (pmap_is_current(pm)) {
 		cpu_idcache_wbinv_all();
+		cpu_l2cache_wbinv_all();
+	}
 }
 
 static PMAP_INLINE void
 pmap_dcache_wbinv_all(pmap_t pm)
 {
 
-	if (pmap_is_current(pm))
+	if (pmap_is_current(pm)) {
 		cpu_dcache_wbinv_all();
+		cpu_l2cache_wbinv_all();
+	}
 }
 
 /*
@@ -2169,6 +2251,8 @@
 			PTE_SYNC(pdep);
 			cpu_dcache_wbinv_range((vm_offset_t)pdep,
 			    sizeof(*pdep));
+			cpu_l2cache_wbinv_range((vm_offset_t)pdep,
+			    sizeof(*pdep));
 			rv = 1;
 		}
 	} else {
@@ -2185,6 +2269,8 @@
 			PTE_SYNC(ptep);
 			cpu_dcache_wbinv_range((vm_offset_t)ptep,
 			    sizeof(*ptep));
+			cpu_l2cache_wbinv_range((vm_offset_t)ptep,
+			    sizeof(*ptep));
 			rv = 1;
 		}
 	}
@@ -2337,6 +2423,7 @@
 	}
 
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	cpu_tlb_flushID();
 	cpu_cpwait();
 
@@ -2373,6 +2460,7 @@
 	mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF);
 	pmap_init_l1(l1, kernel_l1pt);
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 
 	virtual_avail = round_page(virtual_avail);
 	virtual_end = lastaddr;
@@ -2402,6 +2490,7 @@
 	struct pcb *pcb;
 	
 	pmap_idcache_wbinv_all(pmap);
+	cpu_l2cache_wbinv_all();
 	pmap_tlb_flushID(pmap);
 	cpu_cpwait();
 	if (vector_page < KERNBASE) {
@@ -2589,6 +2678,7 @@
 	 * rarely
 	 */
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	cpu_tlb_flushD();
 	cpu_cpwait();
 	kernel_vm_end = pmap_curmaxkvaddr;
@@ -2614,6 +2704,7 @@
 	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 	cpu_idcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) {
 		if (pv->pv_flags & PVF_WIRED) {
 			/* The page is wired, cannot remove it now. */
@@ -2726,6 +2817,7 @@
 	    (uint32_t) pte, opte, *pte));
 	if (l2pte_valid(opte)) {
 		cpu_dcache_wbinv_range(va, PAGE_SIZE);
+		cpu_l2cache_wbinv_range(va, PAGE_SIZE);
 		cpu_tlb_flushD_SE(va);
 		cpu_cpwait();
 	} else {
@@ -2784,6 +2876,7 @@
 	opte = *pte;
 	if (l2pte_valid(opte)) {
 		cpu_dcache_wbinv_range(va, PAGE_SIZE);
+		cpu_l2cache_wbinv_range(va, PAGE_SIZE);
 		cpu_tlb_flushD_SE(va);
 		cpu_cpwait();
 		*pte = 0;
@@ -3052,6 +3145,9 @@
 	u_int flags;
 	int flush;
 
+	CTR4(KTR_PMAP, "pmap_protect: pmap %p sva 0x%08x eva 0x%08x prot %x",
+	    pm, sva, eva, prot);
+
 	if ((prot & VM_PROT_READ) == 0) {
 		pmap_remove(pm, sva, eva);
 		return;
@@ -3286,9 +3382,11 @@
 		 */
 		if (pmap_is_current(pmap) &&
 		    (oflags & PVF_NC) == 0 &&
-			    (opte & L2_S_PROT_W) != 0 &&
-			    (prot & VM_PROT_WRITE) == 0)
+		    (opte & L2_S_PROT_W) != 0 &&
+		    (prot & VM_PROT_WRITE) == 0) {
 			cpu_dcache_wb_range(va, PAGE_SIZE);
+			pmap_l2cache_wb_range(pmap, va, PAGE_SIZE);
+		}
 	} else {
 		/*
 		 * New mapping, or changing the backing page
@@ -3777,11 +3875,15 @@
 					total++;
 			   		if (is_exec) {
         					cpu_idcache_wbinv_range(sva,
-								 PAGE_SIZE);
+						    PAGE_SIZE);
+						cpu_l2cache_wbinv_range(sva,
+						    PAGE_SIZE);
 						cpu_tlb_flushID_SE(sva);
 			   		} else if (is_refd) {
 						cpu_dcache_wbinv_range(sva,
-								 PAGE_SIZE);
+						    PAGE_SIZE);
+						cpu_l2cache_wbinv_range(sva,
+						    PAGE_SIZE);
 						cpu_tlb_flushD_SE(sva);
 					}
 				} else if (total == PMAP_REMOVE_CLEAN_LIST_SIZE) {
@@ -3789,6 +3891,7 @@
 					 * for a current pmap
 					 */
 					cpu_idcache_wbinv_all();
+					cpu_l2cache_wbinv_all();
 					flushall = 1;
 					total++;
 				}
@@ -3842,29 +3945,29 @@
 	if (off || size != PAGE_SIZE) {
 		bzero(dstpg + off, size);
 		cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size);
+		cpu_l2cache_wbinv_range((vm_offset_t)(dstpg + off), size);
 	} else {
 		bzero_page((vm_offset_t)dstpg);
 		cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
+		cpu_l2cache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
 	}
 #else
 

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

From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 13:39:11 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E6A5F1065690; Thu, 16 Oct 2008 13:39:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A95BE10656AC
	for ; Thu, 16 Oct 2008 13:39:10 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 95D8D8FC2D
	for ; Thu, 16 Oct 2008 13:39:10 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9GDdAUg041208
	for ; Thu, 16 Oct 2008 13:39:10 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9GDdAYb041206
	for perforce@freebsd.org; Thu, 16 Oct 2008 13:39:10 GMT
	(envelope-from zec@tel.fer.hr)
Date: Thu, 16 Oct 2008 13:39:10 GMT
Message-Id: <200810161339.m9GDdAYb041206@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151455 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 16 Oct 2008 13:39:11 -0000

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

Change 151455 by zec@zec_tpx32 on 2008/10/16 13:38:41

	IFC @ 151449

Affected files ...

.. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#6 integrate
.. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#10 integrate
.. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#7 integrate
.. //depot/projects/vimage/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch
.. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/arm/genassym.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/arm/locore.S#6 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/arm/arm/swtch.S#6 integrate
.. //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#1 branch
.. //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#1 branch
.. //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#1 branch
.. //depot/projects/vimage/src/sys/arm/include/armreg.h#4 integrate
.. //depot/projects/vimage/src/sys/arm/include/bootinfo.h#1 branch
.. //depot/projects/vimage/src/sys/arm/include/cpufunc.h#5 integrate
.. //depot/projects/vimage/src/sys/arm/include/intr.h#7 integrate
.. //depot/projects/vimage/src/sys/arm/include/metadata.h#2 integrate
.. //depot/projects/vimage/src/sys/arm/include/resource.h#2 integrate
.. //depot/projects/vimage/src/sys/arm/mv/bus_space.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/common.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/discovery/db78xxx.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/discovery/discovery.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/discovery/files.db78xxx#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/discovery/std.db78xxx#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/files.mv#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/gpio.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/ic.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/mvreg.h#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/mvvar.h#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/obio.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/orion/db88f5xxx.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/orion/files.db88f5xxx#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/orion/orion.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/orion/std.db88f5xxx#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/rtc.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/std.mv#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/timer.c#1 branch
.. //depot/projects/vimage/src/sys/arm/mv/twsi.c#1 branch
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#8 integrate
.. //depot/projects/vimage/src/sys/boot/Makefile#5 integrate
.. //depot/projects/vimage/src/sys/boot/arm/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/boot/arm/uboot/Makefile#1 branch
.. //depot/projects/vimage/src/sys/boot/arm/uboot/conf.c#1 branch
.. //depot/projects/vimage/src/sys/boot/arm/uboot/help.uboot#1 branch
.. //depot/projects/vimage/src/sys/boot/arm/uboot/ldscript.arm#1 branch
.. //depot/projects/vimage/src/sys/boot/arm/uboot/start.S#1 branch
.. //depot/projects/vimage/src/sys/boot/arm/uboot/version#1 branch
.. //depot/projects/vimage/src/sys/boot/common/Makefile.inc#2 integrate
.. //depot/projects/vimage/src/sys/boot/common/load_elf.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/ficl/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/ofw/libofw/ofw_disk.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch
.. //depot/projects/vimage/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch
.. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#5 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.c#6 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_futex.h#5 integrate
.. //depot/projects/vimage/src/sys/conf/Makefile.arm#7 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#33 integrate
.. //depot/projects/vimage/src/sys/conf/files#39 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#13 integrate
.. //depot/projects/vimage/src/sys/conf/ldscript.mips.cfe#2 integrate
.. //depot/projects/vimage/src/sys/conf/options.arm#7 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#9 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#20 delete
.. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#15 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-sata.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acard.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-amd.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ati.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ite.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-micron.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-national.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#1 branch
.. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#16 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bgereg.h#12 integrate
.. //depot/projects/vimage/src/sys/dev/bm/if_bm.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/ati_pcigart.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drmP.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_auth.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_context.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_dma.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drawable.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_fops.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_ioctl.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_linux_list.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_memory.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/jme/if_jme.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/jme/if_jmereg.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/mge/if_mge.c#1 branch
.. //depot/projects/vimage/src/sys/dev/mge/if_mgevar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/mmc/bridge.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmcbrvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmcreg.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/powermac_nvram/powermac_nvram.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#20 integrate
.. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_bus_mbus.c#1 branch
.. //depot/projects/vimage/src/sys/dev/uart/uart_cpu_mv.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb/ehci.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ehci_mbus.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ehcivar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ohci_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/slhci_pccard.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/u3g.c#1 branch
.. //depot/projects/vimage/src/sys/dev/usb/uark.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ucom.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umass.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umct.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#31 integrate
.. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/hpfs/hpfs_vfsops.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#15 integrate
.. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/nwfs/nwfs_io.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/portalfs/portal_vnops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/geom/geom_vfs.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/geom_vfs.h#2 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#10 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#7 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#25 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux.h#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#25 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thr.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/subr_witness.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#23 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#23 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#17 integrate
.. //depot/projects/vimage/src/sys/libkern/qdivrem.c#2 integrate
.. //depot/projects/vimage/src/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/vimage/src/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#6 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#30 integrate
.. //depot/projects/vimage/src/sys/modules/ata/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/ata/ata/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/ata/atacore/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atadevel/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atadevel/ata-devel.c#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/ata/atapci/Makefile.inc#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/Makefile.inc#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataacard/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataadaptec/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataahci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataamd/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataati/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atacenatek/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atacypress/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atacyrix/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataintel/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataite/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atajmicron/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atamarvell/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atamicron/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atanational/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atanetcell/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atanvidia/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atapromise/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atasis/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ata/atapci/chipsets/atavia/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ehci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ohci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/slhci/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/u3g/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/uhci/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/usb/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/netinet/if_ether.c#26 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw.h#20 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#52 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#33 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/ofw_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/nexusvar.h#2 delete
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pci.c#2 delete
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pci.h#2 delete
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_pcibus.c#1 branch
.. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_syscons.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/ata_kauai.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/grackle.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/hrowpic.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/macio.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/openpic_macio.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/uninorth.c#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/uninorthvar.h#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/psim/iobus.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/psim/openpic_iobus.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#15 integrate
.. //depot/projects/vimage/src/sys/sys/bufobj.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/pmc.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#23 integrate
.. //depot/projects/vimage/src/sys/sys/tty.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/vnode.h#12 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#11 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#14 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#17 integrate

Differences ...

==== //depot/projects/vimage/src/sys/amd64/linux32/linux.h#6 (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.17 2008/04/08 09:45:47 kib Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.18 2008/10/14 07:59:23 kib Exp $
  */
 
 #ifndef _AMD64_LINUX_H_
@@ -880,4 +880,15 @@
 	(LINUX_CLONE_VM | LINUX_CLONE_FS | LINUX_CLONE_FILES |	\
 	LINUX_CLONE_SIGHAND | LINUX_CLONE_THREAD)
 
+/* robust futexes */
+struct linux_robust_list {
+	l_uintptr_t			next;
+};
+
+struct linux_robust_list_head {
+	struct linux_robust_list	list;
+	l_ulong				futex_offset;
+	l_uintptr_t			pending_list;
+};
+
 #endif /* !_AMD64_LINUX_H_ */

==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#10 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.38 2008/03/12 15:31:37 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.39 2008/10/13 18:59:59 raj Exp $");
 
 /*
  * ARM bus dma support routines
@@ -629,6 +629,8 @@
 			newmap->allocbuffer = tmpaddr;
 			cpu_idcache_wbinv_range((vm_offset_t)*vaddr, 
 			    dmat->maxsize);
+			cpu_l2cache_wbinv_range((vm_offset_t)*vaddr,
+			    dmat->maxsize);
 			*vaddr = tmpaddr;
 		} else
 			newmap->origbuffer = newmap->allocbuffer = NULL;

==== //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#7 (text+ko) ====

@@ -45,7 +45,7 @@
  * Created      : 30/01/97
  */
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.22 2007/11/28 22:55:55 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.23 2008/10/13 18:16:54 raj Exp $");
 
 #include 
 #include 
@@ -357,6 +357,66 @@
 	arm10_setup			/* cpu setup		*/
 
 };
+
+struct cpu_functions feroceon_cpufuncs = {
+	/* CPU functions */
+
+	cpufunc_id,			/* id			*/
+	cpufunc_nullop,			/* cpwait		*/
+
+	/* MMU functions */
+
+	cpufunc_control,		/* control		*/
+	cpufunc_domains,		/* Domain		*/
+	feroceon_setttb,		/* Setttb		*/
+	cpufunc_faultstatus,		/* Faultstatus		*/
+	cpufunc_faultaddress,		/* Faultaddress		*/
+
+	/* TLB functions */
+
+	armv4_tlb_flushID,		/* tlb_flushID		*/
+	arm10_tlb_flushID_SE,		/* tlb_flushID_SE	*/
+	armv4_tlb_flushI,		/* tlb_flushI		*/
+	arm10_tlb_flushI_SE,		/* tlb_flushI_SE	*/
+	armv4_tlb_flushD,		/* tlb_flushD		*/
+	armv4_tlb_flushD_SE,		/* tlb_flushD_SE	*/
+
+	/* Cache operations */
+
+	armv5_ec_icache_sync_all,	/* icache_sync_all	*/
+	armv5_ec_icache_sync_range,	/* icache_sync_range	*/
+
+	armv5_ec_dcache_wbinv_all,	/* dcache_wbinv_all	*/
+	feroceon_dcache_wbinv_range,	/* dcache_wbinv_range	*/
+	feroceon_dcache_inv_range,	/* dcache_inv_range	*/
+	feroceon_dcache_wb_range,	/* dcache_wb_range	*/
+
+	armv5_ec_idcache_wbinv_all,	/* idcache_wbinv_all	*/
+	feroceon_idcache_wbinv_range,	/* idcache_wbinv_all	*/
+
+	feroceon_l2cache_wbinv_all,	/* l2cache_wbinv_all    */
+	feroceon_l2cache_wbinv_range,	/* l2cache_wbinv_range  */
+	feroceon_l2cache_inv_range,	/* l2cache_inv_range    */
+	feroceon_l2cache_wb_range,	/* l2cache_wb_range     */
+
+	/* Other functions */
+
+	cpufunc_nullop,			/* flush_prefetchbuf	*/
+	armv4_drain_writebuf,		/* drain_writebuf	*/
+	cpufunc_nullop,			/* flush_brnchtgt_C	*/
+	(void *)cpufunc_nullop,		/* flush_brnchtgt_E	*/
+
+	(void *)cpufunc_nullop,		/* sleep		*/
+
+	/* Soft functions */
+
+	cpufunc_null_fixup,		/* dataabt_fixup	*/
+	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
+
+	arm10_context_switch,		/* context_switch	*/
+
+	arm10_setup			/* cpu setup		*/
+};
 #endif /* CPU_ARM9E || CPU_ARM10 */
 
 #ifdef CPU_ARM10
@@ -933,9 +993,36 @@
 	}
 #endif /* CPU_ARM9 */
 #if defined(CPU_ARM9E) || defined(CPU_ARM10)
-	if (cputype == CPU_ID_ARM926EJS ||
-	    cputype == CPU_ID_ARM1026EJS) {
-		cpufuncs = armv5_ec_cpufuncs;
+	if (cputype == CPU_ID_ARM926EJS || cputype == CPU_ID_ARM1026EJS ||
+	    cputype == CPU_ID_MV88FR131 || cputype == CPU_ID_MV88FR571_VD ||
+	    cputype == CPU_ID_MV88FR571_41) {
+		if (cputype == CPU_ID_MV88FR131 ||
+		    cputype == CPU_ID_MV88FR571_VD ||
+		    cputype == CPU_ID_MV88FR571_41) {
+
+			cpufuncs = feroceon_cpufuncs;
+			/*
+			 * Workaround for Marvell MV78100 CPU: Cache prefetch
+			 * mechanism may affect the cache coherency validity,
+			 * so it needs to be disabled.
+			 *
+			 * Refer to errata document MV-S501058-00C.pdf (p. 3.1
+			 * L2 Prefetching Mechanism) for details.
+			 */
+			if (cputype == CPU_ID_MV88FR571_VD ||
+			    cputype == CPU_ID_MV88FR571_41) {
+				feroceon_control_ext(0xffffffff,
+				    FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
+				    FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN |
+				    FC_L2_PREF_DIS);
+			} else {
+				feroceon_control_ext(0xffffffff,
+				    FC_DCACHE_STREAM_EN | FC_WR_ALLOC_EN |
+				    FC_BRANCH_TARG_BUF_DIS | FC_L2CACHE_EN);
+			}
+		} else
+			cpufuncs = armv5_ec_cpufuncs;
+
 		cpu_reset_needs_v4_MMU_disable = 1;	/* V4 or higher */
 		get_cachetype_cp15();
 		pmap_pte_init_generic();

==== //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#4 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.8 2008/09/24 10:14:37 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $");
 
 #include 
 #include 
@@ -215,6 +215,7 @@
 {
 
 	cpu_idcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	cpu_tlb_flushID();
 	return (0);
 }

==== //depot/projects/vimage/src/sys/arm/arm/elf_trampoline.c#6 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.21 2008/08/04 14:37:32 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.22 2008/10/13 20:07:13 raj Exp $");
 #include 
 #include 
 #include 
@@ -73,6 +73,8 @@
 #endif
 #ifdef CPU_XSCALE_81342
 #define cpu_l2cache_wbinv_all	xscalec3_l2cache_purge
+#elif defined(SOC_MV_KIRKWOOD) || defined(SOC_MV_DISCOVERY)
+#define cpu_l2cache_wbinv_all	feroceon_l2cache_wbinv_all
 #else
 #define cpu_l2cache_wbinv_all()	
 #endif

==== //depot/projects/vimage/src/sys/arm/arm/genassym.c#6 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.11 2008/02/05 10:22:33 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/genassym.c,v 1.12 2008/10/13 18:59:59 raj Exp $");
 #include 
 #include 
 #include 
@@ -79,7 +79,9 @@
 ASSYM(CF_CONTROL, offsetof(struct cpu_functions, cf_control));
 ASSYM(CF_CONTEXT_SWITCH, offsetof(struct cpu_functions, cf_context_switch));
 ASSYM(CF_DCACHE_WB_RANGE, offsetof(struct cpu_functions, cf_dcache_wb_range));
+ASSYM(CF_L2CACHE_WB_RANGE, offsetof(struct cpu_functions, cf_l2cache_wb_range));
 ASSYM(CF_IDCACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_idcache_wbinv_all));
+ASSYM(CF_L2CACHE_WBINV_ALL, offsetof(struct cpu_functions, cf_l2cache_wbinv_all));
 ASSYM(CF_TLB_FLUSHID_SE, offsetof(struct cpu_functions, cf_tlb_flushID_SE));
 ASSYM(CF_ICACHE_SYNC, offsetof(struct cpu_functions, cf_icache_sync_all));
 

==== //depot/projects/vimage/src/sys/arm/arm/identcpu.c#5 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.13 2008/05/23 04:03:53 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/identcpu.c,v 1.14 2008/10/13 18:16:54 raj Exp $");
 #include 
 #include 
 #include 
@@ -75,7 +75,8 @@
 	CPU_CLASS_ARM10EJ,
 	CPU_CLASS_SA1,
 	CPU_CLASS_XSCALE,
-	CPU_CLASS_ARM11J
+	CPU_CLASS_ARM11J,
+	CPU_CLASS_MARVELL
 };
 
 static const char * const generic_steppings[16] = {
@@ -304,6 +305,15 @@
 	{ CPU_ID_ARM1136JSR1,	CPU_CLASS_ARM11J,	"ARM1136J-S R1",
 	  generic_steppings },
 
+	{ CPU_ID_MV88FR131,	CPU_CLASS_MARVELL,	"Feroceon 88FR131",
+	  generic_steppings },
+
+	{ CPU_ID_MV88FR571_VD,	CPU_CLASS_MARVELL,	"Feroceon 88FR571-VD",
+	  generic_steppings },
+
+	{ CPU_ID_MV88FR571_41,	CPU_CLASS_MARVELL,	"Early Feroceon 88FR571",
+	  generic_steppings },
+
 	{ 0, CPU_CLASS_NONE, NULL, NULL }
 };
 

==== //depot/projects/vimage/src/sys/arm/arm/locore.S#6 (text+ko) ====

@@ -37,7 +37,7 @@
 #include 
 #include 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.19 2008/04/08 10:24:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.21 2008/10/14 10:11:14 raj Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
@@ -66,6 +66,13 @@
 ENTRY_NP(btext)
 
 ASENTRY_NP(_start)
+
+/*
+ * Move metadata ptr to r12 (ip)
+ */
+
+	mov	ip, r0
+
 #if defined (FLASHADDR) && defined(LOADERRAMADDR)
 	/* Check if we're running from flash. */
 	ldr	r7, =FLASHADDR
@@ -170,6 +177,8 @@
 	ldr	pc, .Lvirt_done
 
 virt_done:
+	mov	r0, ip			/* Load argument: metadata ptr */
+
 	mov	fp, #0			/* trace back starts here */
 	bl	_C_LABEL(initarm)	/* Off we go */
 
@@ -245,6 +254,8 @@
 	ldr	r0, .Lcpufuncs
 	mov	lr, pc
 	ldr	pc, [r0, #CF_IDCACHE_WBINV_ALL]
+	mov	lr, pc
+	ldr	pc, [r0, #CF_L2CACHE_WBINV_ALL]
 
 	/*
 	 * Load the cpu_reset_needs_v4_MMU_disable flag to determine if it's

==== //depot/projects/vimage/src/sys/arm/arm/pmap.c#15 (text+ko) ====

@@ -147,10 +147,11 @@
 #include "opt_vm.h"
 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.102 2008/09/28 05:36:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.104 2008/10/13 18:59:59 raj Exp $");
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1196,27 +1197,104 @@
 }
 
 static PMAP_INLINE void
+pmap_l2cache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
+{
+	vm_size_t rest;
+	pd_entry_t *pde;
+	pt_entry_t *ptep;
+
+	rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+	while (len > 0) {
+		CTR4(KTR_PMAP, "pmap_l2cache_wbinv_range: pmap %p is_kernel %d "
+		    "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+		if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+		    cpu_l2cache_wb_range(va, rest);
+
+		len -= rest;
+		va += rest;
+
+		rest = MIN(PAGE_SIZE, len);
+	}
+}
+
+static PMAP_INLINE void
 pmap_idcache_wbinv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
 {
 
-	if (pmap_is_current(pm))
+	if (pmap_is_current(pm)) {
 		cpu_idcache_wbinv_range(va, len);
+		pmap_l2cache_wbinv_range(pm, va, len);
+	}
 }
 
 static PMAP_INLINE void
-pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len,
-    boolean_t do_inv, boolean_t rd_only)
+pmap_l2cache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len)
+{
+	vm_size_t rest;
+	pd_entry_t *pde;
+	pt_entry_t *ptep;
+
+	rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+	while (len > 0) {
+		CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
+		    "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+		if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep))
+		    cpu_l2cache_wb_range(va, rest);
+
+		len -= rest;
+		va += rest;
+
+		rest = MIN(PAGE_SIZE, len);
+	}
+}
+
+static PMAP_INLINE void
+pmap_l2cache_inv_range(pmap_t pm, vm_offset_t va, vm_size_t len)
 {
+	vm_size_t rest;
+	pd_entry_t *pde;
+	pt_entry_t *ptep;
+
+	rest = MIN(PAGE_SIZE - (va & PAGE_MASK), len);
+
+	while (len > 0) {
+		CTR4(KTR_PMAP, "pmap_l2cache_wb_range: pmap %p is_kernel %d "
+		    "va 0x%08x len 0x%x ", pm, pm == pmap_kernel(), va, rest);
+		if (pmap_get_pde_pte(pm, va, &pde, &ptep) && l2pte_valid(*ptep)) 
+		    cpu_l2cache_inv_range(va, rest);
+
+		len -= rest;
+		va += rest;
 
+		rest = MIN(PAGE_SIZE, len);
+	}
+}
+
+static PMAP_INLINE void
+pmap_dcache_wb_range(pmap_t pm, vm_offset_t va, vm_size_t len, boolean_t do_inv,
+    boolean_t rd_only)
+{
+	CTR4(KTR_PMAP, "pmap_dcache_wb_range: pmap %p is_kernel %d va 0x%08x "
+	    "len 0x%x ", pm, pm == pmap_kernel(), va, len);
+	CTR2(KTR_PMAP, " do_inv %d rd_only %d", do_inv, rd_only);
+
 	if (pmap_is_current(pm)) {
 		if (do_inv) {
-			if (rd_only)
+			if (rd_only) {
 				cpu_dcache_inv_range(va, len);
-			else
+				pmap_l2cache_inv_range(pm, va, len);
+			}
+			else {
 				cpu_dcache_wbinv_range(va, len);
+				pmap_l2cache_wbinv_range(pm, va, len);
+			}
 		} else
-		if (!rd_only)
+		if (!rd_only) {
 			cpu_dcache_wb_range(va, len);
+			pmap_l2cache_wb_range(pm, va, len);
+		}
 	}
 }
 
@@ -1224,16 +1302,20 @@
 pmap_idcache_wbinv_all(pmap_t pm)
 {
 
-	if (pmap_is_current(pm))
+	if (pmap_is_current(pm)) {
 		cpu_idcache_wbinv_all();
+		cpu_l2cache_wbinv_all();
+	}
 }
 
 static PMAP_INLINE void
 pmap_dcache_wbinv_all(pmap_t pm)
 {
 
-	if (pmap_is_current(pm))
+	if (pmap_is_current(pm)) {
 		cpu_dcache_wbinv_all();
+		cpu_l2cache_wbinv_all();
+	}
 }
 
 /*
@@ -2169,6 +2251,8 @@
 			PTE_SYNC(pdep);
 			cpu_dcache_wbinv_range((vm_offset_t)pdep,
 			    sizeof(*pdep));
+			cpu_l2cache_wbinv_range((vm_offset_t)pdep,
+			    sizeof(*pdep));
 			rv = 1;
 		}
 	} else {
@@ -2185,6 +2269,8 @@
 			PTE_SYNC(ptep);
 			cpu_dcache_wbinv_range((vm_offset_t)ptep,
 			    sizeof(*ptep));
+			cpu_l2cache_wbinv_range((vm_offset_t)ptep,
+			    sizeof(*ptep));
 			rv = 1;
 		}
 	}
@@ -2337,6 +2423,7 @@
 	}
 
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	cpu_tlb_flushID();
 	cpu_cpwait();
 
@@ -2373,6 +2460,7 @@
 	mtx_init(&l1_lru_lock, "l1 list lock", NULL, MTX_DEF);
 	pmap_init_l1(l1, kernel_l1pt);
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 
 	virtual_avail = round_page(virtual_avail);
 	virtual_end = lastaddr;
@@ -2402,6 +2490,7 @@
 	struct pcb *pcb;
 	
 	pmap_idcache_wbinv_all(pmap);
+	cpu_l2cache_wbinv_all();
 	pmap_tlb_flushID(pmap);
 	cpu_cpwait();
 	if (vector_page < KERNBASE) {
@@ -2589,6 +2678,7 @@
 	 * rarely
 	 */
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	cpu_tlb_flushD();
 	cpu_cpwait();
 	kernel_vm_end = pmap_curmaxkvaddr;
@@ -2614,6 +2704,7 @@
 	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 	cpu_idcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	for (pv = TAILQ_FIRST(&pmap->pm_pvlist); pv; pv = npv) {
 		if (pv->pv_flags & PVF_WIRED) {
 			/* The page is wired, cannot remove it now. */
@@ -2726,6 +2817,7 @@
 	    (uint32_t) pte, opte, *pte));
 	if (l2pte_valid(opte)) {
 		cpu_dcache_wbinv_range(va, PAGE_SIZE);
+		cpu_l2cache_wbinv_range(va, PAGE_SIZE);
 		cpu_tlb_flushD_SE(va);
 		cpu_cpwait();
 	} else {
@@ -2784,6 +2876,7 @@
 	opte = *pte;
 	if (l2pte_valid(opte)) {
 		cpu_dcache_wbinv_range(va, PAGE_SIZE);
+		cpu_l2cache_wbinv_range(va, PAGE_SIZE);
 		cpu_tlb_flushD_SE(va);
 		cpu_cpwait();
 		*pte = 0;
@@ -3052,6 +3145,9 @@
 	u_int flags;
 	int flush;
 
+	CTR4(KTR_PMAP, "pmap_protect: pmap %p sva 0x%08x eva 0x%08x prot %x",
+	    pm, sva, eva, prot);
+
 	if ((prot & VM_PROT_READ) == 0) {
 		pmap_remove(pm, sva, eva);
 		return;
@@ -3286,9 +3382,11 @@
 		 */
 		if (pmap_is_current(pmap) &&
 		    (oflags & PVF_NC) == 0 &&
-			    (opte & L2_S_PROT_W) != 0 &&
-			    (prot & VM_PROT_WRITE) == 0)
+		    (opte & L2_S_PROT_W) != 0 &&
+		    (prot & VM_PROT_WRITE) == 0) {
 			cpu_dcache_wb_range(va, PAGE_SIZE);
+			pmap_l2cache_wb_range(pmap, va, PAGE_SIZE);
+		}
 	} else {
 		/*
 		 * New mapping, or changing the backing page
@@ -3777,11 +3875,15 @@
 					total++;
 			   		if (is_exec) {
         					cpu_idcache_wbinv_range(sva,
-								 PAGE_SIZE);
+						    PAGE_SIZE);
+						cpu_l2cache_wbinv_range(sva,
+						    PAGE_SIZE);
 						cpu_tlb_flushID_SE(sva);
 			   		} else if (is_refd) {
 						cpu_dcache_wbinv_range(sva,
-								 PAGE_SIZE);
+						    PAGE_SIZE);
+						cpu_l2cache_wbinv_range(sva,
+						    PAGE_SIZE);
 						cpu_tlb_flushD_SE(sva);
 					}
 				} else if (total == PMAP_REMOVE_CLEAN_LIST_SIZE) {
@@ -3789,6 +3891,7 @@
 					 * for a current pmap
 					 */
 					cpu_idcache_wbinv_all();
+					cpu_l2cache_wbinv_all();
 					flushall = 1;
 					total++;
 				}
@@ -3842,29 +3945,29 @@
 	if (off || size != PAGE_SIZE) {
 		bzero(dstpg + off, size);
 		cpu_dcache_wbinv_range((vm_offset_t)(dstpg + off), size);
+		cpu_l2cache_wbinv_range((vm_offset_t)(dstpg + off), size);
 	} else {
 		bzero_page((vm_offset_t)dstpg);
 		cpu_dcache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
+		cpu_l2cache_wbinv_range((vm_offset_t)dstpg, PAGE_SIZE);
 	}
 #else
 
 	mtx_lock(&cmtx);
 	/*
-	 * Hook in the page, zero it, and purge the cache for that
-	 * zeroed page. Invalidate the TLB as needed.
+	 * Hook in the page, zero it, invalidate the TLB as needed.
+	 *
+	 * Note the temporary zero-page mapping must be a non-cached page in
+	 * ordert to work without corruption when write-allocate is enabled.
 	 */
-	*cdst_pte = L2_S_PROTO | phys |
-	    L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE) | pte_l2_s_cache_mode;
-	PTE_SYNC(cdst_pte);
+	*cdst_pte = L2_S_PROTO | phys | L2_S_PROT(PTE_KERNEL, VM_PROT_WRITE);
 	cpu_tlb_flushD_SE(cdstp);
 	cpu_cpwait();
-	if (off || size != PAGE_SIZE) {
+	if (off || size != PAGE_SIZE)
 		bzero((void *)(cdstp + off), size);
-		cpu_dcache_wbinv_range(cdstp + off, size);
-	} else {
+	else
 		bzero_page(cdstp);
-		cpu_dcache_wbinv_range(cdstp, PAGE_SIZE);
-	}
+
 	mtx_unlock(&cmtx);
 #endif
 }
@@ -4141,6 +4244,8 @@
 	mtx_unlock(&cmtx);
 	cpu_dcache_inv_range(csrcp, PAGE_SIZE);
 	cpu_dcache_wbinv_range(cdstp, PAGE_SIZE);
+	cpu_l2cache_inv_range(csrcp, PAGE_SIZE);
+	cpu_l2cache_wbinv_range(cdstp, PAGE_SIZE);
 }
 #endif /* (ARM_MMU_GENERIC + ARM_MMU_SA1) != 0 */
 
@@ -4203,6 +4308,7 @@
 #endif
 
 	cpu_dcache_wbinv_all();
+	cpu_l2cache_wbinv_all();
 	if (_arm_memcpy && PAGE_SIZE >= _min_memcpy_size &&
 	    _arm_memcpy((void *)VM_PAGE_TO_PHYS(dst), 
 	    (void *)VM_PAGE_TO_PHYS(src), PAGE_SIZE, IS_PHYSICAL) == 0)
@@ -4212,6 +4318,7 @@
 	dstpg = arm_ptovirt(VM_PAGE_TO_PHYS(dst));
 	bcopy_page(srcpg, dstpg);
 	cpu_dcache_wbinv_range(dstpg, PAGE_SIZE);
+	cpu_l2cache_wbinv_range(dstpg, PAGE_SIZE);
 #else
 	pmap_copy_page_func(VM_PAGE_TO_PHYS(src), VM_PAGE_TO_PHYS(dst));
 #endif

==== //depot/projects/vimage/src/sys/arm/arm/swtch.S#6 (text+ko) ====

@@ -83,7 +83,7 @@
 #include 
 #include 
 #include 
-__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.23 2008/08/02 00:10:38 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/swtch.S,v 1.24 2008/10/13 18:59:59 raj Exp $");
 
 
 /*
@@ -143,6 +143,8 @@
 	ldr	r9, .Lcpufuncs
 	mov	lr, pc
 	ldr	pc, [r9, #CF_IDCACHE_WBINV_ALL]
+	mov	lr, pc
+	ldr	pc, [r9, #CF_L2CACHE_WBINV_ALL]
 	ldr	r0, [r7, #(PCB_PL1VEC)]
 	ldr	r1, [r7, #(PCB_DACR)]
 	/*
@@ -172,6 +174,8 @@
 	movne	r1, #4
 	movne	lr, pc
 	ldrne	pc, [r9, #CF_DCACHE_WB_RANGE]
+	movne	lr, pc
+	ldrne	pc, [r9, #CF_L2CACHE_WB_RANGE]
 #endif /* PMAP_INCLUDE_PTE_SYNC */
 
 	/*
@@ -328,6 +332,8 @@
 	ldr	r1, .Lcpufuncs
 	mov	lr, pc
 	ldr	pc, [r1, #CF_IDCACHE_WBINV_ALL]
+	mov	lr, pc
+	ldr	pc, [r1, #CF_L2CACHE_WBINV_ALL]
 .Lcs_cache_purge_skipped:
 	/* rem: r6 = lock */
 	/* rem: r9 = new PCB */
@@ -360,6 +366,8 @@
 	mov	r1, #4
 	mov	lr, pc
 	ldr	pc, [r2, #CF_DCACHE_WB_RANGE]
+	mov	lr, pc
+	ldr	pc, [r2, #CF_L2CACHE_WB_RANGE]
 
 .Lcs_same_vector:
 #endif /* PMAP_INCLUDE_PTE_SYNC */

==== //depot/projects/vimage/src/sys/arm/include/armreg.h#4 (text+ko) ====

@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/armreg.h,v 1.7 2007/10/18 05:06:58 imp Exp $
+ * $FreeBSD: src/sys/arm/include/armreg.h,v 1.8 2008/10/13 18:16:54 raj Exp $
  */
 
 #ifndef MACHINE_ARMREG_H
@@ -148,6 +148,9 @@
 #define CPU_ID_SA110		0x4401a100
 #define CPU_ID_SA1100		0x4401a110

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

From owner-p4-projects@FreeBSD.ORG  Thu Oct 16 20:43:22 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 53B76106569C; Thu, 16 Oct 2008 20:43:22 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15CD9106569A
	for ; Thu, 16 Oct 2008 20:43:22 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 02C8B8FC1B
	for ; Thu, 16 Oct 2008 20:43:22 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9GKhLXs094833
	for ; Thu, 16 Oct 2008 20:43:21 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9GKhLVN094831
	for perforce@freebsd.org; Thu, 16 Oct 2008 20:43:21 GMT
	(envelope-from rene@FreeBSD.org)
Date: Thu, 16 Oct 2008 20:43:21 GMT
Message-Id: <200810162043.m9GKhLVN094831@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151464 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Thu, 16 Oct 2008 20:43:22 -0000

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

Change 151464 by rene@rene_self on 2008/10/16 20:42:42

	Section 1 of DTrace is translated (rev 1.3).
	Checked build.	

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#2 (text+ko) ====

@@ -7,8 +7,11 @@
 -->
 
 
 
 
@@ -17,74 +20,83 @@
       
 	Tom
 	Rhodes
-	Written by 
+	Geschreven door 
+      
+    
+    
+      
+	René
+	Ladan
+	Vertaald door 
       
     
   
 
   DTrace
 
-  DTrace, also known as Dynamic Tracing, was developed by
-    &sun; as a tool for locating performance bottlenecks
-    in production and pre-production systems.  It is not, in any way,
-    a debugging tool, but a tool for real time system analysis to
-    locate performance and other issues.
-
-  DTrace is a remarkable profiling tool, with an impressive
-    array of features for diagnosing system issues.  It may also be
-    used to run pre-written scripts to take advantage of its
-    capabilities.  Users may even author their own utilities using
-    the DTrace D Language, allowing them to customize their profiling
-    based on specific needs.
-
   
-    Synopsis
+    Overzicht
 
     DTrace
+
     
-      DTrace support
+      DTrace-ondersteuning
+
       DTrace
     
 
-    After reading this chapter, you will know:
+    DTrace, ook bekend als Dynamic Tracing, was ontwikkeld door
+      &sun; als een gereedschap om prestatie-bottlenecks in productie-
+      en preproductiesystemen op te sporen. Het is in geen enkel opzicht
+      een debug-gereedschap, maar een gereedscahp voor real-time analyse
+      om prestatie- en andere zaken op te sporen.
+
+    DTrace is een opmerkelijk profileringsgereedschap, met een
+      indrukwekkende verzameling mogelijkheden om systeemzaken te
+      diagnosticeren.  Het kan ook worden gebruikt om vooraf geschreven
+      scripts te draaien om zo voordeel te halen uit de mogelijkheden.
+      Gebruikers kunnen zelfs hun eigen middelen schrijven door gebruik
+      te maken van de DTrace D Language, wat ze in staat stelt om hun
+      profiling aan te passen aan hun specifieke behoeften.
+
+    Na het lezen van dit hoofdstuk weet u:
 
     
       
-	What DTrace is and what features it provides.
+	Wat DTrace is en welke mogelijkheden het biedt.
       
 
       
-	Differences between the &solaris; DTrace implementation
-	  and the one provided by &os;.
+	De verschillen tussen de DTrace-implementatie van
+	  &solaris; en degene die door &os; wordt aangeboden.
       
 
       
-	How to enable and use DTrace on &os;.
+	Hoe DTrace op &os; aan te zetten en te gebruiken.
       
     
 
-    Before reading this chapter, you should:
+    Voordat u dit hoofdstuk leest, dient u:
 
     
       
-	Understand &unix; and &os; basics
+	De beginselen van &unix; en &os; te begrijpen
 	  ().
       
 
       
-	Be familiar with
-	  the basics of kernel configuration/compilation
-	  ().
+	Bekend te zijn met de beginselen van kernelconfiguratie en
+	  -compilatie ().
       
 
       
-	Have some familiarity with security and how it
-	  pertains to &os; ().
+	Wat bekendheid te hebben met beveiliging en hoe het zich
+	  verhoudt tot &os; ().
       
 
       
-	Understand how to obtain and rebuild the &os; sources
-	  ().
+	Te begrijpen hoe de broncode van &os; te verkrijgen en te
+	  herbouwen ().
       
     
 
@@ -93,11 +105,12 @@
       and production versions of FreeBSD with this technology.
     -->
     
-      This feature is considered experimental.  Some options
-	may be lacking in functionality, other parts may not work
-	at all.  In time, this feature will be considered production
-	ready and this documentation will be altered to fit that
-	situation.
+      Deze mogelijkheid wordt als experimenteel beschouwd.  Van
+	sommige opties kan er functionaliteit ontbreken, andere delen
+	kunnen in het geheel niet werken.  In de loop der tijd zal deze
+	mogelijkheid als productierijp worden beschouwd en zal deze
+	documentatie worden aangepast om die situatie te
+	representeren.
     
   
 
@@ -114,7 +127,7 @@
     There is a DDB_CTF kernel option which
       is used to enable support for loading the CTF
       data from kernel modules and the kernel itself.
-      CTF is the &solaris; Compressed C Type format
+      CTF is the &solaris; Compact C Type Format
       which encapsulates a reduced form of debugging information
       similar to DWARF and the venerable stabs.
       This CTF data is added to the binaries by the
@@ -143,8 +156,7 @@
       and Distribution License comes with &os;, see the
       /usr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE
       or view it online at
-      
-      http://www.opensolaris.org/os/licensing.
+      .
 
     This license means that a &os; kernel with the DTrace options
       is still BSD licensed; however the
@@ -172,14 +184,14 @@
 	will be limited support for function boundary tracing.
       
 
-    All sources must be rebuilt and installed with CTF options.
+    All sources must be rebuilt and installed with CTF options.
       To accomplish this task, rebuild the &os; sources using:
 
     &prompt.root; cd /usr/src
-    &prompt.root; make WITH_CTF=1 buildworld
-    &prompt.root; make WITH_CFT=1 kernel
-    &prompt.root; make WITH_CFT=1 installworld
-    &prompt.root; mergemaster -Ui
+&prompt.root; make WITH_CTF=1 buildworld
+&prompt.root; make WITH_CFT=1 kernel
+&prompt.root; make WITH_CFT=1 installworld
+&prompt.root; mergemaster -Ui
 
     The system will need to be restarted.
 
@@ -194,8 +206,7 @@
 
     Finally, obtain the current DTrace toolkit.  The current
       version is available at
-      
-      http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/.
+      .
       There is an install mechanism included; however, installation
       is not required to make use of the bundled utilities.
   
@@ -260,7 +271,6 @@
       will produce output similar to the following:
 
     &prompt.root; ./hotkernel
-localhost# ./hotkernel
 Sampling... Hit Ctrl-C to end.
 
     The system administrator must use the
@@ -304,9 +314,7 @@
     This script will also work with kernel modules.  To use this
       feature, run the script with the  flag:
 
-    &prompt.root; ./hotkernel -m
-
-    localhost# ./hotkernel -m
+    &prompt.root; ./hotkernel -m
 Sampling... Hit Ctrl-C to end.
 ^C
 MODULE                                                  COUNT   PCNT
@@ -362,7 +370,7 @@
       sigsuspend            6985124
             read         3988049784
 
-    As shown, the read system call seems to use the
+    As shown, the read() system call seems to use the
       most time in nanoseconds with the getpid()
       system call used the least amount of time.
   

From owner-p4-projects@FreeBSD.ORG  Fri Oct 17 00:10:52 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6CCFF1065696; Fri, 17 Oct 2008 00:10:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1772C106568D
	for ; Fri, 17 Oct 2008 00:10:52 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 03D288FC19
	for ; Fri, 17 Oct 2008 00:10:52 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9H0Apxi025030
	for ; Fri, 17 Oct 2008 00:10:51 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9H0Apfm025028
	for perforce@freebsd.org; Fri, 17 Oct 2008 00:10:51 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Fri, 17 Oct 2008 00:10:51 GMT
Message-Id: <200810170010.m9H0Apfm025028@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151466 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 17 Oct 2008 00:10:52 -0000

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

Change 151466 by nwhitehorn@nwhitehorn_trantor on 2008/10/17 00:09:58

	Add support for real mode Open Firmware accesses, at least for i
	64-bit machines. This lets us boot a decent way into the IBM
	Mambo simulator and should give us a prayer of support on real
	IBM and Genesi hardware.
	
	MFP4 after:	10 days

Affected files ...

.. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#2 edit
.. //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#2 edit
.. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#6 edit
.. //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#5 edit
.. //depot/projects/ppc-g5/sys/sparc64/sparc64/ofw_machdep.c#2 edit

Differences ...

==== //depot/projects/ppc-g5/sys/dev/ofw/openfirm.c#2 (text+ko) ====

@@ -117,7 +117,7 @@
 		1,
 	};
 
-	args.service = (cell_t)name;
+	args.service = openfirm_mapptr(name);
 	if (openfirmware(&args) == -1)
 		return (-1);
 	return (args.missing);
@@ -141,7 +141,7 @@
 
 	va_start(ap, nreturns);
 	args.nreturns = ++nreturns;
-	args.slot[i++] = (cell_t)cmd;
+	args.slot[i++] = openfirm_mapptr(cmd);
 	while (i < 1)
 		args.slot[i++] = va_arg(ap, cell_t);
 	if (openfirmware(&args) == -1) {
@@ -284,7 +284,7 @@
 	};
 
 	args.package = package;
-	args.propname = (cell_t)propname;
+	args.propname = openfirm_mapptr(propname);
 	if (openfirmware(&args) == -1)
 		return (-1);
 	return (args.proplen);
@@ -310,8 +310,8 @@
 	};
 
 	args.package = package;
-	args.propname = (cell_t)propname;
-	args.buf = (cell_t)buf;
+	args.propname = openfirm_mapptr(propname);
+	args.buf = openfirm_mapptr(buf);
 	args.buflen = buflen;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -361,8 +361,8 @@
 	};
 
 	args.package = package;
-	args.previous = (cell_t)previous;
-	args.buf = (cell_t)buf;
+	args.previous = openfirm_mapptr(previous);
+	args.buf = openfirm_mapptr(buf);
 	if (openfirmware(&args) == -1)
 		return (-1);
 	return (args.flag);
@@ -389,8 +389,8 @@
 	};
 
 	args.package = package;
-	args.propname = (cell_t)propname;
-	args.buf = (cell_t)buf;
+	args.propname = openfirm_mapptr(propname);
+	args.buf = openfirm_mapptr(buf);
 	args.len = len;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -415,8 +415,8 @@
 		1,
 	};
 
-	args.device = (cell_t)device;
-	args.buf = (cell_t)buf;
+	args.device = openfirm_mapptr(device);
+	args.buf = openfirm_mapptr(buf);
 	args.len = len;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -439,7 +439,7 @@
 		1,
 	};
 
-	args.device = (cell_t)device;
+	args.device = openfirm_mapptr(device);
 	if (openfirmware(&args) == -1)
 		return (-1);
 	return (args.package);
@@ -464,7 +464,7 @@
 	};
 
 	args.instance = instance;
-	args.buf = (cell_t)buf;
+	args.buf = openfirm_mapptr(buf);
 	args.len = len;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -490,7 +490,7 @@
 	};
 
 	args.package = package;
-	args.buf = (cell_t)buf;
+	args.buf = openfirm_mapptr(buf);
 	args.len = len;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -521,7 +521,7 @@
 		return (-1);
 	args.nargs = nargs + 2;
 	args.nreturns = nreturns + 1;
-	args.method = (cell_t)method;
+	args.method = openfirm_mapptr(method);
 	args.instance = instance;
 	va_start(ap, nreturns);
 	for (cp = args.args_n_results + (n = nargs); --n >= 0;)
@@ -556,7 +556,7 @@
 		1,
 	};
 
-	args.device = (cell_t)device;
+	args.device = openfirm_mapptr(device);
 	if (openfirmware(&args) == -1 || args.instance == 0) {
 		return (-1);
 	}
@@ -600,7 +600,7 @@
 	};
 
 	args.instance = instance;
-	args.addr = (cell_t)addr;
+	args.addr = openfirm_mapptr(addr);
 	args.len = len;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -627,7 +627,7 @@
 	};
 
 	args.instance = instance;
-	args.addr = (cell_t)addr;
+	args.addr = openfirm_mapptr(addr);
 	args.len = len;
 	if (openfirmware(&args) == -1)
 		return (-1);
@@ -728,7 +728,7 @@
 		1,
 	};
 
-	args.bootspec = (cell_t)bootspec;
+	args.bootspec = openfirm_mapptr(bootspec);
 	openfirmware(&args);
 	for (;;)			/* just in case */
 		;

==== //depot/projects/ppc-g5/sys/dev/ofw/openfirm.h#2 (text+ko) ====

@@ -81,6 +81,7 @@
  */
 void	set_openfirm_callback(int (*)(void *));
 int	openfirmware(void *);
+cell_t	openfirm_mapptr(const void *);
 
 /*
  * This isn't actually an Open Firmware function, but it seemed like the right

==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#6 (text+ko) ====

@@ -271,8 +271,9 @@
  */
 static struct	mem_region *regions;
 static struct	mem_region *pregions;
-extern u_int           phys_avail_count;
-extern int		regions_sz, pregions_sz;
+extern u_int	phys_avail_count;
+extern int	regions_sz, pregions_sz;
+extern int	ofw_real_mode;
 static struct	ofw_map translations[64];
 
 extern struct pmap ofw_pmap;
@@ -697,6 +698,25 @@
 }
 
 static void
+moea64_bridge_cpu_bootstrap(int ap)
+{
+	int i = 0;
+
+	/*
+	 * Initialize segment registers and MMU
+	 */
+
+	mtmsr(mfmsr() & ~PSL_DR & ~PSL_IR); isync();
+	for (i = 0; i < 16; i++) {
+		mtsrin(i << ADDR_SR_SHFT, kernel_pmap->pm_sr[i]);
+	}
+	__asm __volatile ("sync; mtsdr1 %0; isync"
+	    :: "r"((u_int)moea64_pteg_table 
+		     | (32 - cntlzw(moea64_pteg_mask >> 11))));
+	tlbia();
+}
+
+static void
 moea64_bridge_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend)
 {
 	ihandle_t	mmui;
@@ -766,10 +786,9 @@
 	moea64_pteg_count >>= 1;
 #endif /* PTEGCOUNT */
 
-
 	size = moea64_pteg_count * sizeof(struct lpteg);
-	CTR2(KTR_PMAP, "moea64_bootstrap: %d PTEGs, %d bytes", moea64_pteg_count,
-	    size);
+	CTR2(KTR_PMAP, "moea64_bootstrap: %d PTEGs, %d bytes", 
+	    moea64_pteg_count, size);
 
 	/* We now need to allocate memory. This memory, to be allocated,
 	   has to reside in a page table. The page table we are about to
@@ -867,31 +886,32 @@
 		moea64_kenter(mmup, pa, pa);
 	ENABLE_TRANS(msr);
 
-	/*
-	 * Set up the Open Firmware pmap and add it's mappings.
-	 */
+	if (!ofw_real_mode) {
+	    /*
+	     * Set up the Open Firmware pmap and add its mappings.
+	     */
 
-	moea64_pinit(mmup, &ofw_pmap);
-	ofw_pmap.pm_sr[KERNEL_SR] = kernel_pmap->pm_sr[KERNEL_SR];
-	ofw_pmap.pm_sr[KERNEL2_SR] = kernel_pmap->pm_sr[KERNEL2_SR];
+	    moea64_pinit(mmup, &ofw_pmap);
+	    ofw_pmap.pm_sr[KERNEL_SR] = kernel_pmap->pm_sr[KERNEL_SR];
+	    ofw_pmap.pm_sr[KERNEL2_SR] = kernel_pmap->pm_sr[KERNEL2_SR];
 
-	if ((chosen = OF_finddevice("/chosen")) == -1)
+	    if ((chosen = OF_finddevice("/chosen")) == -1)
 		panic("moea64_bootstrap: can't find /chosen");
-	OF_getprop(chosen, "mmu", &mmui, 4);
-	if ((mmu = OF_instance_to_package(mmui)) == -1)
+	    OF_getprop(chosen, "mmu", &mmui, 4);
+	    if ((mmu = OF_instance_to_package(mmui)) == -1)
 		panic("moea64_bootstrap: can't get mmu package");
-	if ((sz = OF_getproplen(mmu, "translations")) == -1)
+	    if ((sz = OF_getproplen(mmu, "translations")) == -1)
 		panic("moea64_bootstrap: can't get ofw translation count");
 
-	bzero(translations, sz);
-	if (OF_getprop(mmu, "translations", translations, sz) == -1)
+	    bzero(translations, sz);
+	    if (OF_getprop(mmu, "translations", translations, sz) == -1)
 		panic("moea64_bootstrap: can't get ofw translations");
 
-	CTR0(KTR_PMAP, "moea64_bootstrap: translations");
-	sz /= sizeof(*translations);
-	qsort(translations, sz, sizeof (*translations), om_cmp);
+	    CTR0(KTR_PMAP, "moea64_bootstrap: translations");
+	    sz /= sizeof(*translations);
+	    qsort(translations, sz, sizeof (*translations), om_cmp);
 
-	for (i = 0, ofw_mappings = 0; i < sz; i++) {
+	    for (i = 0, ofw_mappings = 0; i < sz; i++) {
 		CTR3(KTR_PMAP, "translation: pa=%#x va=%#x len=%#x",
 		    (uint32_t)(translations[i].om_pa_lo), translations[i].om_va,
 		    translations[i].om_len);
@@ -940,6 +960,7 @@
 
 		PMAP_UNLOCK(kernel_pmap);
 		PMAP_UNLOCK(&ofw_pmap);
+	    }
 	}
 
 #ifdef SMP
@@ -954,15 +975,9 @@
 	Maxmem = powerpc_btop(phys_avail[i + 1]);
 
 	/*
-	 * Initialize segment registers and MMU
+	 * Initialize MMU
 	 */
-	mtmsr(mfmsr() & ~PSL_DR & ~PSL_IR); isync();
-	for (i = 0; i < 16; i++) {
-		mtsrin(i << ADDR_SR_SHFT, kernel_pmap->pm_sr[i]);
-	}
-	__asm __volatile ("sync; mtsdr1 %0; isync"
-	    :: "r"((u_int)moea64_pteg_table | (32 - cntlzw(moea64_pteg_mask >> 11))));
-	tlbia();
+	moea64_bridge_cpu_bootstrap(0);
 	mtmsr(mfmsr() | PSL_DR | PSL_IR); isync();
 	pmap_bootstrapped++;
 

==== //depot/projects/ppc-g5/sys/powerpc/aim/ofw_machdep.c#5 (text+ko) ====

@@ -71,6 +71,7 @@
 extern register_t ofmsr[5];
 extern struct	pmap ofw_pmap;
 static int	(*ofwcall)(void *);
+int		ofw_real_mode;
 
 /*
  * Saved SPRG0-3 from OpenFirmware. Will be restored prior to the callback.
@@ -147,21 +148,43 @@
 	int asz, msz, fsz;
 	int i, j;
 	int still_merging;
+
+	asz = msz = 0;
 	
 	/*
 	 * Get memory.
 	 */
 	if ((phandle = OF_finddevice("/memory")) == -1
 	    || (asz = OF_getprop(phandle, "available",
-			  OFavail, sizeof OFavail[0] * OFMEM_REGIONS))
-	       <= 0)
-		panic("no memory?");
+		  OFavail, sizeof OFavail[0] * OFMEM_REGIONS)) <= 0)
+	{
+		if (ofw_real_mode) {
+			/* XXX MAMBO */
+			printf("Physical memory unknown -- guessing 128 MB\n");
+
+			/* Leave the first 0xA000000 bytes for the kernel */
+			OFavail[0].mr_start = 0xA00000;
+			OFavail[0].mr_size = 0x75FFFFF;
+			asz = sizeof(OFavail[0]);
+		} else {
+			panic("no memory?");
+		}
+	}
 
 	if (ppc64) {
 	    struct mem_region64 OFmem64[OFMEM_REGIONS + 1];
-	    if ((msz = OF_getprop(phandle, "reg",
-			  OFmem64, sizeof OFmem64[0] * OFMEM_REGIONS)) <= 0)
-		panic("Physical memory map not found");
+	    if ((phandle == -1) || (msz = OF_getprop(phandle, "reg",
+			  OFmem64, sizeof OFmem64[0] * OFMEM_REGIONS)) <= 0) {
+		if (ofw_real_mode) {
+			/* XXX MAMBO */
+			OFmem64[0].mr_start_hi = 0;
+			OFmem64[0].mr_start_lo = 0x0;
+			OFmem64[0].mr_size = 0x7FFFFFF;
+			msz = sizeof(OFmem64[0]);
+		} else {
+			panic("Physical memory map not found");
+		}
+	    }
 
 	    for (i = 0; i < msz/sizeof(OFmem64[0]); i++) {
 		if (OFmem64[i].mr_start_hi == 0) {
@@ -220,10 +243,23 @@
 void
 set_openfirm_callback(int (*openfirm)(void *))
 {
+	if (ofmsr[0] & PSL_DR)
+		ofw_real_mode = 0;
+	else
+		ofw_real_mode = 1;
 
 	ofwcall = openfirm;
 }
 
+cell_t
+openfirm_mapptr(const void *arg)
+{
+	if (ofw_real_mode && pmap_bootstrapped)
+		return ((cell_t)pmap_kextract((vm_offset_t)arg));
+
+	return ((cell_t)arg);
+}
+
 int
 openfirmware(void *args)
 {
@@ -232,6 +268,9 @@
 	u_int	srsave[16];
 	u_int   i;
 
+	if (pmap_bootstrapped && ofw_real_mode)
+		args = (void *)pmap_kextract((vm_offset_t)args);
+
 	__asm __volatile(	"\t"
 		"sync\n\t"
 		"mfmsr  %0\n\t"
@@ -243,7 +282,7 @@
 
 	ofw_sprg_prepare();
 
-	if (pmap_bootstrapped) {
+	if (pmap_bootstrapped && !ofw_real_mode) {
 		/*
 		 * Swap the kernel's address space with Open Firmware's
 		 */
@@ -264,7 +303,7 @@
 
        	result = ofwcall(args);
 
-	if (pmap_bootstrapped) {
+	if (pmap_bootstrapped && !ofw_real_mode) {
 		/*
 		 * Restore the kernel's addr space. The isync() doesn;t
 		 * work outside the loop unless mtsrin() is open-coded
@@ -458,3 +497,4 @@
 
 	return (EFAULT);
 }
+

==== //depot/projects/ppc-g5/sys/sparc64/sparc64/ofw_machdep.c#2 (text+ko) ====

@@ -268,4 +268,15 @@
 		return (0);
 	}
 	return (ENXIO);
+} 
+
+/*
+ * Map a pointer from kernel address space to OFW address space. Since OFW
+ * lives in the same address space, do nothing.
+ */
+
+cell_t
+openfirm_mapptr(const void *arg)
+{
+	return ((cell_t)arg);
 }

From owner-p4-projects@FreeBSD.ORG  Fri Oct 17 03:33:20 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2AF59106568C; Fri, 17 Oct 2008 03:33:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9ECB1065686
	for ; Fri, 17 Oct 2008 03:33:19 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C87858FC23
	for ; Fri, 17 Oct 2008 03:33:19 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9H3XJkW053256
	for ; Fri, 17 Oct 2008 03:33:19 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9H3XJum053254
	for perforce@freebsd.org; Fri, 17 Oct 2008 03:33:19 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Fri, 17 Oct 2008 03:33:19 GMT
Message-Id: <200810170333.m9H3XJum053254@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151468 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 17 Oct 2008 03:33:20 -0000

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

Change 151468 by nwhitehorn@nwhitehorn_trantor on 2008/10/17 03:32:45

	Fix some nagging page zeroing problems found with Mambo. We can now
	boot inside the simulator all the way to the panic where it complains
	about not having a PIC, which is a problem for another day.
	
	cpcht does try to attach, though :)

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#7 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/aim/mmu_oea64.c#7 (text+ko) ====

@@ -1011,7 +1011,6 @@
 		    moea64_scratchpage_va[i],&j);
 		moea64_scratchpage_pte[i] = moea64_pvo_to_pte(
 		    moea64_scratchpage_pvo[i],j);
-		moea64_scratchpage_pte[i]->pte_hi &= ~LPTE_VALID;
 		UNLOCK_TABLE();
 	}
 
@@ -1145,12 +1144,15 @@
 	    (~LPTE_WIMG & ~LPTE_RPGN);
 	moea64_scratchpage_pvo[which]->pvo_pte.lpte.pte_lo |= 
 	    moea64_calc_wimg(pa) | (uint64_t)pa;
+
+	moea64_scratchpage_pte[which]->pte_hi &= ~LPTE_VALID;
+	TLBIE(kernel_pmap, moea64_scratchpage_va[which]);
 	
 	moea64_scratchpage_pte[which]->pte_lo = 
 	    moea64_scratchpage_pvo[which]->pvo_pte.lpte.pte_lo;
+	EIEIO();
 
 	moea64_scratchpage_pte[which]->pte_hi |= LPTE_VALID;
-	EIEIO();
 	TLBIE(kernel_pmap, moea64_scratchpage_va[which]);
 }
 
@@ -2244,26 +2246,31 @@
 
 	pt = &moea64_pteg_table[pteidx >> 3].pt[pteidx & 7];
 
-	if ((pvo->pvo_pte.lpte.pte_hi & LPTE_VALID) && !PVO_PTEGIDX_ISSET(pvo)) {
+	if ((pvo->pvo_pte.lpte.pte_hi & LPTE_VALID) && 
+	    !PVO_PTEGIDX_ISSET(pvo)) {
 		panic("moea64_pvo_to_pte: pvo %p has valid pte in pvo but no "
 		    "valid pte index", pvo);
 	}
 
-	if ((pvo->pvo_pte.lpte.pte_hi & LPTE_VALID) == 0 && PVO_PTEGIDX_ISSET(pvo)) {
+	if ((pvo->pvo_pte.lpte.pte_hi & LPTE_VALID) == 0 && 
+	    PVO_PTEGIDX_ISSET(pvo)) {
 		panic("moea64_pvo_to_pte: pvo %p has valid pte index in pvo "
 		    "pvo but no valid pte", pvo);
 	}
 
-	if ((pt->pte_hi ^ (pvo->pvo_pte.lpte.pte_hi & ~LPTE_VALID)) == LPTE_VALID) {
+	if ((pt->pte_hi ^ (pvo->pvo_pte.lpte.pte_hi & ~LPTE_VALID)) == 
+	    LPTE_VALID) {
 		if ((pvo->pvo_pte.lpte.pte_hi & LPTE_VALID) == 0) {
 			panic("moea64_pvo_to_pte: pvo %p has valid pte in "
 			    "moea64_pteg_table %p but invalid in pvo", pvo, pt);
 		}
 
-		if (((pt->pte_lo ^ pvo->pvo_pte.lpte.pte_lo) & ~(LPTE_CHG|LPTE_REF))
-		    != 0) {
+		if (((pt->pte_lo ^ pvo->pvo_pte.lpte.pte_lo) & 
+		    ~(LPTE_CHG|LPTE_REF)) != 0) {
 			panic("moea64_pvo_to_pte: pvo %p pte does not match "
-			    "pte %p in moea64_pteg_table difference is %#x", pvo, pt,(uint32_t)(pt->pte_lo ^ pvo->pvo_pte.lpte.pte_lo));
+			    "pte %p in moea64_pteg_table difference is %#x", 
+			    pvo, pt,
+			    (uint32_t)(pt->pte_lo ^ pvo->pvo_pte.lpte.pte_lo));
 		}
 
 		ASSERT_TABLE_LOCK();

From owner-p4-projects@FreeBSD.ORG  Fri Oct 17 13:28:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 54B5B106568E; Fri, 17 Oct 2008 13:28:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17BBD1065688
	for ; Fri, 17 Oct 2008 13:28:04 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 037808FC20
	for ; Fri, 17 Oct 2008 13:28:04 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9HDS3jJ039956
	for ; Fri, 17 Oct 2008 13:28:03 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9HDS2aF039954
	for perforce@freebsd.org; Fri, 17 Oct 2008 13:28:02 GMT
	(envelope-from zec@tel.fer.hr)
Date: Fri, 17 Oct 2008 13:28:02 GMT
Message-Id: <200810171328.m9HDS2aF039954@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151482 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 17 Oct 2008 13:28:04 -0000

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

Change 151482 by zec@zec_tpx32 on 2008/10/17 13:27:48

	Abandon a few initial value assignments at variable definition
	point.
	
	More whitespace diff redux against head.

Affected files ...

.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#11 edit
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#15 edit
.. //depot/projects/vimage/src/sys/kern/uipc_accf.c#3 edit
.. //depot/projects/vimage/src/sys/net/if.c#44 edit
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#29 edit
.. //depot/projects/vimage/src/sys/net/if_loop.c#29 edit
.. //depot/projects/vimage/src/sys/net/route.c#31 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#33 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#31 edit
.. //depot/projects/vimage/src/sys/netinet6/nd6.h#9 edit
.. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#24 edit
.. //depot/projects/vimage/src/sys/netinet6/vinet6.h#23 edit

Differences ...

==== //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#11 (text+ko) ====

@@ -65,7 +65,6 @@
 #include 
 #include 
 #include 
-
 #include 
 
 /*

==== //depot/projects/vimage/src/sys/kern/kern_jail.c#15 (text+ko) ====

@@ -35,7 +35,6 @@
 #include 
 #include 
 #include 
-
 #include 
 #include 
 

==== //depot/projects/vimage/src/sys/kern/uipc_accf.c#3 (text+ko) ====


==== //depot/projects/vimage/src/sys/net/if.c#44 (text+ko) ====

@@ -142,17 +142,16 @@
 static	if_com_alloc_t *if_com_alloc[256];
 static	if_com_free_t *if_com_free[256];
 #ifndef VIMAGE
-int	if_index = 0;
+int	if_index;
 struct	ifnethead ifnet;	/* depend on static init XXX */
 struct	ifgrouphead ifg_head;
-
 static int	if_indexlim;
 static struct	knlist ifklist;
 
 /*
  * Table of ifnet/cdev by index.  Locked with ifnet_lock.
  */
-static struct ifindex_entry *ifindex_table = NULL;
+static struct ifindex_entry *ifindex_table;
 #endif /* !VIMAGE */
 
 static void	filt_netdetach(struct knote *kn);
@@ -689,7 +688,7 @@
 	splx(s);
 }
 SYSINIT(domainifattach, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_SECOND,
-	if_attachdomain, NULL);
+    if_attachdomain, NULL);
 
 static void
 if_attachdomain1(struct ifnet *ifp)
@@ -2944,7 +2943,7 @@
 if_register_com_alloc(u_char type,
     if_com_alloc_t *a, if_com_free_t *f)
 {
-
+	
 	KASSERT(if_com_alloc[type] == NULL,
 	    ("if_register_com_alloc: %d already registered", type));
 	KASSERT(if_com_free[type] == NULL,

==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#29 (text+ko) ====


==== //depot/projects/vimage/src/sys/net/if_loop.c#29 (text+ko) ====

@@ -108,7 +108,7 @@
 #endif
 
 #ifndef VIMAGE
-struct ifnet *loif = NULL;			/* Used externally */
+struct ifnet *loif;			/* Used externally */
 static LIST_HEAD(lo_list, lo_softc) lo_list;
 #endif /* !VIMAGE */
 

==== //depot/projects/vimage/src/sys/net/route.c#31 (text+ko) ====

@@ -84,9 +84,6 @@
     &rt_add_addr_allfibs, 0, "");
 TUNABLE_INT("net.add_addr_allfibs", &rt_add_addr_allfibs);
 
-#ifndef VIMAGE
-static struct rtstat rtstat;
-
 /* by default only the first 'row' of tables will be accessed. */
 /* 
  * XXXMRT When we fix netstat, and do this differnetly,
@@ -94,8 +91,9 @@
  * things backwards compaitble we need to allocate this 
  * statically.
  */
+#ifndef VIMAGE
 struct radix_node_head *rt_tables[RT_MAXFIBS][AF_MAX+1];
-
+static struct rtstat rtstat;
 static int	rttrash;		/* routes not in table but not freed */
 #endif /* !VIMAGE */
 

==== //depot/projects/vimage/src/sys/netinet/vinet.h#33 (text+ko) ====

@@ -209,7 +209,6 @@
 #define	V_arp_maxtries		VNET_INET(arp_maxtries)
 #define	V_arp_proxyall		VNET_INET(arp_proxyall)
 #define	V_arpt_keep		VNET_INET(arpt_keep)
-#define	V_arpt_prune		VNET_INET(arpt_prune)
 #define	V_blackhole		VNET_INET(blackhole)
 #define	V_divcb			VNET_INET(divcb)
 #define	V_divcbinfo		VNET_INET(divcbinfo)

==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#31 (text+ko) ====

@@ -379,20 +379,18 @@
 int	ip6_hdrnestlimit;	/* How many header options will we process? */
 int	ip6_dad_count;		/* DupAddrDetectionTransmits */
 int	ip6_auto_flowlabel;
-int     ip6_gif_hlim = 0;
+int	ip6_gif_hlim;
 int	ip6_use_deprecated;	/* allow deprecated addr (RFC2462 5.5.4) */
-int	ip6_rr_prune;		/* router renumbering prefix
-				 * walk list every 5 sec. */
+int	ip6_rr_prune;		/* router renumbering prefix */
 int	ip6_mcast_pmtu;		/* enable pMTU discovery for multicast? */
 int	ip6_v6only;
-
 int	ip6_keepfaith;
 time_t	ip6_log_time;
+int	nd6_onlink_ns_rfc4861;	/* allow 'on-link' nd6 NS (as in RFC 4861) */
 #ifdef IPSTEALTH
 int	ip6stealth;
 #endif
 #endif /* !VIMAGE */
-int	nd6_onlink_ns_rfc4861 = 0; /* allow 'on-link' nd6 NS (as in RFC 4861) */
 
 /* icmp6 */
 /*
@@ -577,9 +575,8 @@
 	nd6_maxnudhint, CTLFLAG_RW,	nd6_maxnudhint, 0, "");
 SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG,
 	nd6_debug, CTLFLAG_RW,	nd6_debug,		0, "");
-
-SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861,
-	nd6_onlink_ns_rfc4861, CTLFLAG_RW, &nd6_onlink_ns_rfc4861, 0,
+SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861,
+	nd6_onlink_ns_rfc4861, CTLFLAG_RW, nd6_onlink_ns_rfc4861, 0,
 	"Accept 'on-link' nd6 NS in compliance with RFC 4861.");
 
 static void
@@ -602,6 +599,7 @@
 	V_ip6_v6only = 1;
 	V_ip6_keepfaith = 0;
 	V_ip6_log_time = (time_t)0L;
+	V_nd6_onlink_ns_rfc4861 = 0;
 #ifdef IPSTEALTH
 	V_ip6stealth = 0;
 #endif

==== //depot/projects/vimage/src/sys/netinet6/nd6.h#9 (text+ko) ====

@@ -340,17 +340,8 @@
 extern struct nd_drhead nd_defrouter;
 extern struct nd_prhead nd_prefix;
 extern int nd6_debug;
-#endif
 extern int nd6_onlink_ns_rfc4861;
-
-#define nd6log(x)	do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0)
-
-#ifndef VIMAGE
 extern struct callout nd6_timer_ch;
-#endif
-
-/* nd6_rtr.c */
-#ifndef VIMAGE
 extern int nd6_defifindex;
 extern int ip6_desync_factor;	/* seconds */
 extern u_int32_t ip6_temp_preferred_lifetime; /* seconds */
@@ -358,6 +349,8 @@
 extern int ip6_temp_regen_advance; /* seconds */
 #endif
 
+#define nd6log(x)	do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0)
+
 union nd_opts {
 	struct nd_opt_hdr *nd_opt_array[8];	/* max = target address list */
 	struct {

==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#24 (text+ko) ====

@@ -153,7 +153,7 @@
 			    "(wrong ip6 dst)\n"));
 			goto bad;
 		}
-	} else if (!nd6_onlink_ns_rfc4861) {
+	} else if (!V_nd6_onlink_ns_rfc4861) {
 		struct sockaddr_in6 src_sa6;
 
 		/*

==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#23 (text+ko) ====

@@ -74,6 +74,7 @@
 	struct callout 			_in6_tmpaddrtimer_ch;
 	int				_nd6_inuse;
 	int				_nd6_allocated;
+	int				_nd6_onlink_ns_rfc4861;
 	struct llinfo_nd6		_llinfo_nd6;
 	struct nd_drhead		_nd_defrouter;
 	struct nd_prhead 		_nd_prefix;
@@ -212,6 +213,7 @@
 #define	V_nd6_maxnudhint		VNET_INET6(nd6_maxnudhint)
 #define	V_nd6_maxqueuelen		VNET_INET6(nd6_maxqueuelen)
 #define	V_nd6_mmaxtries			VNET_INET6(nd6_mmaxtries)
+#define	V_nd6_onlink_ns_rfc4861		VNET_INET6(nd6_onlink_ns_rfc4861)
 #define	V_nd6_prune			VNET_INET6(nd6_prune)
 #define	V_nd6_recalc_reachtm_interval	VNET_INET6(nd6_recalc_reachtm_interval)
 #define	V_nd6_slowtimo_ch		VNET_INET6(nd6_slowtimo_ch)

From owner-p4-projects@FreeBSD.ORG  Fri Oct 17 22:13:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B62CC1065714; Fri, 17 Oct 2008 22:13:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61C58106570C
	for ; Fri, 17 Oct 2008 22:13:04 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F29B8FC16
	for ; Fri, 17 Oct 2008 22:13:04 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9HMD4U3055174
	for ; Fri, 17 Oct 2008 22:13:04 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9HMD4Zp055172
	for perforce@freebsd.org; Fri, 17 Oct 2008 22:13:04 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Fri, 17 Oct 2008 22:13:04 GMT
Message-Id: <200810172213.m9HMD4Zp055172@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rfrench@FreeBSD.org using -f
From: Ryan French 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151504 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Fri, 17 Oct 2008 22:13:05 -0000

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

Change 151504 by rfrench@rfrench_mpls on 2008/10/17 22:12:14

	Went through and did some clean up of the code, removing left over code that was no longer needed, and added ina a few copyright notices e.t.c. to my mpls files.

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#12 edit
.. //depot/projects/soc2008/rfrench_mpls/net/netisr.c#3 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#7 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#14 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#8 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#6 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#5 edit

Differences ...

==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#12 (text+ko) ====

@@ -819,29 +819,8 @@
 #ifdef MPLS
 	case ETHERTYPE_MPLS:
 		printf("MPLS packet received\n");
-// 		if (rt)
-// 			dst = rt_key(rt);
-// 		else
-// 			senderr(EHOSTUNREACH);
-// 			
-// 		switch (dst->sa_family) {
-// 			case AF_LINK:
-// 				if (((struct sockaddr_dl *) dst)->sdl_alen <
-// 					sizeof(edst))
-// 						senderr(EHOSTUNREACH);
-// 				bcopy(LLADDR(((struct sockaddr_dl *)dst)), edst,
-// 					sizeof(edst));
-// 				break;
-// 			case AF_INET:
-// 				if (!arpresolve(ac, rt, m, dst, edst))
-// 					return (0); /* if not yet resolved */
-// 				break;
-// 			default:
-// 				senderr(EHOSTUNREACH);
-// 		}
 		/* XXX handling for simplex devices in case of M/BCAST ?? */
 		if (m->m_flags && (M_BCAST | M_MCAST))
-// 			isr = NETISR_MPLS_MCAST;
 			isr = NETISR_MPLS;
 		else
 			isr = NETISR_MPLS;

==== //depot/projects/soc2008/rfrench_mpls/net/netisr.c#3 (text+ko) ====

@@ -150,17 +150,7 @@
 void
 netisr_dispatch(int num, struct mbuf *m)
 {
-#ifdef MPLS_DEBUG
-	if(num == 4) 
-	    printf("entered dispatch\n");
-#endif
-
 	struct netisr *ni;
-	
-#ifdef MPLS_DEBUG
-	if(num == 4 || num == 5) 
-		printf("netisr num = %d\n", num);	
-#endif
 
 	isrstat.isrs_count++;		/* XXX redundant */
 	KASSERT(!(num < 0 || num >= (sizeof(netisrs)/sizeof(*netisrs))),
@@ -194,11 +184,7 @@
 		 */
 		ni->ni_handler(m);
 	} else {
-		isrstat.isrs_deferred++;
-#ifdef MPLS_DEBUG
-		if (m == NULL)
-			printf("m is NULL\n");
-#endif		
+		isrstat.isrs_deferred++;		
 		if (IF_HANDOFF(ni->ni_queue, m, NULL))
 			schednetisr(num);
 	}

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls.h#7 (text+ko) ====

@@ -3,6 +3,9 @@
  * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
  * All rights reserved.
  *
+ * Copyright (c) 2008 Ryan James French
+ * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -84,14 +87,14 @@
  */
 
 struct sockaddr_mpls {
-        u_int8_t        smpls_len;                /* length */
-        u_int8_t        smpls_family;                /* AF_MPLS */
+        u_int8_t        smpls_len;         		    /* length */
+        u_int8_t        smpls_family;  	   	        /* AF_MPLS */
         u_int8_t        smpls_operation;
-        u_int8_t        smpls_out_exp;                /* outgoing exp value */
-        u_int32_t        smpls_out_label;        /* outgoing MPLS label */
+        u_int8_t        smpls_out_exp;            	/* outgoing exp value */
+        u_int32_t        smpls_out_label;        	/* outgoing MPLS label */
         u_int16_t        smpls_out_ifindex;
         u_int16_t        smpls_in_ifindex;
-        u_int32_t        smpls_in_label;                /* MPLS label 20 bits*/
+        u_int32_t        smpls_in_label;            /* MPLS label 20 bits*/
 //#if MPLS_MCAST
 //        u_int8_t smpls_mcexp;
 //        u_int8_t smpls_pad2[2];

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#14 (text+ko) ====

@@ -2,6 +2,9 @@
 /*
  * Copyright (c) 2008 Claudio Jeker 
  *
+ * Copyright (c) 2008 Ryan James French
+ * All rights reserved.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
@@ -105,6 +108,7 @@
                 return;
         }
 
+		//Remove comments once routing has been implemented
         /* drop all broadcast and multicast packets */
         //if (m->m_flags & (M_BCAST | M_MCAST)) {
         //        m_freem(m);
@@ -154,7 +158,7 @@
 /* uncomment below once routing is implemented */
 		//rt = rtalloc1(smplstosa(smpls),1, 0);
                 
-//Uncomment this section when routing has been setup
+//Uncomment this section when routing has been implemented
 //                 if (rt == NULL) {
 //                         /* no entry for this label */
 // #ifdef MPLS_DEBUG
@@ -209,7 +213,7 @@
                 /* refetch label */
                 shim = mtod(m, struct shim_hdr *);
 
-        /* Remove once routing is implemented */     
+        /* Remove comments once routing is implemented */     
 	//	ifp = rt->rt_ifp;
 
                 if (smpls->smpls_out_ifindex)

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#8 (text+ko) ====

@@ -3,6 +3,9 @@
  * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
  * All rights reserved.
  *
+ * Copyright (c) 2008 Ryan James French
+ * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_raw.c#6 (text+ko) ====

@@ -3,6 +3,9 @@
  * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
  * All rights reserved.
  *
+ * Copyright (c) 2008 Ryan James French
+ * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -55,16 +58,10 @@
 u_long mpls_raw_recvspace = MPLS_RAW_RCVQ;
 
 int mpls_enable = 1;
-// SYSCTL_INT(	_net_mpls, MPLSCTL_ENABLE, enable, CTLFLAG_RW,
-// 	&mpls_enable, 0, "Enable the MPLS protocol");
 
 int mpls_defttl = 255;
-// SYSCTL_INT(	_net_mpls, MPLSCTL_DEFTTL, ttl, CTLFLAG_RW,
-// 	&mpls_defttl, 0, "Maximum TTL on MPLS packets");
 
 int mpls_inkloop = 16;
-// SYSCTL_INT(	_net_mpls, MPLSCTL_MAXINKLOOP, inkloop, CTLFLAG_RW,
-// 	&mpls_inkloop, 0, "Set MPLS Max Ink Loop");
 
 int mpls_push_expnull_ip = 0;
 int mpls_push_expnull_ip6 = 0;
@@ -119,72 +116,3 @@
 	.pru_soreceive = pru_soreceive_notsupp,
 	.pru_sopoll = pru_sopoll_notsupp
 };
-
-// int
-// mpls_raw_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
-//     struct mbuf *control, struct proc *p)
-// {
-//         int error = 0;
-// 
-// #ifdef MPLS_DEBUG
-//         printf("mpls_raw_usrreq: called! (reqid=%d).\n", req);
-// #endif  /* MPLS_DEBUG */
-// 
-//         if (req == PRU_CONTROL)
-//                 return (mpls_control(so, (u_long)m, (caddr_t)nam,
-//                     (struct ifnet *)control));
-// 
-//         switch (req) {
-//         case PRU_ATTACH:
-//                 if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
-//                         error = soreserve(so, mpls_raw_sendspace,
-//                                 mpls_raw_recvspace);
-//                         if (error)
-//                                 break;
-//                 }
-//                 break;
-// 
-//         case PRU_DETACH:
-//         case PRU_BIND:
-//         case PRU_LISTEN:
-//         case PRU_CONNECT:
-//         case PRU_CONNECT2:
-//         case PRU_DISCONNECT:
-//         case PRU_SHUTDOWN:
-//         case PRU_RCVD:
-//         case PRU_SEND:
-//         case PRU_SENSE:
-//         case PRU_RCVOOB:
-//         case PRU_SENDOOB:
-//         case PRU_SOCKADDR:
-//         case PRU_PEERADDR:
-//                 error = EOPNOTSUPP;
-//                 break;
-// 
-//         default:
-//                 panic("rip_usrreq");
-//         }
-// 
-//         return (error);
-// }
-
-// int
-// mpls_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
-//     size_t newlen)
-// {
-//         if (name[0] >= MPLSCTL_MAXID)
-//                 return EOPNOTSUPP;
-// 
-//         /* Almost all sysctl names at this level are terminal. */
-//         if (namelen != 1 && name[0] != MPLSCTL_IFQUEUE)
-//                 return (ENOTDIR);
-// 
-//         switch (name[0]) {
-//         case MPLSCTL_IFQUEUE:
-//                 return (sysctl_ifq(name + 1, namelen - 1,
-//                     oldp, oldlenp, newp, newlen, &mplsintrq));
-//         default:
-//                 return sysctl_int_arr(mplsctl_vars, name, namelen,
-//                     oldp, oldlenp, newp, newlen);
-//         }
-// }

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_shim.c#5 (text+ko) ====

@@ -3,6 +3,9 @@
  * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
  * All rights reserved.
  *
+ * Copyright (c) 2008 Ryan James French
+ * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 12:52:44 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF628106569C; Sat, 18 Oct 2008 12:52:44 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68D581065697
	for ; Sat, 18 Oct 2008 12:52:44 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outC.internet-mail-service.net (outc.internet-mail-service.net
	[216.240.47.226])
	by mx1.freebsd.org (Postfix) with ESMTP id 53B928FC15
	for ; Sat, 18 Oct 2008 12:52:44 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from idiom.com (mx0.idiom.com [216.240.32.160])
	by out.internet-mail-service.net (Postfix) with ESMTP id 177072416;
	Sat, 18 Oct 2008 05:52:45 -0700 (PDT)
Received: from julian-mac.elischer.org (localhost [127.0.0.1])
	by idiom.com (Postfix) with ESMTP id E9FBC2D6011;
	Sat, 18 Oct 2008 05:52:42 -0700 (PDT)
Message-ID: <48F9DC1C.6050704@elischer.org>
Date: Sat, 18 Oct 2008 20:52:44 +0800
From: Julian Elischer 
User-Agent: Thunderbird 2.0.0.17 (Macintosh/20080914)
MIME-Version: 1.0
To: Marko Zec 
References: <200810171328.m9HDS2aF039954@repoman.freebsd.org>
In-Reply-To: <200810171328.m9HDS2aF039954@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews 
Subject: Re: PERFORCE change 151482 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 12:52:45 -0000

Marko Zec wrote:

> @@ -2944,7 +2943,7 @@
>  if_register_com_alloc(u_char type,
>      if_com_alloc_t *a, if_com_free_t *f)
>  {
> -
> +	
>  	KASSERT(if_com_alloc[type] == NULL,
>  	    ("if_register_com_alloc: %d already registered", type));
>  	KASSERT(if_com_free[type] == NULL,
> 


whitespace changed the wrong way..


From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 18:35:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 686CF1065690; Sat, 18 Oct 2008 18:35:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29CA7106568D
	for ; Sat, 18 Oct 2008 18:35:13 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 169F38FC17
	for ; Sat, 18 Oct 2008 18:35:13 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9IIZDPC039457
	for ; Sat, 18 Oct 2008 18:35:13 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9IIZCeF039455
	for perforce@freebsd.org; Sat, 18 Oct 2008 18:35:12 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sat, 18 Oct 2008 18:35:12 GMT
Message-Id: <200810181835.m9IIZCeF039455@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151518 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 18:35:13 -0000

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

Change 151518 by rene@rene_self on 2008/10/18 18:34:30

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#10 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#8 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#16 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/disks/chapter.sgml#7 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#12 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#8 integrate
.. //depot/projects/docproj_nl/www/en/administration.sgml#5 integrate
.. //depot/projects/docproj_nl/www/en/docproj/translations.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/donations/index.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/faq2.sgml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#3 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 2004
       2005
       2006
+      2007
+      2008
       The FreeBSD Documentation Project
     
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
     
@@ -158,7 +158,7 @@
       instruction immediately following the function call.  (Inspired
       by )
 
-#include stdio.h
+#include <stdio.h>
 
 void manipulate(char *buffer) {
   char newbuffer[80];

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#10 (text+ko) ====

@@ -12,7 +12,7 @@
 
     The &os; Documentation Project
 
-    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1100 2008/10/02 12:32:54 pgj Exp $
+    $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1102 2008/10/18 08:54:27 manolis Exp $
 
     
       1995
@@ -6333,6 +6333,12 @@
 
 	  &prompt.root; sysctl hw.syscons.kbd_reboot=0
 
+	  
+	    The above two methods are exclusive:  The &man.sysctl.8;
+	      does not exist if you compile your kernel with the
+	      SC_DISABLE_REBOOT option.
+	  
+
 	  If you use the &man.pcvt.4; console driver, use the
 	    following kernel configuration line instead and rebuild the
 	    kernel:

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -540,6 +540,11 @@
 	      &a.x11.name;
 	      Maintenance and support of X11 on FreeBSD
 	    
+
+	    
+	      &a.xen.name;
+	      Discussion of the freebsd port to xen - implementation and usage
+	    
 	  
 	
       
@@ -1661,6 +1666,21 @@
 	      examples and past reports there, too.
 	  
 	
+
+	
+	  &a.xen.name;
+
+	  
+	    Discussion of the freebsd port to xen
+	      - implementation and usage
+
+	    A list that focuses on the FreeBSD Xen port. The
+	      anticipated traffic level is small enough that it is
+	      intended as a forum for both technical discussions of
+	      the implementation and design details as well as
+	      administrative deployment issues.
+	  
+	
       
     
     

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#8 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
@@ -492,6 +492,10 @@
 FreeBSD X11 mailing list">
 freebsd-x11">
 
+
+Discussion of the freebsd port to xen - implementation and usage">
+freebsd-xen">
+
 
 
 bug-followup@FreeBSD.org">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#16 (text+ko) ====

@@ -1,7 +1,7 @@
 
+
 
 
   
     
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.36 2008/09/02 17:44:03 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.37 2008/10/18 16:55:21 erwin Exp $
     
   
 
@@ -609,22 +609,6 @@
     
   
 
-  
-    Anthony Carmody Consulting
-    http://www.carmoda.com
-    
-      Anthony Carmody Consulting offers a range of Internet related
-      FreeBSD services including: Shared Web Hosting, Dedicated
-      Servers, Co-location and Remote Administration and Monitoring.
-      We currently maintain a list of: Mail, DNS, Web, Database, IM,
-      Streaming Media, Network Management and File/Backup Servers.
-      Customers can supply hardware or purchase directly from us.  All
-      supplied servers are based on a high quality rack mounted 1RU
-      Chenbro chassis, Supermicro Mainboards, ECC registered RAM and
-      3Ware Disc Controllers.  Tower servers are available on request.
-    
-  
-
   
     JohnCompanies
     http://www.johncompanies.com
@@ -851,18 +835,6 @@
     
   
 
-  
-    FirmbIT
-    http://www.firmbit.com/index.php
-    
-      FirmbIT is a high quality server management and security company
-      providing friendly reliable support specializing in high security
-      installations and scaleable solutions with support for FreeBSD,
-      OpenBSD, NetBSD, Redhat, Fedora, CentOS, Debian, Slackware, Gentoo,
-      SuSe, Mandrake and Sun Solaris servers.
-    
-  
-
   
     Colocrossing
     http://www.colocrossing.com

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 22:54:36 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EE501065690; Sat, 18 Oct 2008 22:54:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4265B1065689
	for ; Sat, 18 Oct 2008 22:54:36 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 30CD68FC19
	for ; Sat, 18 Oct 2008 22:54:36 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9IMsag9073773
	for ; Sat, 18 Oct 2008 22:54:36 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9IMsa3h073770
	for perforce@freebsd.org; Sat, 18 Oct 2008 22:54:36 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 22:54:36 GMT
Message-Id: <200810182254.m9IMsa3h073770@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151520 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 22:54:36 -0000

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

Change 151520 by sam@sam_ebb on 2008/10/18 22:54:31

	add 1/2 and 1/4 rate channels to "all" so lookups work
	(amongst other stuff)

Affected files ...

.. //depot/projects/vap/sys/net80211/_ieee80211.h#11 edit

Differences ...

==== //depot/projects/vap/sys/net80211/_ieee80211.h#11 (text+ko) ====

@@ -192,6 +192,7 @@
 #define	IEEE80211_CHAN_ALL \
 	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_GFSK | \
 	 IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN | \
+	 IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER | \
 	 IEEE80211_CHAN_HT)
 #define	IEEE80211_CHAN_ALLTURBO \
 	(IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 22:58:40 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BAD62106568D; Sat, 18 Oct 2008 22:58:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E9861065688
	for ; Sat, 18 Oct 2008 22:58:40 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D3918FC16
	for ; Sat, 18 Oct 2008 22:58:40 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9IMwe8S074086
	for ; Sat, 18 Oct 2008 22:58:40 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9IMweoT074084
	for perforce@freebsd.org; Sat, 18 Oct 2008 22:58:40 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 22:58:40 GMT
Message-Id: <200810182258.m9IMweoT074084@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151521 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 22:58:41 -0000

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

Change 151521 by sam@sam_ebb on 2008/10/18 22:58:23

	when joining an existing bss mark IEEE80211_NODE_ERP and
	setup ni_txparms appropriately; this makes ni_txparms
	useful in drivers where before it was set incorrectly

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_node.c#49 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_node.c#49 (text+ko) ====

@@ -749,6 +749,9 @@
 	/* NB: must be after ni_chan is setup */
 	ieee80211_setup_rates(ni, se->se_rates, se->se_xrates,
 		IEEE80211_F_DOSORT);
+	if (ieee80211_iserp_rateset(&ni->ni_rates))
+		ni->ni_flags |= IEEE80211_NODE_ERP;
+	node_setuptxparms(ni);
 
 	return ieee80211_sta_join1(ieee80211_ref_node(ni));
 }

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:06:49 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 39C6C106568E; Sat, 18 Oct 2008 23:06:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D91CB106568A
	for ; Sat, 18 Oct 2008 23:06:48 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C6E088FC18
	for ; Sat, 18 Oct 2008 23:06:48 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9IN6mJF075862
	for ; Sat, 18 Oct 2008 23:06:48 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9IN6mkD075860
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:06:48 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:06:48 GMT
Message-Id: <200810182306.m9IN6mkD075860@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151522 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:06:49 -0000

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

Change 151522 by sam@sam_ebb on 2008/10/18 23:06:02

	o remove explicit call to ath_newassoc now that net80211 calls
	  the driver on joining a bss; note this also fixes adhoc mode
	  in that we assign a clr key to the master
	o remove ath_rate_newstate as it is no longer needed with the
	  callbacks to ath_newassoc

Affected files ...

.. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#11 edit
.. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#14 edit
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#14 edit
.. //depot/projects/vap/sys/dev/ath/if_ath.c#96 edit
.. //depot/projects/vap/sys/dev/ath/if_athrate.h#10 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#11 (text+ko) ====

@@ -320,49 +320,6 @@
 #undef RATE
 }
 
-static void
-ath_rate_cb(void *arg, struct ieee80211_node *ni)
-{
-	struct ath_softc *sc = arg;
-
-	ath_rate_update(sc, ni, 0);
-}
-
-/*
- * Reset the rate control state for each 802.11 state transition.
- */
-void
-ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state)
-{
-	struct ieee80211com *ic = vap->iv_ic;
-	struct ath_softc *sc = ic->ic_ifp->if_softc;
-	struct ieee80211_node *ni;
-
-	if (state == IEEE80211_S_INIT)
-		return;
-	if (vap->iv_opmode == IEEE80211_M_STA) {
-		/*
-		 * Reset local xmit state; this is really only
-		 * meaningful when operating in station mode.
-		 */
-		ni = vap->iv_bss;
-		if (state == IEEE80211_S_RUN) {
-			ath_rate_ctl_start(sc, ni);
-		} else {
-			ath_rate_update(sc, ni, 0);
-		}
-	} else {
-		/*
-		 * When operating as a station the node table holds
-		 * the AP's that were discovered during scanning.
-		 * For any other operating mode we want to reset the
-		 * tx rate state of each node.
-		 */
-		ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
-		ath_rate_update(sc, vap->iv_bss, 0);
-	}
-}
-
 /* 
  * Examine and potentially adjust the transmit rate.
  */

==== //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#14 (text+ko) ====

@@ -294,49 +294,6 @@
 #undef RATE
 }
 
-static void
-ath_rate_cb(void *arg, struct ieee80211_node *ni)
-{
-	struct ath_softc *sc = arg;
-
-	ath_rate_update(sc, ni, 0);
-}
-
-/*
- * Reset the rate control state for each 802.11 state transition.
- */
-void
-ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state)
-{
-	struct ieee80211com *ic = vap->iv_ic;
-	struct ath_softc *sc = ic->ic_ifp->if_softc;
-	struct ieee80211_node *ni;
-
-	if (state == IEEE80211_S_INIT)
-		return;
-	if (vap->iv_opmode == IEEE80211_M_STA) {
-		/*
-		 * Reset local xmit state; this is really only
-		 * meaningful when operating in station mode.
-		 */
-		ni = vap->iv_bss;
-		if (state == IEEE80211_S_RUN) {
-			ath_rate_ctl_start(sc, ni);
-		} else {
-			ath_rate_update(sc, ni, 0);
-		}
-	} else {
-		/*
-		 * When operating as a station the node table holds
-		 * the AP's that were discovered during scanning.
-		 * For any other operating mode we want to reset the
-		 * tx rate state of each node.
-		 */
-		ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc);
-		ath_rate_update(sc, vap->iv_bss, 0);
-	}
-}
-
 /* 
  * Examine and potentially adjust the transmit rate.
  */

==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#14 (text+ko) ====

@@ -761,34 +761,6 @@
 }
 
 static void
-rate_cb(void *arg, struct ieee80211_node *ni)
-{
-	struct ath_softc *sc = arg;
-
-	ath_rate_newassoc(sc, ATH_NODE(ni), 1);
-}
-
-/*
- * Reset the rate control state for each 802.11 state transition.
- */
-void
-ath_rate_newstate(struct ieee80211vap *vap, enum ieee80211_state state)
-{
-	struct ieee80211com *ic = vap->iv_ic;
-	struct ath_softc *sc = ic->ic_ifp->if_softc;
-
-	if (state == IEEE80211_S_RUN) {
-		if (vap->iv_opmode != IEEE80211_M_STA) {
-			/*
-			 * Sync rates for associated stations and neighbors.
-			 */
-			ieee80211_iterate_nodes(&ic->ic_sta, rate_cb, sc);
-		}
-		ath_rate_newassoc(sc, ATH_NODE(vap->iv_bss), 1);
-	}
-}
-
-static void
 ath_rate_sysctlattach(struct ath_softc *sc, struct sample_softc *osc)
 {
 	struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev);

==== //depot/projects/vap/sys/dev/ath/if_ath.c#96 (text+ko) ====

@@ -5699,11 +5699,6 @@
 			if (ath_hal_keyisvalid(ah, i))
 				ath_hal_keysetmac(ah, i, ni->ni_bssid);
 	}
-	/*
-	 * Notify the rate control algorithm so rates
-	 * are setup should ath_beacon_alloc be called.
-	 */
-	ath_rate_newstate(vap, nstate);
 
 	/*
 	 * Invoke the parent method to do net80211 work.

==== //depot/projects/vap/sys/dev/ath/if_athrate.h#10 (text+ko) ====

@@ -97,12 +97,6 @@
  */
 void	ath_rate_newassoc(struct ath_softc *, struct ath_node *,
 		int isNewAssociation);
-/*
- * Update/reset rate control state for 802.11 state transitions.
- * Important mostly as the analog to ath_rate_newassoc when operating
- * in station mode.
- */
-void	ath_rate_newstate(struct ieee80211vap *, enum ieee80211_state);
 
 /*
  * Transmit handling.

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:12:55 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A3771065691; Sat, 18 Oct 2008 23:12:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D621106568F
	for ; Sat, 18 Oct 2008 23:12:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B9518FC12
	for ; Sat, 18 Oct 2008 23:12:55 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INCtBP076317
	for ; Sat, 18 Oct 2008 23:12:55 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INCseH076315
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:12:54 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:12:54 GMT
Message-Id: <200810182312.m9INCseH076315@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151523 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:12:56 -0000

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

Change 151523 by sam@sam_ebb on 2008/10/18 23:12:24

	remove explicit call to driver newassoc callback; it
	should no longer been needed now that net80211 does it

Affected files ...

.. //depot/projects/vap/sys/dev/iwn/if_iwn.c#24 edit
.. //depot/projects/vap/sys/dev/mwl/if_mwl.c#17 edit
.. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#11 edit
.. //depot/projects/vap/sys/dev/ral/rt2560.c#41 edit
.. //depot/projects/vap/sys/dev/ral/rt2661.c#40 edit
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#29 edit
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#31 edit

Differences ...

==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#24 (text+kox) ====

@@ -3645,11 +3645,6 @@
 		return error;
 	}
 
-	if (ic->ic_opmode == IEEE80211_M_STA) {
-		/* fake a join to init the tx rate */
-		iwn_newassoc(ni, 1);
-	}
-
 	error = iwn_init_sensitivity(sc);
 	if (error != 0) {
 		device_printf(sc->sc_dev,

==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#17 (text+ko) ====

@@ -4573,8 +4573,6 @@
 			mwl_hal_setassocid(hvap, ni->ni_bssid, ni->ni_associd);
 			mwl_setrates(vap);
 			mwl_hal_setrtsthreshold(hvap, vap->iv_rtsthreshold);
-			/* NB: net80211 doesn't call back; do it explicitly */
-			mwl_newassoc(ni, 1);
 			break;
 		case IEEE80211_M_WDS:
 			DPRINTF(sc, MWL_DEBUG_STATE, "%s: %s: bssid %s\n",

==== //depot/projects/vap/sys/dev/ral/if_ral_pci.c#11 (text+ko) ====


==== //depot/projects/vap/sys/dev/ral/rt2560.c#41 (text) ====

@@ -831,13 +831,8 @@
 		/* turn assocation led on */
 		rt2560_update_led(sc, 1, 0);
 
-		if (vap->iv_opmode != IEEE80211_M_MONITOR) {
-			if (vap->iv_opmode == IEEE80211_M_STA) {
-				/* fake a join to init the tx rate */
-				rt2560_newassoc(ni, 1);
-			}
+		if (vap->iv_opmode != IEEE80211_M_MONITOR)
 			rt2560_enable_tsf_sync(sc);
-		}
 	}
 	return error;
 }

==== //depot/projects/vap/sys/dev/ral/rt2661.c#40 (text) ====

@@ -878,13 +878,8 @@
 			if (error != 0)
 				return error;
 		}
-		if (vap->iv_opmode != IEEE80211_M_MONITOR) {
-			if (vap->iv_opmode == IEEE80211_M_STA) {
-				/* fake a join to init the tx rate */
-				rt2661_newassoc(ni, 1);
-			}
+		if (vap->iv_opmode != IEEE80211_M_MONITOR)
 			rt2661_enable_tsf_sync(sc);
-		}
 	}
 	return error;
 }

==== //depot/projects/vap/sys/dev/usb/if_zyd.c#29 (text+ko) ====

@@ -740,11 +740,6 @@
 			IEEE80211_ADDR_COPY(sc->sc_bssid, ni->ni_bssid);
 			zyd_set_bssid(sc, sc->sc_bssid);
 		}
-
-		if (vap->iv_opmode == IEEE80211_M_STA) {
-			/* fake a join to init the tx rate */
-			zyd_newassoc(ni, 1);
-		}
 		break;
 	}
 	default:

==== //depot/projects/vap/sys/dev/wpi/if_wpi.c#31 (text+ko) ====

@@ -2522,11 +2522,6 @@
 		return error;
 	}
 
-	if (vap->iv_opmode == IEEE80211_M_STA) {
-		/* fake a join to init the tx rate */
-		wpi_newassoc(ni, 1);
-	}
-
 	/* link LED always on while associated */
 	wpi_set_led(sc, WPI_LED_LINK, 0, 1);
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:15:59 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0469D1065687; Sat, 18 Oct 2008 23:15:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC25D1065699
	for ; Sat, 18 Oct 2008 23:15:58 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AA1D28FC13
	for ; Sat, 18 Oct 2008 23:15:58 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INFwJX076556
	for ; Sat, 18 Oct 2008 23:15:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INFw4R076554
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:15:58 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:15:58 GMT
Message-Id: <200810182315.m9INFw4R076554@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151524 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:15:59 -0000

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

Change 151524 by sam@sam_ebb on 2008/10/18 23:15:52

	remove driver-private txparms tracking, net80211 does
	this for us now

Affected files ...

.. //depot/projects/vap/sys/dev/mwl/if_mwl.c#18 edit
.. //depot/projects/vap/sys/dev/mwl/if_mwlvar.h#3 edit

Differences ...

==== //depot/projects/vap/sys/dev/mwl/if_mwl.c#18 (text+ko) ====

@@ -1068,31 +1068,20 @@
 {
 	struct mwl_vap *mvp = MWL_VAP(vap);
 	struct ieee80211_node *ni = vap->iv_bss;
-	enum ieee80211_phymode mode;
+	const struct ieee80211_txparam *tp = ni->ni_txparms;
 	MWL_HAL_TXRATE rates;
 
 	KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state));
 
-	mode = ieee80211_chan2mode(ni->ni_chan);
 	/*
-	 * Use legacy rates when operating a mixed HT+non-HT bss.
-	 * NB: this may violate POLA for sta and wds vap's.
-	 */
-	if (mode == IEEE80211_MODE_11NA &&
-	    (vap->iv_flags_ext & IEEE80211_FEXT_PUREN) == 0)
-		mode = IEEE80211_MODE_11A;
-	else if (mode == IEEE80211_MODE_11NG &&
-	    (vap->iv_flags_ext & IEEE80211_FEXT_PUREN) == 0)
-		mode = IEEE80211_MODE_11G;
-	/*
 	 * Update the h/w rate map.
 	 * NB: 0x80 for MCS is passed through unchanged
 	 */
 	memset(&rates, 0, sizeof(rates));
 	/* rate used to send management frames */
-	rates.MgtRate = vap->iv_txparms[mode].mgmtrate;
+	rates.MgtRate = tp->mgmtrate;
 	/* rate used to send multicast frames */
-	rates.McastRate = vap->iv_txparms[mode].mcastrate;
+	rates.McastRate = tp->mcastrate;
 
 	/* while here calculate EAPOL fixed rate cookie */
 	mvp->mv_eapolformat = htole16(mwl_calcformat(rates.MgtRate, ni));
@@ -2663,8 +2652,6 @@
 		/* XXX stat+msg */
 		return NULL;
 	}
-	/* XXX setup initial mn_tp */
-
 	DPRINTF(sc, MWL_DEBUG_NODE, "%s: mn %p\n", __func__, mn);
 	return &mn->mn_node;
 }
@@ -3688,7 +3675,7 @@
 		break;
 	case IEEE80211_FC0_TYPE_DATA:
 		if (!ismcast) {
-			const struct ieee80211_txparam *tp = mn->mn_tp;
+			const struct ieee80211_txparam *tp = ni->ni_txparms;
 			/*
 			 * EAPOL frames get forced to a fixed rate and w/o
 			 * aggregation; otherwise check for any fixed rate
@@ -4737,22 +4724,6 @@
 		    __func__, error);
 		/* XXX how to deal with error? */
 	}
-	/*
-	 * Setup fixed rate state; it may change on re-associate (?).
-	 */
-	if (ni->ni_flags & IEEE80211_NODE_HT) {
-		if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan))
-			mn->mn_tp = &vap->iv_txparms[IEEE80211_MODE_11NA];
-		else
-			mn->mn_tp = &vap->iv_txparms[IEEE80211_MODE_11NG];
-	} else {			/* legacy rate handling */
-		if (IEEE80211_IS_CHAN_A(ni->ni_chan))
-			mn->mn_tp = &vap->iv_txparms[IEEE80211_MODE_11A];
-		else if (ni->ni_flags & IEEE80211_NODE_ERP)
-			mn->mn_tp = &vap->iv_txparms[IEEE80211_MODE_11G];
-		else
-			mn->mn_tp = &vap->iv_txparms[IEEE80211_MODE_11B];
-	}
 }
 
 /*

==== //depot/projects/vap/sys/dev/mwl/if_mwlvar.h#3 (text+ko) ====

@@ -218,7 +218,6 @@
 	uint16_t	mn_staid;	/* firmware station id */
 	struct mwl_bastate mn_ba[MWL_MAXBA];
 	struct mwl_hal_vap *mn_hvap;	/* hal vap handle */
-	const struct ieee80211_txparam *mn_tp;
 };
 #define	MWL_NODE(ni)		((struct mwl_node *)(ni))
 #define	MWL_NODE_CONST(ni)	((const struct mwl_node *)(ni))

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:18:01 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F3CB91065697; Sat, 18 Oct 2008 23:18:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B74891065692
	for ; Sat, 18 Oct 2008 23:18:00 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A58468FC08
	for ; Sat, 18 Oct 2008 23:18:00 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INI09t076680
	for ; Sat, 18 Oct 2008 23:18:00 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INI0nT076678
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:18:00 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:18:00 GMT
Message-Id: <200810182318.m9INI0nT076678@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151525 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:18:01 -0000

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

Change 151525 by sam@sam_ebb on 2008/10/18 23:17:30

	don't reset the inactivity timer on tx ok status unless we
	actually got an ACK back

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#97 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#97 (text+ko) ====

@@ -5054,7 +5054,8 @@
 				pri = M_WME_GETAC(bf->bf_m);
 				if (pri >= WME_AC_VO)
 					ic->ic_wme.wme_hipri_traffic++;
-				ni->ni_inact = ni->ni_inact_reload;
+				if ((bf->bf_flags & HAL_TXDESC_NOACK) == 0)
+					ni->ni_inact = ni->ni_inact_reload;
 			} else {
 				if (ts->ts_status & HAL_TXERR_XRETRY)
 					sc->sc_stats.ast_tx_xretries++;

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:20:03 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2EC73106568F; Sat, 18 Oct 2008 23:20:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E8A321065693
	for ; Sat, 18 Oct 2008 23:20:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D6F738FC12
	for ; Sat, 18 Oct 2008 23:20:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INK2LV076847
	for ; Sat, 18 Oct 2008 23:20:02 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INK2sp076845
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:20:02 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:20:02 GMT
Message-Id: <200810182320.m9INK2sp076845@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151526 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:20:03 -0000

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

Change 151526 by sam@sam_ebb on 2008/10/18 23:19:07

	update the tx rssi only when the frame was ACK'd

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#98 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#98 (text+ko) ====

@@ -5048,9 +5048,6 @@
 				sc->sc_ant_tx[txant]++;
 				if (ts->ts_rate & HAL_TXSTAT_ALTRATE)
 					sc->sc_stats.ast_tx_altrate++;
-				sc->sc_stats.ast_tx_rssi = ts->ts_rssi;
-				ATH_RSSI_LPF(sc->sc_halstats.ns_avgtxrssi,
-					ts->ts_rssi);
 				pri = M_WME_GETAC(bf->bf_m);
 				if (pri >= WME_AC_VO)
 					ic->ic_wme.wme_hipri_traffic++;
@@ -5076,11 +5073,16 @@
 			if ((ts->ts_status & HAL_TXERR_FILT) == 0 &&
 			    (bf->bf_flags & HAL_TXDESC_NOACK) == 0) {
 				/*
-				 * If frame was ack'd update the last rx time
-				 * used to workaround phantom bmiss interrupts.
+				 * If frame was ack'd update statistics,
+				 * including the last rx time used to
+				 * workaround phantom bmiss interrupts.
 				 */
-				if (ts->ts_status == 0)
+				if (ts->ts_status == 0) {
 					nacked++;
+					sc->sc_stats.ast_tx_rssi = ts->ts_rssi;
+					ATH_RSSI_LPF(sc->sc_halstats.ns_avgtxrssi,
+						ts->ts_rssi);
+				}
 				ath_rate_tx_complete(sc, an, bf);
 			}
 			/*

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:21:04 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 741DC106568C; Sat, 18 Oct 2008 23:21:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 387E51065689
	for ; Sat, 18 Oct 2008 23:21:04 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0D7588FC0A
	for ; Sat, 18 Oct 2008 23:21:04 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INL3Gq076998
	for ; Sat, 18 Oct 2008 23:21:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INL3Ax076996
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:21:03 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:21:03 GMT
Message-Id: <200810182321.m9INL3Ax076996@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151527 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:21:04 -0000

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

Change 151527 by sam@sam_ebb on 2008/10/18 23:20:20

	don't indicate success status in the tx callback unless the frame
	was ACK'd

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#99 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#99 (text+ko) ====

@@ -5091,7 +5091,8 @@
 			 */
 			if (bf->bf_m->m_flags & M_TXCB)
 				ieee80211_process_callback(ni, bf->bf_m,
-					ts->ts_status);
+				    (bf->bf_flags & HAL_TXDESC_NOACK) == 0 ?
+				        ts->ts_status : HAL_TXERR_XRETRY);
 			/*
 			 * Reclaim reference to node.
 			 *

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:21:05 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76B571065738; Sat, 18 Oct 2008 23:21:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 627A1106568A
	for ; Sat, 18 Oct 2008 23:21:04 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 377B58FC0C
	for ; Sat, 18 Oct 2008 23:21:04 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INL4qb077003
	for ; Sat, 18 Oct 2008 23:21:04 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INL4Pu077001
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:21:04 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:21:04 GMT
Message-Id: <200810182321.m9INL4Pu077001@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151528 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:21:05 -0000

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

Change 151528 by sam@sam_ebb on 2008/10/18 23:20:50

	fix comment

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#100 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#100 (text+ko) ====

@@ -5231,7 +5231,7 @@
 
 	/*
 	 * NB: this assumes output has been stopped and
-	 *     we do not need to block ath_tx_tasklet
+	 *     we do not need to block ath_tx_proc
 	 */
 	for (ix = 0;; ix++) {
 		ATH_TXQ_LOCK(txq);

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:22:05 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C36F8106569D; Sat, 18 Oct 2008 23:22:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 86D491065694
	for ; Sat, 18 Oct 2008 23:22:05 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C2148FC17
	for ; Sat, 18 Oct 2008 23:22:05 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INM5Mi077079
	for ; Sat, 18 Oct 2008 23:22:05 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INM5XS077077
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:22:05 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:22:05 GMT
Message-Id: <200810182322.m9INM5XS077077@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151529 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:22:06 -0000

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

Change 151529 by sam@sam_ebb on 2008/10/18 23:21:46

	set the bssid in ahdemo mode too

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#101 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#101 (text+ko) ====

@@ -5686,6 +5686,7 @@
 	ni = vap->iv_bss;
 	rfilt = ath_calcrxfilter(sc);
 	stamode = (vap->iv_opmode == IEEE80211_M_STA ||
+		   vap->iv_opmode == IEEE80211_M_AHDEMO ||
 		   vap->iv_opmode == IEEE80211_M_IBSS);
 	if (stamode && nstate == IEEE80211_S_RUN) {
 		sc->sc_curaid = ni->ni_associd;

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:23:06 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4E001065693; Sat, 18 Oct 2008 23:23:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 995CF1065691
	for ; Sat, 18 Oct 2008 23:23:06 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 87D418FC0A
	for ; Sat, 18 Oct 2008 23:23:06 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INN6Jf077142
	for ; Sat, 18 Oct 2008 23:23:06 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INN6bp077140
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:23:06 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:23:06 GMT
Message-Id: <200810182323.m9INN6bp077140@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151530 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:23:07 -0000

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

Change 151530 by sam@sam_ebb on 2008/10/18 23:22:38

	don't make explicit call to ath_newassoc on reaching RUN state
	in sta mode (missed in previous commit)

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#102 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#102 (text+ko) ====

@@ -5757,10 +5757,6 @@
 			break;
 		case IEEE80211_M_STA:
 			/*
-			 * Fakeup since we're not called by net80211.
-			 */
-			ath_newassoc(ni, 1);
-			/*
 			 * Defer beacon timer configuration to the next
 			 * beacon frame so we have a current TSF to use
 			 * (any TSF collected when scanning is likely old).

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:25:09 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 214EB106569A; Sat, 18 Oct 2008 23:25:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8F251065696
	for ; Sat, 18 Oct 2008 23:25:08 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C78B78FC15
	for ; Sat, 18 Oct 2008 23:25:08 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INP8IG077316
	for ; Sat, 18 Oct 2008 23:25:08 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INP8Zo077314
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:25:08 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:25:08 GMT
Message-Id: <200810182325.m9INP8Zo077314@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151531 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:25:09 -0000

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

Change 151531 by sam@sam_ebb on 2008/10/18 23:24:58

	pass country code, outdoor use, and ecm use to the hal when
	getting the list of available channels (was passing fixed
	values that might be different)

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#103 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#103 (text+ko) ====

@@ -5889,7 +5889,7 @@
 	}
 	error = 0;
 	if (!ath_hal_init_channels(ah, halchans, IEEE80211_CHAN_MAX, &nhalchans,
-	    NULL, 0, NULL, CTRY_DEFAULT, HAL_MODE_ALL, AH_FALSE, AH_TRUE)) {
+	    NULL, 0, NULL, cc, HAL_MODE_ALL, outdoor, ecm)) {
 		error = EINVAL;
 		goto done;
 	}

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:29:13 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 63D31106568C; Sat, 18 Oct 2008 23:29:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2724C106569A
	for ; Sat, 18 Oct 2008 23:29:13 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 154E68FC16
	for ; Sat, 18 Oct 2008 23:29:13 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INTCIN077579
	for ; Sat, 18 Oct 2008 23:29:12 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INTCad077577
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:29:12 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:29:12 GMT
Message-Id: <200810182329.m9INTCad077577@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151532 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:29:13 -0000

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

Change 151532 by sam@sam_ebb on 2008/10/18 23:28:27

	Fix statistic reporting:
	o return rx rssi again
	o return tx rssi as the filtered avg of ACK rssi (was rssi of
	  last received ACK--modulo bugs about assuming frames were ack'd)
	o fix tx rate to mask out the basic rate bit (caused athstats
	  to report MCS values)

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#104 edit
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#33 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#104 (text+ko) ====

@@ -6364,12 +6364,12 @@
 		/* NB: embed these numbers to get a consistent view */
 		sc->sc_stats.ast_tx_packets = ifp->if_opackets;
 		sc->sc_stats.ast_rx_packets = ifp->if_ipackets;
-#if 0
-		ieee80211_getsignal(ic, &sc->sc_stats.ast_rx_rssi,
-			&sc->sc_stats.ast_rx_noise);
-#endif
+		sc->sc_stats.ast_tx_rssi = ATH_RSSI(sc->sc_halstats.ns_avgtxrssi);
+		sc->sc_stats.ast_rx_rssi = ATH_RSSI(sc->sc_halstats.ns_avgrssi);
 		rt = sc->sc_currates;
-		sc->sc_stats.ast_tx_rate = rt->info[sc->sc_txrix].dot11Rate;
+		/* XXX HT rates */
+		sc->sc_stats.ast_tx_rate =
+		    rt->info[sc->sc_txrix].dot11Rate &~ IEEE80211_RATE_BASIC;
 		return copyout(&sc->sc_stats,
 		    ifr->ifr_data, sizeof (sc->sc_stats));
 #ifdef ATH_DIAGAPI

==== //depot/projects/vap/sys/dev/ath/if_athvar.h#33 (text+ko) ====

@@ -100,6 +100,9 @@
     if ((y) >= -20)							\
     	x = ATH_LPF_RSSI((x), ATH_RSSI_IN((y)), ATH_RSSI_LPF_LEN);	\
 } while (0)
+#define	ATH_EP_RND(x,mul) \
+	((((x)%(mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
+#define	ATH_RSSI(x)		ATH_EP_RND(x, HAL_RSSI_EP_MULTIPLIER)
 
 struct ath_buf {
 	STAILQ_ENTRY(ath_buf)	bf_list;

From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:32:16 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E5EF1065691; Sat, 18 Oct 2008 23:32:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 617DA106568D
	for ; Sat, 18 Oct 2008 23:32:16 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F6828FC08
	for ; Sat, 18 Oct 2008 23:32:16 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INWGRj077816
	for ; Sat, 18 Oct 2008 23:32:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INWGUF077814
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:32:16 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:32:16 GMT
Message-Id: <200810182332.m9INWGUF077814@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 151533 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sat, 18 Oct 2008 23:32:16 -0000

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

Change 151533 by sam@sam_ebb on 2008/10/18 23:31:29

	rename bf_flags as bf_txflags, it's a copy of the flags from
	the tx descriptor; shortly we'll be splitting this to add s/w
	flags distinct from the h/w descriptor

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#105 edit
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#34 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#105 (text+ko) ====

@@ -4977,7 +4977,7 @@
 		, ctsrate		/* rts/cts rate */
 		, ctsduration		/* rts/cts duration */
 	);
-	bf->bf_flags = flags;
+	bf->bf_txflags = flags;
 	/*
 	 * Setup the multi-rate retry state only when we're
 	 * going to use it.  This assumes ath_hal_setuptxdesc
@@ -5051,7 +5051,7 @@
 				pri = M_WME_GETAC(bf->bf_m);
 				if (pri >= WME_AC_VO)
 					ic->ic_wme.wme_hipri_traffic++;
-				if ((bf->bf_flags & HAL_TXDESC_NOACK) == 0)
+				if ((bf->bf_txflags & HAL_TXDESC_NOACK) == 0)
 					ni->ni_inact = ni->ni_inact_reload;
 			} else {
 				if (ts->ts_status & HAL_TXERR_XRETRY)
@@ -5071,7 +5071,7 @@
 			 * Hand the descriptor to the rate control algorithm.
 			 */
 			if ((ts->ts_status & HAL_TXERR_FILT) == 0 &&
-			    (bf->bf_flags & HAL_TXDESC_NOACK) == 0) {
+			    (bf->bf_txflags & HAL_TXDESC_NOACK) == 0) {
 				/*
 				 * If frame was ack'd update statistics,
 				 * including the last rx time used to
@@ -5091,7 +5091,7 @@
 			 */
 			if (bf->bf_m->m_flags & M_TXCB)
 				ieee80211_process_callback(ni, bf->bf_m,
-				    (bf->bf_flags & HAL_TXDESC_NOACK) == 0 ?
+				    (bf->bf_txflags & HAL_TXDESC_NOACK) == 0 ?
 				        ts->ts_status : HAL_TXERR_XRETRY);
 			/*
 			 * Reclaim reference to node.
@@ -6229,7 +6229,7 @@
 		printf(" (DS.V:%p DS.P:%p) L:%08x D:%08x F:04%x%s\n"
 		       "        %08x %08x %08x %08x %08x %08x\n",
 		    ds, (const struct ath_desc *)bf->bf_daddr + i,
-		    ds->ds_link, ds->ds_data, bf->bf_flags,
+		    ds->ds_link, ds->ds_data, bf->bf_txflags,
 		    !done ? "" : (ts->ts_status == 0) ? " *" : " !",
 		    ds->ds_ctl0, ds->ds_ctl1,
 		    ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3]);
@@ -6919,7 +6919,7 @@
 		, ctsrate		/* rts/cts rate */
 		, ctsduration		/* rts/cts duration */
 	);
-	bf->bf_flags = flags;
+	bf->bf_txflags = flags;
 
 	if (ismrr) {
 		rix = ath_tx_findrix(rt, params->ibp_rate1);

==== //depot/projects/vap/sys/dev/ath/if_athvar.h#34 (text+ko) ====

@@ -109,7 +109,7 @@
 	TAILQ_ENTRY(ath_buf)	bf_stagelist;	/* stage queue list */
 	u_int32_t		bf_age;		/* age when placed on stageq */
 	int			bf_nseg;
-	int			bf_flags;	/* tx descriptor flags */
+	int			bf_txflags;	/* tx descriptor flags */
 	struct ath_desc		*bf_desc;	/* virtual addr of desc */
 	struct ath_desc_status	bf_status;	/* tx/rx status */
 	bus_addr_t		bf_daddr;	/* physical addr of desc */