PERFORCE change 87177 for review

Robert Watson rwatson at FreeBSD.org
Thu Nov 24 04:27:21 PST 2005


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

Change 87177 by rwatson at rwatson_zoo on 2005/11/24 12:26:34

	Integrate netsmp branch.

Affected files ...

.. //depot/projects/netsmp/src/sys/alpha/alpha/clock.c#2 integrate
.. //depot/projects/netsmp/src/sys/alpha/alpha/mp_machdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#5 integrate
.. //depot/projects/netsmp/src/sys/alpha/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/alpha/conf/GENERIC#3 integrate
.. //depot/projects/netsmp/src/sys/alpha/include/smp.h#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/acpica/madt.c#4 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/apic_vector.S#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/identcpu.c#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/io_apic.c#4 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/local_apic.c#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/mp_machdep.c#5 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/pmap.c#9 integrate
.. //depot/projects/netsmp/src/sys/amd64/amd64/trap.c#4 integrate
.. //depot/projects/netsmp/src/sys/amd64/conf/DEFAULTS#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/netsmp/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/netsmp/src/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/include/apicvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/include/intr_machdep.h#3 integrate
.. //depot/projects/netsmp/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/cpufunc_asm_arm9.S#2 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/identcpu.c#2 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/arm/arm/pmap.c#4 integrate
.. //depot/projects/netsmp/src/sys/arm/include/armreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/arm/include/elf.h#2 integrate
.. //depot/projects/netsmp/src/sys/arm/include/pcpu.h#2 integrate
.. //depot/projects/netsmp/src/sys/arm/include/pmap.h#3 integrate
.. //depot/projects/netsmp/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/boot/forth/loader.conf#7 integrate
.. //depot/projects/netsmp/src/sys/boot/forth/loader.conf.5#3 integrate
.. //depot/projects/netsmp/src/sys/boot/i386/boot2/boot2.c#5 integrate
.. //depot/projects/netsmp/src/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/netsmp/src/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/netsmp/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/kern_ndis.c#4 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/kern_windrv.c#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/ndis_var.h#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/subr_hal.c#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/subr_ndis.c#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate
.. //depot/projects/netsmp/src/sys/compat/ndis/winx32_wrap.S#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.alpha#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.amd64#4 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.arm#4 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.i386#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.ia64#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.pc98#3 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.powerpc#4 integrate
.. //depot/projects/netsmp/src/sys/conf/Makefile.sparc64#3 integrate
.. //depot/projects/netsmp/src/sys/conf/files#12 integrate
.. //depot/projects/netsmp/src/sys/conf/files.amd64#4 integrate
.. //depot/projects/netsmp/src/sys/conf/files.i386#6 integrate
.. //depot/projects/netsmp/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/netsmp/src/sys/conf/files.powerpc#2 integrate
.. //depot/projects/netsmp/src/sys/conf/files.sparc64#3 integrate
.. //depot/projects/netsmp/src/sys/conf/ldscript.arm#2 integrate
.. //depot/projects/netsmp/src/sys/conf/options#4 integrate
.. //depot/projects/netsmp/src/sys/conf/options.i386#3 integrate
.. //depot/projects/netsmp/src/sys/conf/options.pc98#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/CHANGES.txt#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acapps.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acconfig.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acdebug.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acdisasm.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acdispat.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acefi.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acenv.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acevents.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acexcep.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acfreebsd.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acgcc.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acglobal.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/achware.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acinterp.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/aclocal.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acmacros.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acnames.h#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acnamesp.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acobject.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acopcode.h#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acoutput.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acparser.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpi.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpiosxf.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acpixf.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acresrc.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acstruct.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/actables.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/actbl.h#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/actbl1.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/actbl2.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/actypes.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/acutils.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/aecommon.h#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/aeexec.c#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/amlcode.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/amlresrc.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbcmds.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbdisply.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbexec.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbfileio.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbhistry.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbinput.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbstats.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dbxface.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmbuffer.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmnames.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmobject.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmopcode.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmresrc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmresrcl.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmresrcs.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dmwalk.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsfield.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsinit.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsmethod.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsmthdat.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsobject.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsopcode.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dsutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswexec.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswload.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswscope.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/dswstate.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evevent.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evgpe.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evgpeblk.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evmisc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evregion.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evrgnini.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evsci.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evxface.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evxfevnt.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/evxfregn.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exconfig.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exconvrt.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/excreate.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exdump.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exfield.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exfldio.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exmisc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exmutex.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exnames.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg1.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg2.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg3.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exoparg6.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exprep.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exregion.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exresnte.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exresolv.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exresop.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exstore.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exstoren.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exstorob.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exsystem.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/exutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwacpi.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwgpe.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwregs.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwsleep.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/hwtimer.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsaccess.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsalloc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsdump.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsdumpdv.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nseval.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsinit.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsload.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsnames.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsobject.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsparse.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nssearch.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nswalk.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsxfeval.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsxfname.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/nsxfobj.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/osunixxf.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psargs.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psloop.c#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psopcode.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psparse.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psscope.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/pstree.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/pswalk.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/psxface.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsaddr.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rscalc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rscreate.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsdump.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsinfo.c#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsio.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsirq.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rslist.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsmemory.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsmisc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/rsxface.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbconvrt.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbget.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbgetall.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbinstal.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbrsdt.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbutils.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbxface.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/tbxfroot.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utalloc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utcache.c#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utclib.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utcopy.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utdebug.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utdelete.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/uteval.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utglobal.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utinit.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utmath.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utmisc.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utmutex.c#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utobject.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utstate.c#1 branch
.. //depot/projects/netsmp/src/sys/contrib/dev/acpica/utxface.c#3 integrate
.. //depot/projects/netsmp/src/sys/contrib/dev/oltr/if_oltr.c#5 integrate
.. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pflog.c#6 integrate
.. //depot/projects/netsmp/src/sys/contrib/pf/net/if_pfsync.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/aac/aac.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/aac/aac_pci.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdSynch.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/Osd/OsdTable.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_cmbat.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_hpet.c#1 branch
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pcib.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_resource.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_smbat.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpivar.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/aic7xxx/aicasm/Makefile#3 integrate
.. //depot/projects/netsmp/src/sys/dev/amr/amr.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/amr/amr_cam.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/amr/amrvar.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/an/if_an.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/arl/if_arl.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#12 integrate
.. //depot/projects/netsmp/src/sys/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ath/if_athvar.h#4 integrate
.. //depot/projects/netsmp/src/sys/dev/bfe/if_bfe.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/bge/if_bge.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/bge/if_bgereg.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/bktr/bktr_card.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/bktr/bktr_card.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/bktr/bktr_tuner.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/bktr/bktr_tuner.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/dc/if_dcreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ed/if_ed.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/em/if_em.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/em/if_em.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/em/if_em_hw.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/em/if_em_hw.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/em/if_em_osdep.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ep/if_ep.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/ex/if_ex.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/fb/boot_font.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/fe/if_fe.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/fe/if_fe_pccard.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/hme/if_hme.c#11 integrate
.. //depot/projects/netsmp/src/sys/dev/hptmv/entry.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ie/if_ie.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/if_ndis/if_ndis.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/ipw/if_ipw.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/iwi/if_iwi.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/iwi/if_iwireg.h#5 integrate
.. //depot/projects/netsmp/src/sys/dev/iwi/if_iwivar.h#5 integrate
.. //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/joy/joy.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/lge/if_lge.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/lge/if_lgereg.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/lnc/if_lnc.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/lnc/if_lnc_cbus.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/my/if_my.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/nge/if_nge.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/nve/if_nvereg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ofw/ofw_bus_if.m#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ofw/ofw_bus_subr.c#1 branch
.. //depot/projects/netsmp/src/sys/dev/ofw/ofw_bus_subr.h#1 branch
.. //depot/projects/netsmp/src/sys/dev/ofw/openfirm.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/owi/if_ieee80211.h#2 delete
.. //depot/projects/netsmp/src/sys/dev/owi/if_owi.c#7 delete
.. //depot/projects/netsmp/src/sys/dev/owi/if_owi_pccard.c#3 delete
.. //depot/projects/netsmp/src/sys/dev/owi/if_wireg.h#2 delete
.. //depot/projects/netsmp/src/sys/dev/owi/if_wivar.h#2 delete
.. //depot/projects/netsmp/src/sys/dev/pccbb/pccbbdevid.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/pci/pci.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/pdq/if_fea.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/pdq/if_fpa.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/pdq/pdq_freebsd.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/pdq/pdq_ifsubr.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/puc/puc.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/puc/pucdata.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ral/if_ral.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/ray/if_ray.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/re/if_re.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/rp/rp.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sbni/if_sbni.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/si/si_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/si/sireg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/snc/dp83932.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/mss.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/sb16.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/als4000.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/es137x.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/ich.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/via8233.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/channel.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_fmt.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_rate.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/mixer.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/usb/uaudio.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/speaker/speaker.h#1 branch
.. //depot/projects/netsmp/src/sys/dev/speaker/spkr.c#1 branch
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_externs.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_fwif.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_fwimg.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_intr.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_misc.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_cam.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_includes.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_inline.h#1 branch
.. //depot/projects/netsmp/src/sys/dev/twa/tw_osl_share.h#3 integrate
.. //depot/projects/netsmp/src/sys/dev/tx/if_tx.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/txp/if_txp.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_aue.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_axe.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_cue.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_kue.c#7 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_rue.c#10 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_udav.c#9 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_ural.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/if_uralvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/ubser.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/usb/ulpt.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/vge/if_vge.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/vx/if_vx.c#6 integrate
.. //depot/projects/netsmp/src/sys/dev/wi/if_wi.c#12 integrate
.. //depot/projects/netsmp/src/sys/dev/wl/if_wl.c#8 integrate
.. //depot/projects/netsmp/src/sys/dev/xe/if_xe.c#7 integrate
.. //depot/projects/netsmp/src/sys/fs/devfs/devfs_vnops.c#9 integrate
.. //depot/projects/netsmp/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
.. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_smb.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/smbfs/smbfs_vfsops.c#4 integrate
.. //depot/projects/netsmp/src/sys/geom/geom_disk.c#3 integrate
.. //depot/projects/netsmp/src/sys/geom/geom_disk.h#2 integrate
.. //depot/projects/netsmp/src/sys/geom/geom_dump.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/geom_gpt.c#4 integrate
.. //depot/projects/netsmp/src/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum.c#3 integrate
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_drive.c#4 integrate
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_move.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_rename.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate
.. //depot/projects/netsmp/src/sys/i386/acpica/madt.c#4 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/DEFAULTS#2 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/PAE#4 integrate
.. //depot/projects/netsmp/src/sys/i386/conf/XBOX#1 branch
.. //depot/projects/netsmp/src/sys/i386/i386/apic_vector.s#3 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/identcpu.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/io_apic.c#4 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/local_apic.c#4 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/trap.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/vm_machdep.c#4 integrate
.. //depot/projects/netsmp/src/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/netsmp/src/sys/i386/include/smp.h#3 integrate
.. //depot/projects/netsmp/src/sys/i386/include/smptests.h#3 delete
.. //depot/projects/netsmp/src/sys/i386/include/speaker.h#2 integrate
.. //depot/projects/netsmp/src/sys/i386/include/xbox.h#1 branch
.. //depot/projects/netsmp/src/sys/i386/isa/clock.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/isa/spkr.c#2 delete
.. //depot/projects/netsmp/src/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/netsmp/src/sys/i386/xbox/pic16l.s#1 branch
.. //depot/projects/netsmp/src/sys/i386/xbox/xbox.c#1 branch
.. //depot/projects/netsmp/src/sys/i386/xbox/xboxfb.c#1 branch
.. //depot/projects/netsmp/src/sys/ia64/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/netsmp/src/sys/ia64/ia64/pmap.c#6 integrate
.. //depot/projects/netsmp/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/init_main.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_acct.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_kse.c#5 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_ktrace.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_malloc.c#5 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_resource.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_thr.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_thread.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_time.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/link_elf.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_kdb.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_pcpu.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_power.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_rman.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/sys_process.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_mbuf.c#4 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_proto.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#21 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_socket2.c#8 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_syscalls.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_usrreq.c#6 integrate
.. //depot/projects/netsmp/src/sys/kern/vfs_aio.c#5 integrate
.. //depot/projects/netsmp/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/netsmp/src/sys/kern/vfs_subr.c#13 integrate
.. //depot/projects/netsmp/src/sys/modules/Makefile#7 integrate
.. //depot/projects/netsmp/src/sys/modules/acpi/acpi/Makefile#3 integrate
.. //depot/projects/netsmp/src/sys/modules/geom/geom_vinum/Makefile#3 integrate
.. //depot/projects/netsmp/src/sys/modules/i2c/controllers/pcf/Makefile#3 integrate
.. //depot/projects/netsmp/src/sys/modules/i2c/controllers/viapm/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/modules/iwi/Makefile#3 integrate
.. //depot/projects/netsmp/src/sys/modules/md/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/modules/oldcard/Makefile#2 delete
.. //depot/projects/netsmp/src/sys/modules/owi/Makefile#2 delete
.. //depot/projects/netsmp/src/sys/modules/speaker/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/modules/twa/Makefile#3 integrate
.. //depot/projects/netsmp/src/sys/net/fddi.h#2 integrate
.. //depot/projects/netsmp/src/sys/net/if.c#18 integrate
.. //depot/projects/netsmp/src/sys/net/if_arcsubr.c#6 integrate
.. //depot/projects/netsmp/src/sys/net/if_arp.h#2 integrate
.. //depot/projects/netsmp/src/sys/net/if_bridge.c#11 integrate
.. //depot/projects/netsmp/src/sys/net/if_bridgevar.h#3 integrate
.. //depot/projects/netsmp/src/sys/net/if_clone.c#3 integrate
.. //depot/projects/netsmp/src/sys/net/if_clone.h#2 integrate
.. //depot/projects/netsmp/src/sys/net/if_disc.c#3 integrate
.. //depot/projects/netsmp/src/sys/net/if_ef.c#4 integrate
.. //depot/projects/netsmp/src/sys/net/if_ethersubr.c#10 integrate
.. //depot/projects/netsmp/src/sys/net/if_faith.c#5 integrate
.. //depot/projects/netsmp/src/sys/net/if_fddisubr.c#6 integrate
.. //depot/projects/netsmp/src/sys/net/if_fwsubr.c#6 integrate
.. //depot/projects/netsmp/src/sys/net/if_gif.c#6 integrate
.. //depot/projects/netsmp/src/sys/net/if_gre.c#6 integrate
.. //depot/projects/netsmp/src/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/netsmp/src/sys/net/if_mib.c#3 integrate
.. //depot/projects/netsmp/src/sys/net/if_ppp.c#6 integrate
.. //depot/projects/netsmp/src/sys/net/if_stf.c#3 integrate
.. //depot/projects/netsmp/src/sys/net/if_tap.c#5 integrate
.. //depot/projects/netsmp/src/sys/net/if_var.h#13 integrate
.. //depot/projects/netsmp/src/sys/net/if_vlan.c#12 integrate
.. //depot/projects/netsmp/src/sys/net/iso88025.h#2 integrate
.. //depot/projects/netsmp/src/sys/net/route.c#5 integrate
.. //depot/projects/netsmp/src/sys/net/rtsock.c#10 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211.c#5 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_freebsd.c#3 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_ioctl.c#9 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_output.c#6 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/netsmp/src/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/netsmp/src/sys/netatalk/at_proto.c#3 integrate
.. //depot/projects/netsmp/src/sys/netatm/atm_if.c#4 integrate
.. //depot/projects/netsmp/src/sys/netatm/atm_proto.c#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/netgraph.h#7 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_base.c#7 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_eiface.c#4 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_ether.c#5 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_fec.c#6 integrate
.. //depot/projects/netsmp/src/sys/netgraph/ng_socket.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet/if_ether.c#7 integrate
.. //depot/projects/netsmp/src/sys/netinet/igmp.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/in_proto.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_carp.c#7 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_fastfwd.c#7 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_fw2.c#8 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_icmp.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_input.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_mroute.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_options.c#1 branch
.. //depot/projects/netsmp/src/sys/netinet/ip_options.h#1 branch
.. //depot/projects/netsmp/src/sys/netinet/ip_output.c#10 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_output.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_sack.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_subr.c#6 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet/udp_usrreq.c#5 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6.c#7 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_proto.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet6/mld6.c#8 integrate
.. //depot/projects/netsmp/src/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/netsmp/src/sys/netipsec/keysock.c#2 integrate
.. //depot/projects/netsmp/src/sys/netipx/ipx_ip.c#2 integrate
.. //depot/projects/netsmp/src/sys/netipx/ipx_proto.c#3 integrate
.. //depot/projects/netsmp/src/sys/netipx/spx_usrreq.c#4 integrate
.. //depot/projects/netsmp/src/sys/netkey/keysock.c#2 integrate
.. //depot/projects/netsmp/src/sys/netnatm/natm_proto.c#3 integrate
.. //depot/projects/netsmp/src/sys/netsmb/smb_dev.c#3 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfs_socket.c#5 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfs_subs.c#3 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfsm_subs.h#2 integrate
.. //depot/projects/netsmp/src/sys/pc98/conf/DEFAULTS#2 integrate
.. //depot/projects/netsmp/src/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/netsmp/src/sys/pc98/include/smptests.h#2 delete
.. //depot/projects/netsmp/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/netsmp/src/sys/pci/agp_amd64.c#3 integrate
.. //depot/projects/netsmp/src/sys/pci/if_de.c#11 integrate
.. //depot/projects/netsmp/src/sys/pci/if_devar.h#6 integrate
.. //depot/projects/netsmp/src/sys/pci/if_pcn.c#12 integrate
.. //depot/projects/netsmp/src/sys/pci/if_rl.c#8 integrate
.. //depot/projects/netsmp/src/sys/pci/if_sf.c#10 integrate
.. //depot/projects/netsmp/src/sys/pci/if_sis.c#9 integrate
.. //depot/projects/netsmp/src/sys/pci/if_sk.c#9 integrate
.. //depot/projects/netsmp/src/sys/pci/if_ste.c#10 integrate
.. //depot/projects/netsmp/src/sys/pci/if_ti.c#8 integrate
.. //depot/projects/netsmp/src/sys/pci/if_tl.c#8 integrate
.. //depot/projects/netsmp/src/sys/pci/if_vr.c#9 integrate
.. //depot/projects/netsmp/src/sys/pci/if_vrreg.h#3 integrate
.. //depot/projects/netsmp/src/sys/pci/if_wb.c#10 integrate
.. //depot/projects/netsmp/src/sys/pci/if_xl.c#10 integrate
.. //depot/projects/netsmp/src/sys/powerpc/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/include/mmuvar.h#1 branch
.. //depot/projects/netsmp/src/sys/powerpc/include/pmap.h#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/include/pte.h#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/machdep.c#4 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/mmu_if.m#1 branch
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/mmu_oea.c#1 branch
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/ofw_machdep.c#3 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/pmap.c#3 delete
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/pmap_dispatch.c#1 branch
.. //depot/projects/netsmp/src/sys/powerpc/psim/ata_iobus.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/central/central.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/conf/DEFAULTS#1 branch
.. //depot/projects/netsmp/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/netsmp/src/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/fhc/fhc.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/fhc/fhc_central.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/fhc/fhc_nexus.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/fhc/fhcvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/sbus/dma_sbus.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/sparc64/mp_machdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/sparc64/pmap.c#3 integrate
.. //depot/projects/netsmp/src/sys/sys/ata.h#5 integrate
.. //depot/projects/netsmp/src/sys/sys/bio.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/event.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/ktrace.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/mbuf.h#4 integrate
.. //depot/projects/netsmp/src/sys/sys/mdioctl.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/mount.h#4 integrate
.. //depot/projects/netsmp/src/sys/sys/param.h#7 integrate
.. //depot/projects/netsmp/src/sys/sys/proc.h#6 integrate
.. //depot/projects/netsmp/src/sys/sys/queue.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/resource.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/signal.h#5 integrate
.. //depot/projects/netsmp/src/sys/sys/signalvar.h#4 integrate
.. //depot/projects/netsmp/src/sys/sys/socketvar.h#7 integrate
.. //depot/projects/netsmp/src/sys/sys/syscallsubr.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/sysent.h#3 integrate
.. //depot/projects/netsmp/src/sys/sys/time.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/wait.h#2 integrate
.. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_alloc.c#3 integrate
.. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate
.. //depot/projects/netsmp/src/sys/ufs/ufs/ufs_extattr.c#3 integrate
.. //depot/projects/netsmp/src/sys/vm/pmap.h#3 integrate
.. //depot/projects/netsmp/src/sys/vm/vm_map.c#4 integrate
.. //depot/projects/netsmp/src/sys/vm/vm_page.c#4 integrate
.. //depot/projects/netsmp/src/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/netsmp/src/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/netsmp/src/tools/regression/geom_gpt/gctl.t#2 integrate
.. //depot/projects/netsmp/src/tools/regression/sigqueue/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/sigqueue/sigqtest1/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/sigqueue/sigqtest1/sigqtest1.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/sigqueue/sigqtest2/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/sigqueue/sigqtest2/sigqtest2.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/sockets/unix_passfd/Makefile#1 branch
.. //depot/projects/netsmp/src/tools/regression/sockets/unix_passfd/unix_passfd.c#1 branch
.. //depot/projects/netsmp/src/tools/regression/usr.bin/pkill/pgrep-t.t#2 integrate
.. //depot/projects/netsmp/src/tools/regression/usr.bin/pkill/pkill-t.t#2 integrate

