From owner-p4-projects@FreeBSD.ORG Tue Sep 21 20:20:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F28B01065695; Tue, 21 Sep 2010 20:20: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 B61F81065679 for ; Tue, 21 Sep 2010 20:20:04 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A163C8FC13 for ; Tue, 21 Sep 2010 20:20:04 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8LKK4ii011975 for ; Tue, 21 Sep 2010 20:20:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8LKK2iW011968 for perforce@freebsd.org; Tue, 21 Sep 2010 20:20:02 GMT (envelope-from jhb@freebsd.org) Date: Tue, 21 Sep 2010 20:20:02 GMT Message-Id: <201009212020.o8LKK2iW011968@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2010 20:20:05 -0000 http://p4web.freebsd.org/@@184055?ac=10 Change 184055 by jhb@jhb_jhbbsd on 2010/09/21 20:19:24 IFC @184052 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#18 integrate .. //depot/projects/smpng/share/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/smpng/share/man/man9/devstat.9#2 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_node.9#6 integrate .. //depot/projects/smpng/share/man/man9/locking.9#4 integrate .. //depot/projects/smpng/share/man/man9/make_dev.9#6 integrate .. //depot/projects/smpng/share/man/man9/rmlock.9#3 integrate .. //depot/projects/smpng/share/man/man9/sbuf.9#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#30 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#30 integrate .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#95 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#71 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#32 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#78 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#93 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#62 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#29 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#20 integrate .. //depot/projects/smpng/sys/amd64/include/segments.h#10 integrate .. //depot/projects/smpng/sys/amd64/include/trap.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#16 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#23 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sheeva.S#3 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#61 integrate .. //depot/projects/smpng/sys/arm/conf/DOCKSTAR#1 branch .. //depot/projects/smpng/sys/arm/include/cpufunc.h#17 integrate .. //depot/projects/smpng/sys/arm/mv/timer.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#14 integrate .. //depot/projects/smpng/sys/boot/Makefile#35 integrate .. //depot/projects/smpng/sys/boot/Makefile.amd64#1 branch .. //depot/projects/smpng/sys/boot/Makefile.arm#1 branch .. //depot/projects/smpng/sys/boot/Makefile.i386#1 branch .. //depot/projects/smpng/sys/boot/Makefile.ia64#1 branch .. //depot/projects/smpng/sys/boot/Makefile.pc98#1 branch .. //depot/projects/smpng/sys/boot/Makefile.powerpc#1 branch .. //depot/projects/smpng/sys/boot/Makefile.sparc64#1 branch .. //depot/projects/smpng/sys/boot/arm/ixp425/boot2/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/arm/uboot/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#14 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#13 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/dockstar.dts#1 branch .. //depot/projects/smpng/sys/boot/ficl/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/forth/beastie.4th#11 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#70 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile.inc#10 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#21 integrate .. //depot/projects/smpng/sys/boot/i386/efi/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/i386/gptboot/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/i386/gptzfsboot/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/i386/libfirewire/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#22 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#25 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/pxe.c#8 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#30 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/i386/zfsboot/zfsboot.c#8 integrate .. //depot/projects/smpng/sys/boot/i386/zfsloader/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/ia64/common/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#9 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#19 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot2.c#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#10 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/zfs/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/zfs/zfs.c#7 integrate .. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#10 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#94 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#25 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/zfsimpl.h#8 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#8 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/misc.h#4 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/policy.h#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/vnode.h#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/instr_size.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/regset.h#1 branch .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_cddl.h#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_ioctl.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_load.c#4 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_unload.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_isa.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/instr_size.c#2 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/regset.h#1 branch .. //depot/projects/smpng/sys/cddl/dev/systrace/systrace.c#4 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#86 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#71 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#9 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.h#5 integrate .. //depot/projects/smpng/sys/conf/Makefile.mips#3 integrate .. //depot/projects/smpng/sys/conf/files#265 integrate .. //depot/projects/smpng/sys/conf/files.amd64#80 integrate .. //depot/projects/smpng/sys/conf/files.i386#140 integrate .. //depot/projects/smpng/sys/conf/files.mips#11 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#61 integrate .. //depot/projects/smpng/sys/conf/kern.mk#29 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#67 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#70 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#80 integrate .. //depot/projects/smpng/sys/conf/ldscript.mips.64.cfe#1 branch .. //depot/projects/smpng/sys/conf/newvers.sh#30 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslpredef.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2d.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2e.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2w.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstartup.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtcompile.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtio.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbexec.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/events/evrgnini.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exmutex.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwpci.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/achware.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acmacros.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnamesp.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acenv.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acfreebsd.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acgcc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair2.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsutils.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbfadt.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utdebug.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmath.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmisc.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmutex.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxferror.c#1 branch .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-app-init.h#2 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper-board.c#2 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper-spi.c#2 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-helper.c#2 integrate .. //depot/projects/smpng/sys/contrib/octeon-sdk/cvmx-spi.c#2 integrate .. //depot/projects/smpng/sys/contrib/pf/net/pf.c#40 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#73 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#28 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#28 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#25 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#35 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_hp.c#5 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_wmi.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#125 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#53 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#17 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#9 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#12 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#11 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#71 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#42 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#72 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#12 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#12 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-serverworks.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#11 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#117 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#66 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#18 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#29 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#21 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.h#9 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#26 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#10 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#5 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.h#2 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#48 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#20 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_novell.c#6 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/et/if_et.c#5 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#52 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#44 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#43 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#27 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_sbus.c#2 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#12 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#17 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.h#8 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#16 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#16 integrate .. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi.c#7 integrate .. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsivar.h#4 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#18 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwnvar.h#8 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#24 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.h#10 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#20 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#12 integrate .. //depot/projects/smpng/sys/dev/led/led.c#18 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#52 integrate .. //depot/projects/smpng/sys/dev/mii/brgphyreg.h#10 integrate .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_cnfg.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_hbd.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_history.txt#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_init.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_ioc.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_ra.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_raid.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_sas.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_targ.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_tool.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mpi/mpi2_type.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mps.c#1 branch .. //depot/projects/smpng/sys/dev/mps/mps_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mps_pci.c#1 branch .. //depot/projects/smpng/sys/dev/mps/mps_sas.c#1 branch .. //depot/projects/smpng/sys/dev/mps/mps_table.c#1 branch .. //depot/projects/smpng/sys/dev/mps/mps_table.h#1 branch .. //depot/projects/smpng/sys/dev/mps/mps_user.c#1 branch .. //depot/projects/smpng/sys/dev/mps/mpsvar.h#1 branch .. //depot/projects/smpng/sys/dev/msk/if_msk.c#27 integrate .. //depot/projects/smpng/sys/dev/mvs/mvs.c#4 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_fdt.c#2 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_if.m#5 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#5 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#9 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#18 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#36 integrate .. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvram.c#7 integrate .. //depot/projects/smpng/sys/dev/powermac_nvram/powermac_nvramvar.h#2 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#13 integrate .. //depot/projects/smpng/sys/dev/sf/if_sf.c#4 integrate .. //depot/projects/smpng/sys/dev/siba/siba.c#3 integrate .. //depot/projects/smpng/sys/dev/siis/siis.c#11 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#8 integrate .. //depot/projects/smpng/sys/dev/sis/if_sisreg.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#46 integrate .. //depot/projects/smpng/sys/dev/spibus/spibus.c#5 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#14 integrate .. //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#14 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl.h#6 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_externs.h#4 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_fwif.h#5 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_init.c#7 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_intr.c#6 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_io.c#7 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_misc.c#7 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_share.h#8 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl.h#8 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#14 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#15 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/input/atp.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/input/uep.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axereg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/net/uhso.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_controller.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#158 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#30 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#13 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#18 integrate .. //depot/projects/smpng/sys/dev/vr/if_vr.c#7 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#8 integrate .. //depot/projects/smpng/sys/dev/xl/if_xlreg.h#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#25 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#37 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#90 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_commonsubs.c#6 integrate .. //depot/projects/smpng/sys/fs/nfs/nfs_var.h#11 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsdport.h#3 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#11 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#7 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clport.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clrpcops.c#10 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#17 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfsnode.h#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#13 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdsocket.c#6 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdstate.c#10 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#44 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#26 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#33 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#35 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs.h#9 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_subr.c#14 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#42 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#41 integrate .. //depot/projects/smpng/sys/geom/concat/g_concat.c#21 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#28 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.h#10 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_ctl.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#57 integrate .. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#15 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#29 integrate .. //depot/projects/smpng/sys/geom/sched/subr_disk.c#2 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#154 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#33 integrate .. //depot/projects/smpng/sys/i386/i386/legacy.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#156 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#132 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#33 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#127 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#41 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#45 integrate .. //depot/projects/smpng/sys/i386/include/segments.h#13 integrate .. //depot/projects/smpng/sys/i386/include/trap.h#6 integrate .. //depot/projects/smpng/sys/i386/include/vm86.h#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#23 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#24 integrate .. //depot/projects/smpng/sys/kern/Makefile#7 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#20 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#14 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#99 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_clocksource.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_dtrace.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_et.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#133 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#150 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#127 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#84 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_priv.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#116 integrate .. //depot/projects/smpng/sys/kern/kern_rmlock.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#159 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#57 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#49 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#41 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#97 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#108 integrate .. //depot/projects/smpng/sys/kern/subr_acl_nfs4.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_acl_posix1e.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#93 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#33 integrate .. //depot/projects/smpng/sys/kern/subr_kdb.c#25 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_sbuf.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#51 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#98 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#186 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#67 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#98 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#105 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#23 integrate .. //depot/projects/smpng/sys/kern/tty.c#104 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#139 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#130 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#62 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#69 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#66 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#103 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#182 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#161 integrate .. //depot/projects/smpng/sys/mips/adm5120/obio.c#5 integrate .. //depot/projects/smpng/sys/mips/alchemy/obio.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/apb.c#2 integrate .. //depot/projects/smpng/sys/mips/atheros/ar71xx_machdep.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/obio.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_machdep.c#5 integrate .. //depot/projects/smpng/sys/mips/cavium/octeon_mp.c#3 integrate .. //depot/projects/smpng/sys/mips/cavium/octopci.c#2 integrate .. //depot/projects/smpng/sys/mips/cavium/usb/octusb.c#2 integrate .. //depot/projects/smpng/sys/mips/conf/MALTA64#2 integrate .. //depot/projects/smpng/sys/mips/conf/OCTEON1#4 integrate .. //depot/projects/smpng/sys/mips/conf/SWARM#3 integrate .. //depot/projects/smpng/sys/mips/conf/SWARM64#1 branch .. //depot/projects/smpng/sys/mips/conf/SWARM64_SMP#1 branch .. //depot/projects/smpng/sys/mips/conf/SWARM_COMMON#1 branch .. //depot/projects/smpng/sys/mips/conf/SWARM_SMP#2 integrate .. //depot/projects/smpng/sys/mips/idt/obio.c#5 integrate .. //depot/projects/smpng/sys/mips/include/atomic.h#4 integrate .. //depot/projects/smpng/sys/mips/include/cpufunc.h#6 integrate .. //depot/projects/smpng/sys/mips/include/cpuregs.h#8 integrate .. //depot/projects/smpng/sys/mips/include/locore.h#4 integrate .. //depot/projects/smpng/sys/mips/include/md_var.h#4 integrate .. //depot/projects/smpng/sys/mips/include/memdev.h#2 integrate .. //depot/projects/smpng/sys/mips/include/pcb.h#5 integrate .. //depot/projects/smpng/sys/mips/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/mips/include/pte.h#7 integrate .. //depot/projects/smpng/sys/mips/include/regnum.h#4 integrate .. //depot/projects/smpng/sys/mips/include/smp.h#10 integrate .. //depot/projects/smpng/sys/mips/include/ucontext.h#3 integrate .. //depot/projects/smpng/sys/mips/mips/busdma_machdep.c#8 integrate .. //depot/projects/smpng/sys/mips/mips/machdep.c#15 integrate .. //depot/projects/smpng/sys/mips/mips/mainbus.c#5 integrate .. //depot/projects/smpng/sys/mips/mips/mp_machdep.c#13 integrate .. //depot/projects/smpng/sys/mips/mips/nexus.c#6 integrate .. //depot/projects/smpng/sys/mips/mips/pmap.c#25 integrate .. //depot/projects/smpng/sys/mips/mips/psraccess.S#5 delete .. //depot/projects/smpng/sys/mips/mips/trap.c#11 integrate .. //depot/projects/smpng/sys/mips/rmi/board.c#4 integrate .. //depot/projects/smpng/sys/mips/rmi/board.h#4 integrate .. //depot/projects/smpng/sys/mips/rmi/clock.c#3 delete .. //depot/projects/smpng/sys/mips/rmi/clock.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/debug.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/dev/nlge/if_nlge.c#1 branch .. //depot/projects/smpng/sys/mips/rmi/dev/nlge/if_nlge.h#1 branch .. //depot/projects/smpng/sys/mips/rmi/dev/sec/desc.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/sec/rmilib.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/sec/rmilib.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/sec/rmisec.c#2 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/sec/stats.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/debug.h#1 branch .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.c#6 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/files.xlr#4 integrate .. //depot/projects/smpng/sys/mips/rmi/fmn.c#1 branch .. //depot/projects/smpng/sys/mips/rmi/interrupt.h#3 integrate .. //depot/projects/smpng/sys/mips/rmi/intr_machdep.c#4 integrate .. //depot/projects/smpng/sys/mips/rmi/iodi.c#4 integrate .. //depot/projects/smpng/sys/mips/rmi/iomap.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/msgring.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/on_chip.c#5 delete .. //depot/projects/smpng/sys/mips/rmi/pic.h#3 integrate .. //depot/projects/smpng/sys/mips/rmi/rmi_boot_info.h#1 branch .. //depot/projects/smpng/sys/mips/rmi/rmi_mips_exts.h#2 integrate .. //depot/projects/smpng/sys/mips/rmi/shared_structs.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/shared_structs_func.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/shared_structs_offsets.h#2 delete .. //depot/projects/smpng/sys/mips/rmi/tick.c#3 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_pci.c#4 integrate .. //depot/projects/smpng/sys/mips/rmi/xlr_pcmcia.c#1 branch .. //depot/projects/smpng/sys/mips/rmi/xlrconfig.h#3 delete .. //depot/projects/smpng/sys/mips/sibyte/sb_machdep.c#6 integrate .. //depot/projects/smpng/sys/mips/sibyte/sb_zbbus.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#178 integrate .. //depot/projects/smpng/sys/modules/aac/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#26 integrate .. //depot/projects/smpng/sys/modules/agp/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/amr/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/asr/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/bge/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/cpufreq/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/crypto/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/cxgb/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/cyclic/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/dtrace/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/dtrace/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/modules/dtrace/dtrace/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/dtrace/dtraceall/dtraceall.c#4 integrate .. //depot/projects/smpng/sys/modules/dtrace/fasttrap/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/gem/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/hptmv/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/hptrr/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/hwpmc/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/io/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/le/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/linprocfs/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/linsysfs/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#28 integrate .. //depot/projects/smpng/sys/modules/mem/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/mfi/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/mps/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ndis/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/opensolaris/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/ppc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/procfs/Makefile#10 integrate .. //depot/projects/smpng/sys/modules/scc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/smbfs/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/sound/sound/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/svr4/Makefile#12 integrate .. //depot/projects/smpng/sys/modules/syscons/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/uart/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#22 integrate .. //depot/projects/smpng/sys/modules/vx/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#16 integrate .. //depot/projects/smpng/sys/net/bpf.c#98 integrate .. //depot/projects/smpng/sys/net/if.c#137 integrate .. //depot/projects/smpng/sys/net/if_epair.c#6 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#18 integrate .. //depot/projects/smpng/sys/net/vnet.c#8 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#56 integrate .. //depot/projects/smpng/sys/netinet/in.c#69 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#44 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#113 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#48 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_log.c#6 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_nat.c#8 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#94 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.h#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_bsd_addr.c#18 integrate .. //depot/projects/smpng/sys/netinet/sctp_cc_functions.c#4 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#27 integrate .. //depot/projects/smpng/sys/netinet/sctp_crc32.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_crc32.h#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#34 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#35 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#31 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#41 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.h#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#42 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#23 integrate .. //depot/projects/smpng/sys/netinet/sctp_peeloff.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#12 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#23 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#27 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#34 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#42 integrate .. //depot/projects/smpng/sys/netinet/siftr.c#2 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#23 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#137 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#69 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#125 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#86 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#78 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#66 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#76 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#34 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#69 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#40 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#28 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#25 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#36 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#45 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#102 integrate .. //depot/projects/smpng/sys/nfsclient/nfsnode.h#27 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#70 integrate .. //depot/projects/smpng/sys/opencrypto/deflate.c#7 integrate .. //depot/projects/smpng/sys/pc98/pc98/canbus.c#5 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#41 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#81 integrate .. //depot/projects/smpng/sys/powerpc/aim/clock.c#8 integrate .. //depot/projects/smpng/sys/powerpc/aim/copyinout.c#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/interrupt.c#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#20 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea.c#15 integrate .. //depot/projects/smpng/sys/powerpc/aim/mmu_oea64.c#13 integrate .. //depot/projects/smpng/sys/powerpc/aim/nexus.c#7 integrate .. //depot/projects/smpng/sys/powerpc/aim/ofw_machdep.c#11 integrate .. //depot/projects/smpng/sys/powerpc/aim/platform_chrp.c#7 delete .. //depot/projects/smpng/sys/powerpc/aim/slb.c#3 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#12 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#11 delete .. //depot/projects/smpng/sys/powerpc/aim/trap_subr64.S#2 integrate .. //depot/projects/smpng/sys/powerpc/aim/vm_machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/booke/clock.c#8 integrate .. //depot/projects/smpng/sys/powerpc/booke/interrupt.c#6 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#17 integrate .. //depot/projects/smpng/sys/powerpc/booke/platform_bare.c#5 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#21 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC64#3 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#13 integrate .. //depot/projects/smpng/sys/powerpc/include/md_var.h#17 integrate .. //depot/projects/smpng/sys/powerpc/include/mmuvar.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/ofw_machdep.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/param.h#21 integrate .. //depot/projects/smpng/sys/powerpc/include/pcb.h#13 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#17 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#30 integrate .. //depot/projects/smpng/sys/powerpc/include/smp.h#11 integrate .. //depot/projects/smpng/sys/powerpc/include/sr.h#7 integrate .. //depot/projects/smpng/sys/powerpc/mpc85xx/mpc85xx.c#5 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_real.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_kauai.c#16 integrate .. //depot/projects/smpng/sys/powerpc/powermac/cuda.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/kiic.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/platform_powermac.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powermac/smu.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/exec_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/mp_machdep.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/platform.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/platform_if.m#2 integrate .. //depot/projects/smpng/sys/rpc/replay.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_klib.c#16 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#23 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#106 integrate .. //depot/projects/smpng/sys/sparc64/include/asm.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#21 integrate .. //depot/projects/smpng/sys/sparc64/include/md_var.h#18 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#32 integrate .. //depot/projects/smpng/sys/sparc64/pci/schizo.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#34 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#35 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#37 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#103 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#45 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#90 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#57 integrate .. //depot/projects/smpng/sys/sun4v/include/intr_machdep.h#6 integrate .. //depot/projects/smpng/sys/sun4v/include/smp.h#13 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/bus_machdep.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hviommu.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#12 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#15 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/nexus.c#6 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vnex.c#6 integrate .. //depot/projects/smpng/sys/sys/_rmlock.h#2 integrate .. //depot/projects/smpng/sys/sys/acl.h#17 integrate .. //depot/projects/smpng/sys/sys/bio.h#31 integrate .. //depot/projects/smpng/sys/sys/bus.h#42 integrate .. //depot/projects/smpng/sys/sys/callout.h#15 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#44 integrate .. //depot/projects/smpng/sys/sys/copyright.h#15 integrate .. //depot/projects/smpng/sys/sys/dtrace_bsd.h#5 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#20 integrate .. //depot/projects/smpng/sys/sys/link_elf.h#7 integrate .. //depot/projects/smpng/sys/sys/lock.h#57 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#29 integrate .. //depot/projects/smpng/sys/sys/mman.h#15 integrate .. //depot/projects/smpng/sys/sys/mount.h#80 integrate .. //depot/projects/smpng/sys/sys/param.h#165 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#36 integrate .. //depot/projects/smpng/sys/sys/proc.h#210 integrate .. //depot/projects/smpng/sys/sys/rmlock.h#3 integrate .. //depot/projects/smpng/sys/sys/sbuf.h#10 integrate .. //depot/projects/smpng/sys/sys/sched.h#34 integrate .. //depot/projects/smpng/sys/sys/sdt.h#4 integrate .. //depot/projects/smpng/sys/sys/signal.h#30 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#68 integrate .. //depot/projects/smpng/sys/sys/syscall.h#97 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#97 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#66 integrate .. //depot/projects/smpng/sys/sys/sysent.h#38 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#102 integrate .. //depot/projects/smpng/sys/sys/systm.h#102 integrate .. //depot/projects/smpng/sys/sys/time.h#31 integrate .. //depot/projects/smpng/sys/sys/timeet.h#3 integrate .. //depot/projects/smpng/sys/sys/timetc.h#14 integrate .. //depot/projects/smpng/sys/sys/unistd.h#19 integrate .. //depot/projects/smpng/sys/sys/vnode.h#111 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#82 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#121 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#25 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#10 integrate .. //depot/projects/smpng/sys/vm/memguard.c#8 integrate .. //depot/projects/smpng/sys/vm/memguard.h#7 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#82 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#48 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#109 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#48 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#86 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#115 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#81 integrate .. //depot/projects/smpng/sys/vm/vm_phys.c#11 integrate .. //depot/projects/smpng/sys/vm/vm_reserv.c#4 integrate .. //depot/projects/smpng/sys/x86/cpufreq/est.c#3 integrate .. //depot/projects/smpng/sys/x86/isa/clock.c#6 integrate .. //depot/projects/smpng/sys/x86/pci/qpi.c#1 branch .. //depot/projects/smpng/sys/x86/x86/local_apic.c#5 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.371 2010/08/15 21:25:52 brueffer Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.375 2010/09/10 16:42:16 mdf Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -700,6 +700,7 @@ MLINKS+=ifnet.9 ifaddr.9 \ ifnet.9 if_data.9 \ ifnet.9 ifqueue.9 +MLINKS+=insmntque.9 insmntque1.9 MLINKS+=ithread.9 ithread_add_handler.9 \ ithread.9 ithread_create.9 \ ithread.9 ithread_destroy.9 \ @@ -985,6 +986,7 @@ MLINKS+=rmlock.9 rm_destroy.9 \ rmlock.9 rm_init.9 \ rmlock.9 rm_rlock.9 \ + rmlock.9 rm_try_rlock.9 \ rmlock.9 rm_runlock.9 \ rmlock.9 RM_SYSINIT.9 \ rmlock.9 rm_wlock.9 \ @@ -1023,12 +1025,13 @@ sbuf.9 sbuf_data.9 \ sbuf.9 sbuf_delete.9 \ sbuf.9 sbuf_done.9 \ + sbuf.9 sbuf_error.9 \ sbuf.9 sbuf_finish.9 \ sbuf.9 sbuf_len.9 \ sbuf.9 sbuf_new.9 \ - sbuf.9 sbuf_overflowed.9 \ sbuf.9 sbuf_printf.9 \ sbuf.9 sbuf_putc.9 \ + sbuf.9 sbuf_set_drain.9 \ sbuf.9 sbuf_setpos.9 \ sbuf.9 sbuf_trim.9 \ sbuf.9 sbuf_vprintf.9 ==== //depot/projects/smpng/share/man/man9/devclass_get_maxunit.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/devclass_get_maxunit.9,v 1.8 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/devclass_get_maxunit.9,v 1.11 2010/09/12 17:53:36 gjb Exp $ .\" -.Dd April 3, 2005 +.Dd September 10, 2010 .Dt DEVCLASS_GET_MAXUNIT 9 .Os .Sh NAME @@ -43,6 +43,19 @@ Returns the next unit number to be allocated to device instances in the .Dv devclass . This is one greater than the highest currently allocated unit. +.Sh RETURN VALUES +The +.Fn devclass_get_maxunit +function returns -1 if +.Fa dc +is +.Dv NULL; +otherwise it returns the next unit +number in +.Fa dc's +devclass. +.Sh ERRORS +None. .Sh SEE ALSO .Xr devclass 9 , .Xr device 9 ==== //depot/projects/smpng/share/man/man9/devstat.9#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/devstat.9,v 1.22 2005/02/13 22:25:19 ru Exp $ +.\" $FreeBSD: src/share/man/man9/devstat.9,v 1.23 2010/08/28 16:32:01 brucec Exp $ .\" .Dd May 22, 1998 .Dt DEVSTAT 9 @@ -437,7 +437,7 @@ .Fn spl protection around some of the .Nm -list manipulation code to insure, for example, that the list of devices +list manipulation code to ensure, for example, that the list of devices is not changed while someone is fetching the .Va kern.devstat.all .Nm sysctl ==== //depot/projects/smpng/share/man/man9/ieee80211_node.9#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.8 2010/04/28 13:29:48 rpaulo Exp $ +.\" $FreeBSD: src/share/man/man9/ieee80211_node.9,v 1.9 2010/08/28 16:32:01 brucec Exp $ .\" .Dd April 28, 2010 .Dt IEEE80211_NODE 9 @@ -101,7 +101,7 @@ That is, there is a count of all long term references that determines when an entry may be reclaimed. References are held by every in-flight frame sent to a station to -insure the entry is not reclaimed while the frame is queued or otherwise +ensure the entry is not reclaimed while the frame is queued or otherwise held by a driver. Routines that lookup a table entry return a .Dq held reference ==== //depot/projects/smpng/share/man/man9/locking.9#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/locking.9,v 1.20 2010/07/31 12:14:28 joel Exp $ +.\" $FreeBSD: src/share/man/man9/locking.9,v 1.22 2010/09/01 19:50:03 mlaier Exp $ .\" -.Dd February 15, 2010 +.Dd August 24, 2010 .Dt LOCKING 9 .Os .Sh NAME @@ -301,7 +301,7 @@ .It mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 .It sx Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 .It rwlock Ta \&ok Ta \&ok Ta \&no Ta \&ok-2 Ta \&ok Ta \&no-3 -.It rmlock Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok-2 Ta \&no +.It rmlock Ta \&ok Ta \&ok Ta \&ok-5 Ta \&ok Ta \&ok-2 Ta \&ok-5 .El .Pp .Em *1 @@ -326,6 +326,13 @@ .Fn sx_sleep which will atomically release this primitive when going to sleep and reacquire it on wakeup. +.Pp +.Em *5 +.Em Read-mostly +locks can be initialized to support sleeping while holding a write lock. +See +.Xr rmlock 9 +for details. .Ss Context mode table The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. @@ -334,7 +341,7 @@ .Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .Xc .It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no -.It ithread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no +.It interrupt thread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no .It callout: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&no Ta \&no .It syscall: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok .El ==== //depot/projects/smpng/share/man/man9/make_dev.9#6 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.30 2010/08/01 21:54:25 pjd Exp $ +.\" $FreeBSD: src/share/man/man9/make_dev.9,v 1.31 2010/09/05 14:47:46 kib Exp $ .\" -.Dd May 6, 2010 +.Dd September 5, 2010 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -135,6 +135,7 @@ MAKEDEV_REF reference the created device MAKEDEV_NOWAIT do not sleep, may return NULL MAKEDEV_WAITOK allow the function to sleep to satisfy malloc +MAKEDEV_ETERNAL created device will be never destroyed .Ed .Pp The @@ -154,6 +155,18 @@ drops his reference to cdev. .Pp The +.Dv MAKEDEV_ETERNAL +flag allows the kernel to not acquire some locks when translating system +calls into the cdevsw methods calls. +It is responsibility of the driver author to make sure that +.Fn destroy_dev +is never called on the returned cdev. +For the convenience, use the +.Dv MAKEDEV_ETERNAL_KLD +flag for the code that can be compiled into kernel or loaded +(and unloaded) as loadable module. +.Pp +The .Fn make_dev_cred function is equivalent to the call .Bd -literal -offset indent ==== //depot/projects/smpng/share/man/man9/rmlock.9#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/rmlock.9,v 1.5 2009/05/29 10:52:37 rwatson Exp $ +.\" $FreeBSD: src/share/man/man9/rmlock.9,v 1.6 2010/09/01 19:50:03 mlaier Exp $ .\" .\" Based on rwlock.9 man page .Dd November 10, 2007 @@ -35,6 +35,7 @@ .Nm rm_init_flags , .Nm rm_destroy , .Nm rm_rlock , +.Nm rm_try_rlock , .Nm rm_wlock , .Nm rm_runlock , .Nm rm_wunlock , >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Sep 23 21:37:14 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D59321065672; Thu, 23 Sep 2010 21:37: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 98360106564A for ; Thu, 23 Sep 2010 21:37:13 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 845528FC18 for ; Thu, 23 Sep 2010 21:37:13 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8NLbDPd034068 for ; Thu, 23 Sep 2010 21:37:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8NLbDZU034065 for perforce@freebsd.org; Thu, 23 Sep 2010 21:37:13 GMT (envelope-from jhb@freebsd.org) Date: Thu, 23 Sep 2010 21:37:13 GMT Message-Id: <201009232137.o8NLbDZU034065@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2010 21:37:14 -0000 http://p4web.freebsd.org/@@184128?ac=10 Change 184128 by jhb@jhb_jhbbsd on 2010/09/23 21:36:15 Rewrite the i386 memory probe: - Check for SMAP data from the loader first. If it exists, don't bother doing any VM86 calls at all. This will be more friendly for non-BIOS boot environments such as EFI, etc. - Move the base memory setup into a new basemem_setup() routine instead of duplicating it twice, and only call it once during boot. - Adjust some comments to better explain the code flow. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#157 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#157 (text+ko) ==== @@ -2029,6 +2029,52 @@ return (1); } +static void +basemem_setup(void) +{ + pt_entry_t *pte; + + if (basemem > 640) { + printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", + basemem); + basemem = 640; + } + + /* + * XXX if biosbasemem is now < 640, there is a `hole' + * between the end of base memory and the start of + * ISA memory. The hole may be empty or it may + * contain BIOS code or data. Map it read/write so + * that the BIOS can write to it. (Memory from 0 to + * the physical end of the kernel is mapped read-only + * to begin with and then parts of it are remapped. + * The parts that aren't remapped form holes that + * remain read-only and are unused by the kernel. + * The base memory area is below the physical end of + * the kernel and right now forms a read-only hole. + * The part of it from PAGE_SIZE to + * (trunc_page(biosbasemem * 1024) - 1) will be + * remapped and used by the kernel later.) + * + * This code is similar to the code used in + * pmap_mapdev, but since no memory needs to be + * allocated we simply change the mapping. + */ + for (pa = trunc_page(basemem * 1024); + pa < ISA_HOLE_START; pa += PAGE_SIZE) + pmap_kenter(KERNBASE + pa, pa); + + /* + * Map pages between basemem and ISA_HOLE_START, if any, r/w into + * the vm86 page table so that vm86 can scribble on them using + * the vm86 map too. XXX: why 2 ways for this and only 1 way for + * page 0, at least as initialized here? + */ + pte = (pt_entry_t *)vm86paddr; + for (i = basemem / 4; i < 160; i++) + pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; +} + /* * Populate the (physmap) array with base/bound pairs describing the * available physical memory in the system, then test this memory and @@ -2052,13 +2098,20 @@ struct vm86frame vmf; struct vm86context vmc; vm_paddr_t pa, physmap[PHYSMAP_SIZE]; - pt_entry_t *pte; struct bios_smap *smap, *smapbase, *smapend; u_int32_t smapsize; quad_t dcons_addr, dcons_size; caddr_t kmdp; has_smap = 0; +#if defined(XEN) + Maxmem = xen_start_info->nr_pages - init_first; + physmem = Maxmem; + basemem = 0; + physmap[0] = init_first << PAGE_SHIFT; + physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); + physmap_idx = 0; +#else #ifdef XBOX if (arch_i386_is_xbox) { /* @@ -2071,83 +2124,14 @@ goto physmap_done; } #endif -#if defined(XEN) - has_smap = 0; - Maxmem = xen_start_info->nr_pages - init_first; - physmem = Maxmem; - basemem = 0; - physmap[0] = init_first << PAGE_SHIFT; - physmap[1] = ptoa(Maxmem) - round_page(MSGBUF_SIZE); - physmap_idx = 0; - goto physmap_done; -#endif - hasbrokenint12 = 0; - TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); bzero(&vmf, sizeof(vmf)); bzero(physmap, sizeof(physmap)); basemem = 0; /* - * Some newer BIOSes has broken INT 12H implementation which cause - * kernel panic immediately. In this case, we need to scan SMAP - * with INT 15:E820 first, then determine base memory size. - */ - if (hasbrokenint12) { - goto int15e820; - } - - /* - * Perform "base memory" related probes & setup - */ - vm86_intcall(0x12, &vmf); - basemem = vmf.vmf_ax; - if (basemem > 640) { - printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", - basemem); - basemem = 640; - } - - /* - * XXX if biosbasemem is now < 640, there is a `hole' - * between the end of base memory and the start of - * ISA memory. The hole may be empty or it may - * contain BIOS code or data. Map it read/write so - * that the BIOS can write to it. (Memory from 0 to - * the physical end of the kernel is mapped read-only - * to begin with and then parts of it are remapped. - * The parts that aren't remapped form holes that - * remain read-only and are unused by the kernel. - * The base memory area is below the physical end of - * the kernel and right now forms a read-only hole. - * The part of it from PAGE_SIZE to - * (trunc_page(biosbasemem * 1024) - 1) will be - * remapped and used by the kernel later.) - * - * This code is similar to the code used in - * pmap_mapdev, but since no memory needs to be - * allocated we simply change the mapping. - */ - for (pa = trunc_page(basemem * 1024); - pa < ISA_HOLE_START; pa += PAGE_SIZE) - pmap_kenter(KERNBASE + pa, pa); - - /* - * Map pages between basemem and ISA_HOLE_START, if any, r/w into - * the vm86 page table so that vm86 can scribble on them using - * the vm86 map too. XXX: why 2 ways for this and only 1 way for - * page 0, at least as initialized here? - */ - pte = (pt_entry_t *)vm86paddr; - for (i = basemem / 4; i < 160; i++) - pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; - -int15e820: - /* - * Fetch the memory map with INT 15:E820. First, check to see - * if the loader supplied it and use that if so. Otherwise, - * use vm86 to invoke the BIOS call directly. + * Check if the loader supplied an SMAP memory map. If so, + * use that and do not make any VM86 calls. */ - physmap_idx = 0; smapbase = NULL; kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) @@ -2156,9 +2140,10 @@ smapbase = (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP); if (smapbase != NULL) { - /* subr_module.c says: + /* + * subr_module.c says: * "Consumer may safely assume that size value precedes data." - * ie: an int32_t immediately precedes smap. + * ie: an int32_t immediately precedes SMAP. */ smapsize = *((u_int32_t *)smapbase - 1); smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize); @@ -2167,33 +2152,51 @@ for (smap = smapbase; smap < smapend; smap++) if (!add_smap_entry(smap, physmap, &physmap_idx)) break; - } else { - /* - * map page 1 R/W into the kernel page table so we can use it - * as a buffer. The kernel will unmap this page later. - */ - pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1 << PAGE_SHIFT); - vmc.npages = 0; - smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + - (1 << PAGE_SHIFT)); - vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di); + goto have_smap; + } - vmf.vmf_ebx = 0; - do { - vmf.vmf_eax = 0xE820; - vmf.vmf_edx = SMAP_SIG; - vmf.vmf_ecx = sizeof(struct bios_smap); - i = vm86_datacall(0x15, &vmf, &vmc); - if (i || vmf.vmf_eax != SMAP_SIG) - break; - has_smap = 1; - if (!add_smap_entry(smap, physmap, &physmap_idx)) - break; - } while (vmf.vmf_ebx != 0); + /* + * Some newer BIOSes have a broken INT 12H implementation + * which causes a kernel panic immediately. In this case, we + * need use the SMAP to determine the base memory size. + */ + hasbrokenint12 = 0; + TUNABLE_INT_FETCH("hw.hasbrokenint12", &hasbrokenint12); + if (hasbrokenint12 == 0) { + /* Use INT12 to determine base memory size. */ + vm86_intcall(0x12, &vmf); + basemem = vmf.vmf_ax; + basemem_setup(); } /* - * Perform "base memory" related probes & setup based on SMAP + * Fetch the memory map with INT 15:E820. Map page 1 R/W into + * the kernel page table so we can use it as a buffer. The + * kernel will unmap this page later. + */ + physmap_idx = 0; + pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1 << PAGE_SHIFT); + vmc.npages = 0; + smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT)); + vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di); + + vmf.vmf_ebx = 0; + do { + vmf.vmf_eax = 0xE820; + vmf.vmf_edx = SMAP_SIG; + vmf.vmf_ecx = sizeof(struct bios_smap); + i = vm86_datacall(0x15, &vmf, &vmc); + if (i || vmf.vmf_eax != SMAP_SIG) + break; + has_smap = 1; + if (!add_smap_entry(smap, physmap, &physmap_idx)) + break; + } while (vmf.vmf_ebx != 0); + +have_smap: + /* + * If we didn't fetch the "base memory" size from INT12, + * figure it out from the SMAP (or just guess). */ if (basemem == 0) { for (i = 0; i <= physmap_idx; i += 2) { @@ -2203,49 +2206,39 @@ } } - /* - * XXX this function is horribly organized and has to the same - * things that it does above here. - */ + /* XXX: If we couldn't find basemem from SMAP, just guess. */ if (basemem == 0) basemem = 640; - if (basemem > 640) { - printf( - "Preposterous BIOS basemem of %uK, truncating to 640K\n", - basemem); - basemem = 640; - } - - /* - * Let vm86 scribble on pages between basemem and - * ISA_HOLE_START, as above. - */ - for (pa = trunc_page(basemem * 1024); - pa < ISA_HOLE_START; pa += PAGE_SIZE) - pmap_kenter(KERNBASE + pa, pa); - pte = (pt_entry_t *)vm86paddr; - for (i = basemem / 4; i < 160; i++) - pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; + basemem_setup(); } if (physmap[1] != 0) goto physmap_done; /* - * If we failed above, try memory map with INT 15:E801 + * If we failed to find an SMAP, figure out the extended + * memory size. We will then build a simple memory map with + * two segments, one for "base memory" and the second for + * "extended memory". Note that "extended memory" starts at a + * physical address of 1MB and that both basemem and extmem + * are in units of 1KB. + * + * First, try to fetch the extended memory size via INT 15:E801. */ vmf.vmf_ax = 0xE801; if (vm86_intcall(0x15, &vmf) == 0) { extmem = vmf.vmf_cx + vmf.vmf_dx * 64; } else { + /* + * If INT15:E801 fails, this is our last ditch effort + * to determine the extended memory size. Currently + * we prefer the RTC value over INT15:88. + */ #if 0 vmf.vmf_ah = 0x88; vm86_intcall(0x15, &vmf); extmem = vmf.vmf_ax; -#elif !defined(XEN) - /* - * Prefer the RTC value for extended memory. - */ +#else extmem = rtcin(RTC_EXTLO) + (rtcin(RTC_EXTHI) << 8); #endif } @@ -2270,6 +2263,7 @@ physmap[physmap_idx + 1] = physmap[physmap_idx] + extmem * 1024; physmap_done: +#endif /* * Now, physmap contains a map of physical memory. */ From owner-p4-projects@FreeBSD.ORG Fri Sep 24 14:06:23 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D12F51065698; Fri, 24 Sep 2010 14:06: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 933421065693 for ; Fri, 24 Sep 2010 14:06:22 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 8084F8FC2B for ; Fri, 24 Sep 2010 14:06:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8OE6LoK051529 for ; Fri, 24 Sep 2010 14:06:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8OE6LWd051526 for perforce@freebsd.org; Fri, 24 Sep 2010 14:06:21 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Sep 2010 14:06:21 GMT Message-Id: <201009241406.o8OE6LWd051526@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2010 14:06:23 -0000 http://p4web.freebsd.org/@@184144?ac=10 Change 184144 by jhb@jhb_pipkin on 2010/09/24 14:05:53 Compile. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#158 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#158 (text+ko) ==== @@ -1950,6 +1950,7 @@ ssd->ssd_gran = sd->sd_gran; } +#ifndef XEN static int add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp) { @@ -2032,7 +2033,9 @@ static void basemem_setup(void) { + vm_paddr_t pa; pt_entry_t *pte; + int i; if (basemem > 640) { printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", @@ -2074,6 +2077,7 @@ for (i = basemem / 4; i < 160; i++) pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; } +#endif /* * Populate the (physmap) array with base/bound pairs describing the @@ -2091,17 +2095,21 @@ static void getmemsize(int first) { - int i, off, physmap_idx, pa_indx, da_indx; - int hasbrokenint12, has_smap; + int has_smap, off, physmap_idx, pa_indx, da_indx; u_long physmem_tunable; + vm_paddr_t physmap[PHYSMAP_SIZE]; + pt_entry_t *pte; + quad_t dcons_addr, dcons_size; +#ifndef XEN + int hasbrokenint12, i; u_int extmem; struct vm86frame vmf; struct vm86context vmc; - vm_paddr_t pa, physmap[PHYSMAP_SIZE]; + vm_paddr_t pa; struct bios_smap *smap, *smapbase, *smapend; u_int32_t smapsize; - quad_t dcons_addr, dcons_size; caddr_t kmdp; +#endif has_smap = 0; #if defined(XEN) From owner-p4-projects@FreeBSD.ORG Fri Sep 24 14:29:25 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACCD1065674; Fri, 24 Sep 2010 14:29: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 6D1811065672 for ; Fri, 24 Sep 2010 14:29:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5A8568FC08 for ; Fri, 24 Sep 2010 14:29:25 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8OETPWo056761 for ; Fri, 24 Sep 2010 14:29:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8OETPhQ056758 for perforce@freebsd.org; Fri, 24 Sep 2010 14:29:25 GMT (envelope-from jhb@freebsd.org) Date: Fri, 24 Sep 2010 14:29:25 GMT Message-Id: <201009241429.o8OETPhQ056758@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2010 14:29:25 -0000 http://p4web.freebsd.org/@@184145?ac=10 Change 184145 by jhb@jhb_jhbbsd on 2010/09/24 14:28:21 Initialize physmap_idx before parsing the SMAP from the loader. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#159 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#159 (text+ko) ==== @@ -2140,6 +2140,7 @@ * Check if the loader supplied an SMAP memory map. If so, * use that and do not make any VM86 calls. */ + physmap_idx = 0; smapbase = NULL; kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) @@ -2182,7 +2183,6 @@ * the kernel page table so we can use it as a buffer. The * kernel will unmap this page later. */ - physmap_idx = 0; pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1 << PAGE_SHIFT); vmc.npages = 0; smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT));