PERFORCE change 187802 for review
John Baldwin
jhb at FreeBSD.org
Fri Jan 14 18:04:00 UTC 2011
http://p4web.freebsd.org/@@187802?ac=10
Change 187802 by jhb at jhb_jhbbsd on 2011/01/14 18:03:53
IFC @187801
Affected files ...
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#75 integrate
.. //depot/projects/smpng/sys/cam/cam_xpt.c#72 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#96 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#18 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#16 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#17 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmextern.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#13 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmessages.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslpredef.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1i.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2d.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2e.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2q.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2w.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstartup.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asluuid.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtcompile.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtcompiler.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtfield.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtio.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtsubtable.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttable.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttemplate.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dttemplate.h#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/dtutils.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbcmds.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbdisply.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbexec.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbfileio.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbhistry.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbinput.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbstats.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbutils.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbxface.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmbuffer.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmnames.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmobject.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmopcode.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmresrc.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmresrcl.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmresrcs.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmutils.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/disassembler/dmwalk.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsfield.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsinit.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmethod.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsobject.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dsutils.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswexec.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswload.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswscope.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/dispatcher/dswstate.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evevent.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpe.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeblk.c#9 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeinit.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evgpeutil.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evmisc.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evregion.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evrgnini.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evsci.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxface.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfevnt.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfgpe.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfregn.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconfig.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exconvrt.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/excreate.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exdebug.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exdump.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfield.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfldio.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exmisc.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exmutex.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exnames.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg1.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg2.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg3.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exoparg6.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exprep.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exregion.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exresnte.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exresolv.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exresop.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstore.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstoren.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exstorob.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exsystem.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exutils.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwacpi.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwgpe.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwpci.c#2 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwregs.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwsleep.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwtimer.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwvalid.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/hardware/hwxface.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acapps.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/accommon.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acconfig.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdispat.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acevents.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acexcep.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/achware.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acinterp.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acmacros.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnames.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acnamesp.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acobject.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acopcode.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acoutput.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acparser.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpi.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpredef.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acresrc.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acrestyp.h#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acstruct.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actables.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl1.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actbl2.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#10 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlcode.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/amlresrc.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acenv.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acfreebsd.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/platform/acgcc.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsaccess.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsalloc.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsdump.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsdumpdv.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nseval.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsinit.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsload.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsnames.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsobject.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsparse.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nspredef.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsrepair2.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nssearch.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsutils.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nswalk.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfeval.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfname.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/namespace/nsxfobj.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#15 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psargs.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psloop.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psopcode.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psparse.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psscope.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/pstree.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psutils.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/pswalk.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/parser/psxface.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsaddr.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rscalc.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rscreate.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsdump.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsinfo.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsio.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsirq.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rslist.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsmemory.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsmisc.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsutils.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/resources/rsxface.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbfadt.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbfind.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbinstal.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbutils.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbxface.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tables/tbxfroot.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utalloc.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utcache.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utcopy.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utdebug.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utdelete.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uteval.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utglobal.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utids.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utinit.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utlock.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmath.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmisc.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmutex.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utobject.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utosi.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utresrc.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utstate.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uttrack.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxface.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxferror.c#2 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/pf_osfp.c#6 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alc.c#14 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alcvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#92 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#88 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#24 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/xhci.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/xhci.h#2 integrate
.. //depot/projects/smpng/sys/kern/kern_ntptime.c#26 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#100 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#115 integrate
.. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#52 integrate
.. //depot/projects/smpng/sys/powerpc/include/vmparam.h#18 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/elf32_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/elf64_machdep.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/exec_machdep.c#4 integrate
.. //depot/projects/smpng/sys/sys/priority.h#7 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#70 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#75 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.338 2010/11/23 16:12:35 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.339 2011/01/13 18:20:27 mdf Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -1045,23 +1045,23 @@
u_int ipi_page;
u_int ipi_range;
u_int ipi_range_size;
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW, &ipi_range_size,
- 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_global, CTLFLAG_RW, &ipi_global, 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_page, CTLFLAG_RW, &ipi_page, 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_range, CTLFLAG_RW, &ipi_range, 0, "");
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_range_size, CTLFLAG_RW,
+ &ipi_range_size, 0, "");
u_int ipi_masked_global;
u_int ipi_masked_page;
u_int ipi_masked_range;
u_int ipi_masked_range_size;
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_global, CTLFLAG_RW,
&ipi_masked_global, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_page, CTLFLAG_RW,
&ipi_masked_page, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_range, CTLFLAG_RW,
&ipi_masked_range, 0, "");
-SYSCTL_INT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW,
+SYSCTL_UINT(_debug_xhits, OID_AUTO, ipi_masked_range_size, CTLFLAG_RW,
&ipi_masked_range_size, 0, "");
#endif /* COUNT_XINVLTLB_HITS */
==== //depot/projects/smpng/sys/cam/cam_xpt.c#72 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.255 2010/11/30 22:39:46 ken Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.256 2011/01/13 18:20:27 mdf Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -197,11 +197,11 @@
u_int32_t cam_dflags = CAM_DEBUG_NONE;
#endif
TUNABLE_INT("kern.cam.dflags", &cam_dflags);
-SYSCTL_INT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW,
+SYSCTL_UINT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW,
&cam_dflags, 0, "Cam Debug Flags");
u_int32_t cam_debug_delay;
TUNABLE_INT("kern.cam.debug_delay", &cam_debug_delay);
-SYSCTL_INT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW,
+SYSCTL_UINT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW,
&cam_debug_delay, 0, "Cam Debug Flags");
#endif
==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#96 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.253 2010/10/24 18:53:16 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.254 2011/01/13 18:20:33 mdf Exp $");
#include <sys/param.h>
@@ -1127,9 +1127,9 @@
struct ccb_trans_settings_fc *fc = &cts.xport_specific.fc;
if (fc->valid & CTS_FC_VALID_WWPN) {
softc->wwpn = fc->wwpn;
- SYSCTL_ADD_XLONG(&softc->sysctl_ctx,
+ SYSCTL_ADD_X64(&softc->sysctl_ctx,
SYSCTL_CHILDREN(softc->sysctl_tree),
- OID_AUTO, "wwpn", CTLTYPE_QUAD | CTLFLAG_RD,
+ OID_AUTO, "wwpn", CTLFLAG_RD,
&softc->wwpn, "World Wide Port Name");
}
}
==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#18 (text+ko) ====
@@ -188,9 +188,9 @@
TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit);
TUNABLE_INT("vfs.zfs.mdcomp_disable", &zfs_mdcomp_disable);
SYSCTL_DECL(_vfs_zfs);
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0,
"Maximum ARC size");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0,
"Minimum ARC size");
SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN,
&zfs_mdcomp_disable, 0, "Disable metadata compression");
@@ -466,9 +466,9 @@
static uint64_t arc_meta_used;
static uint64_t arc_meta_limit;
static uint64_t arc_meta_max = 0;
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_meta_used, CTLFLAG_RDTUN,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_meta_used, CTLFLAG_RDTUN,
&arc_meta_used, 0, "ARC metadata used");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_meta_limit, CTLFLAG_RDTUN,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_meta_limit, CTLFLAG_RDTUN,
&arc_meta_limit, 0, "ARC metadata limit");
typedef struct l2arc_buf_hdr l2arc_buf_hdr_t;
@@ -638,15 +638,15 @@
boolean_t l2arc_feed_again = B_TRUE; /* turbo warmup */
boolean_t l2arc_norw = B_TRUE; /* no reads during writes */
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_write_max, CTLFLAG_RW,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_write_max, CTLFLAG_RW,
&l2arc_write_max, 0, "max write size");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_write_boost, CTLFLAG_RW,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_write_boost, CTLFLAG_RW,
&l2arc_write_boost, 0, "extra write during warmup");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_headroom, CTLFLAG_RW,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_headroom, CTLFLAG_RW,
&l2arc_headroom, 0, "number of dev writes");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_secs, CTLFLAG_RW,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_feed_secs, CTLFLAG_RW,
&l2arc_feed_secs, 0, "interval seconds");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2arc_feed_min_ms, CTLFLAG_RW,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2arc_feed_min_ms, CTLFLAG_RW,
&l2arc_feed_min_ms, 0, "min interval milliseconds");
SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_noprefetch, CTLFLAG_RW,
@@ -656,46 +656,46 @@
SYSCTL_INT(_vfs_zfs, OID_AUTO, l2arc_norw, CTLFLAG_RW,
&l2arc_norw, 0, "no reads during writes");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_size, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, anon_size, CTLFLAG_RD,
&ARC_anon.arcs_size, 0, "size of anonymous state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_metadata_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, anon_metadata_lsize, CTLFLAG_RD,
&ARC_anon.arcs_lsize[ARC_BUFC_METADATA], 0, "size of anonymous state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, anon_data_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, anon_data_lsize, CTLFLAG_RD,
&ARC_anon.arcs_lsize[ARC_BUFC_DATA], 0, "size of anonymous state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_size, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_size, CTLFLAG_RD,
&ARC_mru.arcs_size, 0, "size of mru state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_metadata_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_metadata_lsize, CTLFLAG_RD,
&ARC_mru.arcs_lsize[ARC_BUFC_METADATA], 0, "size of metadata in mru state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_data_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_data_lsize, CTLFLAG_RD,
&ARC_mru.arcs_lsize[ARC_BUFC_DATA], 0, "size of data in mru state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_ghost_size, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_ghost_size, CTLFLAG_RD,
&ARC_mru_ghost.arcs_size, 0, "size of mru ghost state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_ghost_metadata_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_ghost_metadata_lsize, CTLFLAG_RD,
&ARC_mru_ghost.arcs_lsize[ARC_BUFC_METADATA], 0,
"size of metadata in mru ghost state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mru_ghost_data_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mru_ghost_data_lsize, CTLFLAG_RD,
&ARC_mru_ghost.arcs_lsize[ARC_BUFC_DATA], 0,
"size of data in mru ghost state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_size, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_size, CTLFLAG_RD,
&ARC_mfu.arcs_size, 0, "size of mfu state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_metadata_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_metadata_lsize, CTLFLAG_RD,
&ARC_mfu.arcs_lsize[ARC_BUFC_METADATA], 0, "size of metadata in mfu state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_data_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_data_lsize, CTLFLAG_RD,
&ARC_mfu.arcs_lsize[ARC_BUFC_DATA], 0, "size of data in mfu state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_ghost_size, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_ghost_size, CTLFLAG_RD,
&ARC_mfu_ghost.arcs_size, 0, "size of mfu ghost state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_ghost_metadata_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_ghost_metadata_lsize, CTLFLAG_RD,
&ARC_mfu_ghost.arcs_lsize[ARC_BUFC_METADATA], 0,
"size of metadata in mfu ghost state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, mfu_ghost_data_lsize, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, mfu_ghost_data_lsize, CTLFLAG_RD,
&ARC_mfu_ghost.arcs_lsize[ARC_BUFC_DATA], 0,
"size of data in mfu ghost state");
-SYSCTL_QUAD(_vfs_zfs, OID_AUTO, l2c_only_size, CTLFLAG_RD,
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, l2c_only_size, CTLFLAG_RD,
&ARC_l2c_only.arcs_size, 0, "size of mru state");
/*
==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#9 (text+ko) ====
@@ -61,7 +61,7 @@
SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, block_cap, CTLFLAG_RDTUN,
&zfetch_block_cap, 0, "Max number of blocks to fetch at a time");
TUNABLE_QUAD("vfs.zfs.zfetch.array_rd_sz", &zfetch_array_rd_sz);
-SYSCTL_QUAD(_vfs_zfs_zfetch, OID_AUTO, array_rd_sz, CTLFLAG_RDTUN,
+SYSCTL_UQUAD(_vfs_zfs_zfetch, OID_AUTO, array_rd_sz, CTLFLAG_RDTUN,
&zfetch_array_rd_sz, 0,
"Number of bytes in a array_read at which we stop prefetching");
==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#6 (text+ko) ====
@@ -50,7 +50,7 @@
SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, synctime, CTLFLAG_RDTUN, &zfs_txg_synctime,
0, "Target seconds to sync a txg");
TUNABLE_QUAD("vfs.zfs.txg.write_limit_override", &zfs_write_limit_override);
-SYSCTL_QUAD(_vfs_zfs_txg, OID_AUTO, write_limit_override, CTLFLAG_RW,
+SYSCTL_UQUAD(_vfs_zfs_txg, OID_AUTO, write_limit_override, CTLFLAG_RW,
&zfs_write_limit_override, 0,
"Override maximum size of a txg to this size in bytes, "
"value of 0 means don't override");
==== //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#16 (text+ko) ====
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.15 2010/10/13 21:37:02 jkim Exp $
+# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.16 2011/01/13 17:32:32 jkim Exp $
#
# Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout
#
@@ -19,7 +19,8 @@
tools utilities"
# files to remove
-stripdirs="acpisrc acpixtract examples generate os_specific tests"
+stripdirs="acpinames acpisrc acpixtract examples generate os_specific \
+ tests"
stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \
acos2.h accygwin.h acefi.h acwin.h acwin64.h aeexec.c \
aehandlers.c aemain.c aetables.c aetables.h osunixdir.c \
==== //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#12 (text+ko) ====
@@ -1,8 +1,77 @@
----------------------------------------
+12 January 2011. Summary of changes for version 20110112:
+
+1) ACPI CA Core Subsystem:
+
+Fixed a race condition between method execution and namespace walks that can
+possibly cause a fault. The problem was apparently introduced in version
+20100528 as a result of a performance optimization that reduces the number of
+namespace walks upon method exit by using the delete_namespace_subtree
+function instead of the delete_namespace_by_owner function used previously.
+Bug is a missing namespace lock in the delete_namespace_subtree function.
+dana.myers at oracle.com
+
+Fixed several issues and a possible fault with the automatic "serialized"
+method support. History: This support changes a method to "serialized" on the
+fly if the method generates an AE_ALREADY_EXISTS error, indicating the
+possibility that it cannot handle reentrancy. This fix repairs a couple of
+issues seen in the field, especially on machines with many cores:
+
+ 1) Delete method children only upon the exit of the last thread,
+ so as to not delete objects out from under other running threads
+ (and possibly causing a fault.)
+ 2) Set the "serialized" bit for the method only upon the exit of the
+ Last thread, so as to not cause deadlock when running threads
+ attempt to exit.
+ 3) Cleanup the use of the AML "MethodFlags" and internal method flags
+ so that there is no longer any confusion between the two.
+
+ Lin Ming, Bob Moore. Reported by dana.myers at oracle.com.
+
+Debugger: Now lock the namespace for duration of a namespace dump. Prevents
+issues if the namespace is changing dynamically underneath the debugger.
+Especially affects temporary namespace nodes, since the debugger displays
+these also.
+
+Updated the ordering of include files. The ACPICA headers should appear
+before any compiler-specific headers (stdio.h, etc.) so that acenv.h can set
+any necessary compiler-specific defines, etc. Affects the ACPI-related tools
+and utilities.
+
+Updated all ACPICA copyrights and signons to 2011. Added the 2011 copyright
+to all module headers and signons, including the Linux header. This affects
+virtually every file in the ACPICA core subsystem, iASL compiler, and all
+utilities.
+
+Added project files for MS Visual Studio 2008 (VC++ 9.0). The original
+project files for VC++ 6.0 are now obsolete. New project files can be found
+under acpica/generate/msvc9. See acpica/generate/msvc9/readme.txt for
+details.
+
+Example Code and Data Size: These are the sizes for the OS-independent
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The
+debug version of the code includes the debug output trace mechanism and has a
+much larger code and data size.
+
+ Previous Release (VC 6.0):
+ Non-Debug Version: 89.8K Code, 18.9K Data, 108.7K Total
+ Debug Version: 166.6K Code, 52.1K Data, 218.7K Total
+ Current Release (VC 9.0):
+ Non-Debug Version: 89.7K Code, 23.7K Data, 113.4K Total
+ Debug Version: 163.9K Code, 67.5K Data, 231.4K Total
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Added generic data types to the Data Table compiler. Add "generic" data
+types such as UINT32, String, Unicode, etc., to simplify the generation of
+platform-defined tables such as UEFI. Lin Ming.
+
+iASL: Added listing support for the Data Table Compiler. Adds listing support
+(-l) to display actual binary output for each line of input code.
+
+----------------------------------------
09 December 2010. Summary of changes for version 20101209:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Completed the major overhaul of the GPE support code that was begun in July
@@ -73,8 +142,6 @@
----------------------------------------
13 October 2010. Summary of changes for version 20101013:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Added support to clear the PCIEXP_WAKE event. When clearing ACPI events, now
@@ -133,8 +200,6 @@
----------------------------------------
15 September 2010. Summary of changes for version 20100915:
-This release is available at www.acpica.org/downloads
-
1) ACPI CA Core Subsystem:
Removed the AcpiOsDerivePciId OSL interface. The various host implementations
==== //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#6 (text+ko) ====
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
*
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include <contrib/dev/acpica/include/acpi.h>
==== //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#17 (text+ko) ====
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
*
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution. In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE.
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government. In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
#include <contrib/dev/acpica/include/acpi.h>
@@ -667,7 +595,7 @@
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT))
{
- AcpiOsPrintf (" **** ACPI 1.0, no 64-bit math support");
+ AcpiOsPrintf (" **** 32-bit table (V1), no 64-bit math support");
}
break;
==== //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#7 (text+ko) ====
@@ -4,114 +4,42 @@
*
*****************************************************************************/
-/******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+/*
+ * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
- * 2. License
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ * of any contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights. You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
*
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code. No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision. In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change. Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee. Licensee
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list