Differences ...

==== //depot/projects/netsmp/src/sys/alpha/alpha/clock.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.39 2005/05/14 09:10:00 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/clock.c,v 1.40 2005/11/20 01:31:29 marcel Exp $");
 
 #include "opt_clock.h"
 
@@ -475,31 +475,20 @@
  * and the time of year clock (if any) provides the rest.
  */
 void
-inittodr(base)
-	time_t base;
+inittodr(time_t base)
 {
-	register int days, yr;
 	struct clocktime ct;
-	time_t deltat;
-	int badbase, clock_compat_osf1;
-	int s;
 	struct timespec ts;
-
-	if (base < 5*SECYR) {
-		printf("WARNING: preposterous time in filesystem");
-		/* read the system clock anyway */
-		base = 6*SECYR + 186*SECDAY + SECDAY/2;
-		badbase = 1;
-	} else
-		badbase = 0;
+	int clock_compat_osf1, todr_unreliable;
+	int days, yr;
 
 	if (getenv_int("clock_compat_osf1", &clock_compat_osf1)) {
 		if (clock_compat_osf1)
 			clock_year_offset = UNIX_YEAR_OFFSET;
 	}
 
+	todr_unreliable = 0;
 	CLOCK_GET(clockdev, base, &ct);
-	clockinitted = 1;
 
 #ifdef DEBUG
 	printf("readclock: %d/%d/%d/%d/%d/%d\n", ct.year, ct.mon, ct.day,
@@ -508,7 +497,7 @@
 	ct.year += clock_year_offset;
 	if (ct.year < 70)
 		ct.year += 100;
-	
+
 	/* simple sanity checks */
 	if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 ||
 	    ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) {
@@ -516,48 +505,47 @@
 		 * Believe the time in the filesystem for lack of
 		 * anything better, resetting the TODR.
 		 */
-		s = splclock();
 		ts.tv_sec = base;
-		ts.tv_nsec = 0;
-		tc_setclock(&ts);
-		splx(s);
-		if (!badbase) {
-			printf("WARNING: preposterous clock chip time\n");
-			resettodr();
-		}
-		goto bad;
+		printf("WARNING: preposterous real-time clock");
+		todr_unreliable = 1;
+	} else {
+		days = 0;
+		for (yr = 70; yr < ct.year; yr++)
+			days += LEAPYEAR(yr) ? 366 : 365;
+		days += dayyr[ct.mon - 1] + ct.day - 1;
+		if (LEAPYEAR(yr) && ct.mon > 2)
+			days++;
+		/* now have days since Jan 1, 1970; the rest is easy... */
+		ts.tv_sec = days * SECDAY + ct.hour * SECHOUR +
+		    ct.min * SECMIN + ct.sec;
+		if (wall_cmos_clock)
+			ts.tv_sec += adjkerntz;
+		/*
+		 * The time base comes from a saved time, whereas the real-
+		 * time clock is supposed to represent the current time.
+		 * It is logically not possible for a saved time to be
+		 * larger than the current time, so if that happens, assume
+		 * the real-time clock is off. Warn when the real-time
+		 * clock is off by two or more days.
+		 */
+		if (ts.tv_sec < base) {
+			ts.tv_sec = base;
+			days = (base - ts.tv_sec) / (60L * 60L * 24L);
+			if (days >= 2) {
+				printf("WARNING: real-time clock lost %d days",
+				    days);
+				todr_unreliable = 1;
+			}
+		} 
 	}
-	days = 0;
-	for (yr = 70; yr < ct.year; yr++)
-		days += LEAPYEAR(yr) ? 366 : 365;
-	days += dayyr[ct.mon - 1] + ct.day - 1;
-	if (LEAPYEAR(yr) && ct.mon > 2)
-		days++;
-	/* now have days since Jan 1, 1970; the rest is easy... */
-	s = splclock();
-	ts.tv_sec = 
-	    days * SECDAY + ct.hour * SECHOUR + ct.min * SECMIN + ct.sec;
-	if (wall_cmos_clock)
-	    ts.tv_sec += adjkerntz;
 	ts.tv_nsec = 0;
 	tc_setclock(&ts);
-	splx(s);
+	clockinitted = 1;
 
-	if (!badbase) {
-		/*
-		 * See if we gained/lost two or more days;
-		 * if so, assume something is amiss.
-		 */
-		deltat = ts.tv_sec - base;
-		if (deltat < 0)
-			deltat = -deltat;
-		if (deltat < 2 * SECDAY)
-			return;
-		printf("WARNING: clock %s %d days",
-		    ts.tv_sec < base ? "lost" : "gained", deltat / SECDAY);
+	if (todr_unreliable) {
+		printf(" -- CHECK AND RESET THE DATE!\n");
+		resettodr();
 	}
-bad:
-	printf(" -- CHECK AND RESET THE DATE!\n");
 }
 
 /*

==== //depot/projects/netsmp/src/sys/alpha/alpha/mp_machdep.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.56 2005/04/04 21:53:51 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.57 2005/11/03 21:08:19 jhb Exp $");
 
 #include "opt_kstack_pages.h"
 
@@ -62,6 +62,7 @@
 static struct mtx ap_boot_mtx;
 
 u_int64_t boot_cpu_id;
+struct pcb stoppcbs[MAXCPU];
 
 static void	release_aps(void *dummy);
 static int	smp_cpu_enabled(struct pcs *pcsp);
@@ -543,11 +544,12 @@
 
 		case IPI_STOP:
 			CTR0(KTR_SMP, "IPI_STOP");
-			atomic_set_int(&stopped_cpus, cpumask);
+			savectx(&stoppcbs[PCPU_GET(cpuid)]);
+			atomic_set_acq_int(&stopped_cpus, cpumask);
 			while ((started_cpus & cpumask) == 0)
-				alpha_mb();
-			atomic_clear_int(&started_cpus, cpumask);
-			atomic_clear_int(&stopped_cpus, cpumask);
+				cpu_spinwait();
+			atomic_clear_rel_int(&started_cpus, cpumask);
+			atomic_clear_rel_int(&stopped_cpus, cpumask);
 			break;
 		}
 	}

==== //depot/projects/netsmp/src/sys/alpha/alpha/pmap.c#5 (text+ko) ====

@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.181 2005/10/31 16:14:07 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.186 2005/11/20 06:09:47 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -186,8 +186,6 @@
 #define PMAP_DIAGNOSTIC
 #endif
 
-#define MINPV 2048
-
 #if 0
 #define PMAP_DIAGNOSTIC
 #define PMAP_DEBUG
@@ -319,10 +317,9 @@
  */
 static uma_zone_t pvzone;
 static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0;
-int pmap_pagedaemon_waken;
 
 static PMAP_INLINE void	free_pv_entry(pv_entry_t pv);
-static pv_entry_t get_pv_entry(void);
+static pv_entry_t get_pv_entry(pmap_t locked_pmap);
 static void	alpha_protection_init(void);
 static void	pmap_changebit(vm_page_t m, int bit, boolean_t setem);
 
@@ -571,27 +568,18 @@
 void
 pmap_init(void)
 {
+	int shpgperproc = PMAP_SHPGPERPROC;
 
 	/*
-	 * init the pv free list
+	 * Initialize the address space (zone) for the pv entries.  Set a
+	 * high water mark so that the system can recover from excessive
+	 * numbers of pv entries.
 	 */
-	pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL,
+	pvzone = uma_zcreate("PV ENTRY", sizeof(struct pv_entry), NULL, NULL,
 	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE);
-	uma_prealloc(pvzone, MINPV);
-}
-
-/*
- * Initialize the address space (zone) for the pv_entries.  Set a
- * high water mark so that the system can recover from excessive
- * numbers of pv entries.
- */
-void
-pmap_init2()
-{
-	int shpgperproc = PMAP_SHPGPERPROC;
-
 	TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc);
-	pv_entry_max = shpgperproc * maxproc + vm_page_array_size;
+	pv_entry_max = shpgperproc * maxproc + cnt.v_page_count;
+	TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max);
 	pv_entry_high_water = 9 * (pv_entry_max / 10);
 }
 
@@ -1305,23 +1293,88 @@
 /*
  * get a new pv_entry, allocating a block from the system
  * when needed.
- * the memory allocation is performed bypassing the malloc code
- * because of the possibility of allocations at interrupt time.
  */
 static pv_entry_t
-get_pv_entry(void)
+get_pv_entry(pmap_t locked_pmap)
 {
-	pv_entry_count++;
-	if (pv_entry_high_water &&
-		(pv_entry_count > pv_entry_high_water) &&
-		(pmap_pagedaemon_waken == 0)) {
-		pmap_pagedaemon_waken = 1;
-		wakeup (&vm_pages_needed);
+	static const struct timeval printinterval = { 60, 0 };
+	static struct timeval lastprint;
+	struct vpgqueues *vpq;
+	pmap_t pmap;
+	pt_entry_t *pte, tpte;
+	pv_entry_t allocated_pv, next_pv, pv;
+	vm_offset_t va;
+	vm_page_t m;
+
+	PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED);
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	allocated_pv = uma_zalloc(pvzone, M_NOWAIT);
+	if (allocated_pv != NULL) {
+		pv_entry_count++;
+		if (pv_entry_count > pv_entry_high_water)
+			pagedaemon_wakeup();
+		else
+			return (allocated_pv);
+	}
+
+	/*
+	 * Reclaim pv entries: At first, destroy mappings to inactive
+	 * pages.  After that, if a pv entry is still needed, destroy
+	 * mappings to active pages.
+	 */
+	if (ratecheck(&lastprint, &printinterval))
+		printf("Approaching the limit on PV entries, "
+		    "increase the vm.pmap.shpgperproc tunable.\n");
+	vpq = &vm_page_queues[PQ_INACTIVE];
+retry:
+	TAILQ_FOREACH(m, &vpq->pl, pageq) {
+		if (m->hold_count || m->busy || (m->flags & PG_BUSY))
+			continue;
+		TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) {
+			va = pv->pv_va;
+			pmap = pv->pv_pmap;
+			/* Avoid deadlock and lock recursion. */
+			if (pmap > locked_pmap)
+				PMAP_LOCK(pmap);
+			else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap))
+				continue;
+			pmap->pm_stats.resident_count--;
+			pte = pmap_lev3pte(pmap, va);
+			tpte = *pte;
+			*pte = 0;
+			KASSERT((tpte & PG_W) == 0,
+			    ("get_pv_entry: wired pte %#lx", tpte));
+			if ((tpte & PG_FOR) == 0)
+				vm_page_flag_set(m, PG_REFERENCED);
+			if ((tpte & PG_FOW) == 0) {
+				if (pmap_track_modified(va))
+					vm_page_dirty(m);
+			}
+			pmap_invalidate_page(pmap, va);
+			TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist);
+			TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
+			if (TAILQ_EMPTY(&m->md.pv_list))
+				vm_page_flag_clear(m, PG_WRITEABLE);
+			m->md.pv_list_count--;
+			pmap_unuse_pt(pmap, va, pv->pv_ptem);
+			if (pmap != locked_pmap)
+				PMAP_UNLOCK(pmap);
+			if (allocated_pv == NULL)
+				allocated_pv = pv;
+			else
+				free_pv_entry(pv);
+		}

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


More information about the p4-projects mailing list