bk://linux-acpi.bkbits.net/to-akpm len.brown@intel.com|ChangeSet|20050121224556|42584 len.brown # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/01/21 17:44:33-05:00 len.brown@intel.com # [ACPI] avoid benign AE_TYPE warnings # caused by "implicit return" BIOS workaround # returning unsolicited (and thus mis-typed) AML values. # # Signed-off-by: Bob Moore # Signed-off-by: Len Brown # # drivers/acpi/utilities/uteval.c # 2005/01/21 17:44:25-05:00 len.brown@intel.com +11 -0 # avoid complaints about unsolicited return values # that result from the "implicit-return" BIOS workaround # # ChangeSet # 2005/01/21 12:05:08-08:00 akpm@bix.(none) # Merge # # drivers/acpi/debug.c # 2005/01/21 12:05:06-08:00 akpm@bix.(none) +0 -0 # SCCS merged # # ChangeSet # 2005/01/21 00:28:02-05:00 len.brown@intel.com # Merge intel.com:/home/lenb/src/26-stable-dev # into intel.com:/home/lenb/src/26-latest-dev # # drivers/acpi/events/evgpeblk.c # 2005/01/21 00:27:58-05:00 len.brown@intel.com +0 -0 # Auto merged # # ChangeSet # 2005/01/21 00:18:05-05:00 len.brown@intel.com # [ACPI] ACPICA 20050114 from Bob Moore # # Added 2005 copyright to all ACPICA files. # # Fixed an issue with the String-to-Buffer conversion code # where the string null terminator was not included in the # buffer after conversion, but there is existing ASL that # assumes the string null terminator is included. This is the # root of the ACPI_AML_BUFFER_LIMIT regression. This problem # was introduced in the previous version when the code was # updated to correctly set the converted buffer size as per # the ACPI specification. The ACPI spec is ambiguous and # will be updated to specify that the null terminator must # be included in the converted buffer. This also affects # the ToBuffer() ASL operator. # # Fixed a problem with the Mid() ASL/AML operator where it # did not work correctly on Buffer objects. Newly created # sub-buffers were not being marked as initialized. # # Fixed a problem in acpi_tb_find_table where incorrect string # compares were performed on the oem_id and oem_table_d table # header fields. These fields are not null terminated, # so strncmp is now used instead of strcmp. # # Implemented a restriction on the Store() ASL/AML operator # to align the behavior with the ACPI specification. # Previously, any object could be used as the source # operand. Now, the only objects that may be used are # Integers, Buffers, Strings, Packages, Object References, # and DDB Handles. As acpi_gbl_enable_interpreter_slack # is FALSE by default, "acpi=strict" is needed to enable # this check. # # Enhanced the optional "implicit return" support to allow # an implicit return value from methods that are invoked # externally via the AcpiEvaluateObject interface. This # enables implicit returns from the _STA and _INI methods, # for example. # # Changed the Revision() ASL/AML operator to return the # current version of the AML interpreter, in the YYYYMMDD # format. Previously, it incorrectly returned the supported # ACPI version (This is the function of the _REV method). # # Updated the _REV predefined method to return the currently # supported version of ACPI, now 3. # # include/acpi/platform/aclinux.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/platform/acgcc.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/platform/acenv.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/amlresrc.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/amlcode.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +2 -1 # ACPICA 20050114 # # include/acpi/acutils.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/actypes.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/actbl2.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/actbl1.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/actbl.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/actables.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acstruct.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acresrc.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acpixf.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acpiosxf.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acpi.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acparser.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acoutput.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acobject.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acnamesp.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acmacros.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/aclocal.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acinterp.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/achware.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acglobal.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +2 -1 # ACPICA 20050114 # # include/acpi/acexcep.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acevents.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acdispat.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acdisasm.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acdebug.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # include/acpi/acconfig.h # 2005/01/21 00:17:55-05:00 len.brown@intel.com +2 -2 # ACPICA 20050114 # # drivers/acpi/utilities/utxface.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utobject.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utmisc.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utmath.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utinit.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utglobal.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +6 -4 # ACPICA 20050114 # # drivers/acpi/utilities/uteval.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +4 -3 # ACPICA 20050114 # # drivers/acpi/utilities/utdelete.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utdebug.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utcopy.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/utilities/utalloc.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbxfroot.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +14 -8 # ACPICA 20050114 # # drivers/acpi/tables/tbxface.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbutils.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbrsdt.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbinstal.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbgetall.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbget.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/tables/tbconvrt.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsxface.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsutils.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +8 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsmisc.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsmemory.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rslist.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsirq.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsio.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsdump.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rscreate.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rscalc.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/resources/rsaddr.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/psxface.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/pswalk.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/psutils.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/pstree.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/psscope.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/psparse.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/parser/psopcode.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +2 -2 # ACPICA 20050114 # # drivers/acpi/parser/psargs.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsxfobj.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsxfname.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsxfeval.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nswalk.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsutils.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nssearch.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsparse.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsobject.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsnames.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsload.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsinit.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +7 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nseval.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsdumpdv.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsdump.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsalloc.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/namespace/nsaccess.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +4 -7 # ACPICA 20050114 # # drivers/acpi/hardware/hwtimer.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/hardware/hwsleep.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/hardware/hwregs.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/hardware/hwgpe.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/hardware/hwacpi.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exutils.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exsystem.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exstorob.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exstoren.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exstore.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exresop.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +40 -1 # ACPICA 20050114 # # drivers/acpi/executer/exresolv.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exresnte.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exregion.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exprep.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exoparg6.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exoparg3.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +5 -1 # ACPICA 20050114 # # drivers/acpi/executer/exoparg2.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exoparg1.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exnames.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exmutex.c # 2005/01/21 00:17:54-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exmisc.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exfldio.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exfield.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exdump.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/excreate.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/executer/exconvrt.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +7 -2 # ACPICA 20050114 # # drivers/acpi/executer/exconfig.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evxfregn.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evxfevnt.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evxface.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evsci.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evrgnini.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evregion.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evmisc.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evgpeblk.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evgpe.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/events/evevent.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dswstate.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dswscope.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dswload.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dswexec.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsutils.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +7 -5 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsopcode.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsobject.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +2 -2 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsmthdat.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsmethod.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsinit.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # drivers/acpi/dispatcher/dsfield.c # 2005/01/21 00:17:53-05:00 len.brown@intel.com +1 -1 # ACPICA 20050114 # # ChangeSet # 2005/01/20 22:58:53-05:00 len.brown@intel.com # Merge intel.com:/home/lenb/src/26-stable-dev # into intel.com:/home/lenb/src/26-latest-dev # # include/acpi/processor.h # 2005/01/20 22:58:49-05:00 len.brown@intel.com +0 -0 # Auto merged # # drivers/acpi/processor_idle.c # 2005/01/20 22:58:49-05:00 len.brown@intel.com +0 -0 # Auto merged # # ChangeSet # 2005/01/20 22:43:52-05:00 len.brown@intel.com # [ACPI] Add a module parameter to allow tuning how much bus-master activity # we remember when entering C3 -- /sys/module/processor/parameters/bm_history # Default varies with HZ -- 40ms for 25 - 800 HZ, 32ms for 1000 HZ. # # Signed-off-by: Len Brown # # drivers/acpi/processor_idle.c # 2005/01/20 22:43:44-05:00 len.brown@intel.com +11 -2 # /sys/module/processor/parameters/bm_history # # ChangeSet # 2005/01/20 21:52:27-05:00 len.brown@intel.com # [ACPI] Make the bm_activity depend on "jiffies", instead of numbers # of the check being called. This means bus mastering activity # is assumed if bm_check isn't called; and multiple calls during # one jiffy will be |='ed. # # Signed-off-by: Dominik Brodowski # Signed-off-by: Len Brown # # include/acpi/processor.h # 2005/01/20 21:52:11-05:00 len.brown@intel.com +1 -0 # jiffies-based bus-master activity history # # drivers/acpi/processor_idle.c # 2005/01/20 21:52:11-05:00 len.brown@intel.com +14 -1 # jiffies-based bus-master activity history # # ChangeSet # 2005/01/07 13:42:16-05:00 len.brown@intel.com # [ACPI] Use kernel.h for ARRAY_SIZE() instead of using local NUM_OF(). # # Signed-off-by: Randy Dunlap # Signed-off-by: Len Brown # # drivers/acpi/debug.c # 2005/01/07 13:42:08-05:00 len.brown@intel.com +4 -4 # Use kernel.h for ARRAY_SIZE() instead of using local NUM_OF(). # # ChangeSet # 2005/01/06 02:06:24-05:00 len.brown@intel.com # Merge intel.com:/home/lenb/src/26-stable-dev # into intel.com:/home/lenb/src/26-latest-dev # # drivers/acpi/video.c # 2005/01/06 02:06:20-05:00 len.brown@intel.com +0 -1 # Auto merged # # ChangeSet # 2005/01/05 23:56:52-05:00 torvalds@evo.osdl.org # acpi video device enumeration: fix incorrect device list allocation # # It didn't allocate space for the final terminating entry, # which caused it to overwrite the next slab entry, which in turn # sometimes ended up being a slab array cache pointer. End result: # total slab cache corruption at a random time afterwards. Very # nasty. # # drivers/acpi/video.c # 2005/01/05 23:54:25-05:00 torvalds@evo.osdl.org +1 -1 # acpi video device enumeration: fix incorrect device list allocation # # It didn't allocate space for the final terminating entry, # which caused it to overwrite the next slab entry, which in turn # sometimes ended up being a slab array cache pointer. End result: # total slab cache corruption at a random time afterwards. Very # nasty. # diff -Nru a/drivers/acpi/debug.c b/drivers/acpi/debug.c --- a/drivers/acpi/debug.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/debug.c 2005-01-23 21:55:50 -08:00 @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -89,7 +90,6 @@ ACPI_DEBUG_INIT(ACPI_LV_FULL_TABLES), ACPI_DEBUG_INIT(ACPI_LV_EVENTS), }; -#define NUM_OF(v) ( sizeof(v)/sizeof(v[0]) ) static int acpi_system_read_debug ( @@ -102,7 +102,7 @@ { char *p = page; int size = 0; - int i; + unsigned int i; if (off != 0) goto end; @@ -111,7 +111,7 @@ switch ((unsigned long) data) { case 0: - for (i = 0; i < NUM_OF(acpi_debug_layers); i++) { + for (i = 0; i < ARRAY_SIZE(acpi_debug_layers); i++) { p += sprintf(p, "%-25s\t0x%08lX [%c]\n", acpi_debug_layers[i].name, acpi_debug_layers[i].value, @@ -128,7 +128,7 @@ acpi_dbg_layer); break; case 1: - for (i = 0; i < NUM_OF(acpi_debug_levels); i++) { + for (i = 0; i < ARRAY_SIZE(acpi_debug_levels); i++) { p += sprintf(p, "%-25s\t0x%08lX [%c]\n", acpi_debug_levels[i].name, acpi_debug_levels[i].value, diff -Nru a/drivers/acpi/dispatcher/dsfield.c b/drivers/acpi/dispatcher/dsfield.c --- a/drivers/acpi/dispatcher/dsfield.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dsfield.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c --- a/drivers/acpi/dispatcher/dsinit.c 2005-01-23 21:55:51 -08:00 +++ b/drivers/acpi/dispatcher/dsinit.c 2005-01-23 21:55:51 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dsmethod.c b/drivers/acpi/dispatcher/dsmethod.c --- a/drivers/acpi/dispatcher/dsmethod.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dsmethod.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dsmthdat.c b/drivers/acpi/dispatcher/dsmthdat.c --- a/drivers/acpi/dispatcher/dsmthdat.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dsmthdat.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c --- a/drivers/acpi/dispatcher/dsobject.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dsobject.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -516,7 +516,7 @@ case AML_REVISION_OP: - obj_desc->integer.value = ACPI_CA_SUPPORT_LEVEL; + obj_desc->integer.value = ACPI_CA_VERSION; break; default: diff -Nru a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c --- a/drivers/acpi/dispatcher/dsopcode.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dsopcode.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dsutils.c b/drivers/acpi/dispatcher/dsutils.c --- a/drivers/acpi/dispatcher/dsutils.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dsutils.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,11 +88,13 @@ } /* - * If there is no parent, we are executing at the method level. - * An executing method typically has no parent, since each method - * is parsed separately. + * If there is no parent, or the parent is a scope_op, we are executing + * at the method level. An executing method typically has no parent, + * since each method is parsed separately. A method invoked externally + * via execute_control_method has a scope_op as the parent. */ - if (!op->common.parent) { + if ((!op->common.parent) || + (op->common.parent->common.aml_opcode == AML_SCOPE_OP)) { /* * If this is the last statement in the method, we know it is not a * Return() operator (would not come here.) The following code is the diff -Nru a/drivers/acpi/dispatcher/dswexec.c b/drivers/acpi/dispatcher/dswexec.c --- a/drivers/acpi/dispatcher/dswexec.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dswexec.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dswload.c b/drivers/acpi/dispatcher/dswload.c --- a/drivers/acpi/dispatcher/dswload.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dswload.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c --- a/drivers/acpi/dispatcher/dswscope.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dswscope.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c --- a/drivers/acpi/dispatcher/dswstate.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/dispatcher/dswstate.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c --- a/drivers/acpi/events/evevent.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evevent.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c --- a/drivers/acpi/events/evgpe.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evgpe.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c --- a/drivers/acpi/events/evgpeblk.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evgpeblk.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c --- a/drivers/acpi/events/evmisc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evmisc.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c --- a/drivers/acpi/events/evregion.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evregion.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c --- a/drivers/acpi/events/evrgnini.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evrgnini.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c --- a/drivers/acpi/events/evsci.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evsci.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c --- a/drivers/acpi/events/evxface.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evxface.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c --- a/drivers/acpi/events/evxfevnt.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evxfevnt.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c --- a/drivers/acpi/events/evxfregn.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/events/evxfregn.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exconfig.c b/drivers/acpi/executer/exconfig.c --- a/drivers/acpi/executer/exconfig.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exconfig.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exconvrt.c b/drivers/acpi/executer/exconvrt.c --- a/drivers/acpi/executer/exconvrt.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exconvrt.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -239,8 +239,13 @@ /* * Create a new Buffer object * Size will be the string length + * + * NOTE: Add one to the string length to include the null terminator. + * The ACPI spec is unclear on this subject, but there is existing + * ASL/AML code that depends on the null being transferred to the new + * buffer. */ - return_desc = acpi_ut_create_buffer_object ((acpi_size) obj_desc->string.length); + return_desc = acpi_ut_create_buffer_object ((acpi_size) obj_desc->string.length + 1); if (!return_desc) { return_ACPI_STATUS (AE_NO_MEMORY); } diff -Nru a/drivers/acpi/executer/excreate.c b/drivers/acpi/executer/excreate.c --- a/drivers/acpi/executer/excreate.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/excreate.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exdump.c b/drivers/acpi/executer/exdump.c --- a/drivers/acpi/executer/exdump.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exdump.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c --- a/drivers/acpi/executer/exfield.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exfield.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exfldio.c b/drivers/acpi/executer/exfldio.c --- a/drivers/acpi/executer/exfldio.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exfldio.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exmisc.c b/drivers/acpi/executer/exmisc.c --- a/drivers/acpi/executer/exmisc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exmisc.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exmutex.c b/drivers/acpi/executer/exmutex.c --- a/drivers/acpi/executer/exmutex.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exmutex.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exnames.c b/drivers/acpi/executer/exnames.c --- a/drivers/acpi/executer/exnames.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exnames.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exoparg1.c b/drivers/acpi/executer/exoparg1.c --- a/drivers/acpi/executer/exoparg1.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exoparg1.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exoparg2.c b/drivers/acpi/executer/exoparg2.c --- a/drivers/acpi/executer/exoparg2.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exoparg2.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exoparg3.c b/drivers/acpi/executer/exoparg3.c --- a/drivers/acpi/executer/exoparg3.c 2005-01-23 21:55:49 -08:00 +++ b/drivers/acpi/executer/exoparg3.c 2005-01-23 21:55:49 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -218,6 +218,10 @@ return_desc->string.pointer = buffer; return_desc->string.length = (u32) length; } + + /* Mark buffer initialized */ + + return_desc->buffer.flags |= AOPOBJ_DATA_VALID; break; diff -Nru a/drivers/acpi/executer/exoparg6.c b/drivers/acpi/executer/exoparg6.c --- a/drivers/acpi/executer/exoparg6.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exoparg6.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c --- a/drivers/acpi/executer/exprep.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exprep.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exregion.c b/drivers/acpi/executer/exregion.c --- a/drivers/acpi/executer/exregion.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exregion.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exresnte.c b/drivers/acpi/executer/exresnte.c --- a/drivers/acpi/executer/exresnte.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exresnte.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c --- a/drivers/acpi/executer/exresolv.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exresolv.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c --- a/drivers/acpi/executer/exresop.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exresop.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -577,6 +577,45 @@ default: ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Needed [Region/region_field], found [%s] %p\n", + acpi_ut_get_object_type_name (obj_desc), obj_desc)); + + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); + } + goto next_operand; + + + case ARGI_DATAREFOBJ: + + /* Used by the Store() operator only */ + + switch (ACPI_GET_OBJECT_TYPE (obj_desc)) { + case ACPI_TYPE_INTEGER: + case ACPI_TYPE_PACKAGE: + case ACPI_TYPE_STRING: + case ACPI_TYPE_BUFFER: + case ACPI_TYPE_BUFFER_FIELD: + case ACPI_TYPE_LOCAL_REFERENCE: + case ACPI_TYPE_LOCAL_REGION_FIELD: + case ACPI_TYPE_LOCAL_BANK_FIELD: + case ACPI_TYPE_LOCAL_INDEX_FIELD: + case ACPI_TYPE_DDB_HANDLE: + + /* Valid operand */ + break; + + default: + + if (acpi_gbl_enable_interpreter_slack) { + /* + * Enable original behavior of Store(), allowing any and all + * objects as the source operand. The ACPI spec does not + * allow this, however. + */ + break; + } + + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n", acpi_ut_get_object_type_name (obj_desc), obj_desc)); return_ACPI_STATUS (AE_AML_OPERAND_TYPE); diff -Nru a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c --- a/drivers/acpi/executer/exstore.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exstore.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c --- a/drivers/acpi/executer/exstoren.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exstoren.c 2005-01-23 21:55:50 -08:00 @@ -7,7 +7,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exstorob.c b/drivers/acpi/executer/exstorob.c --- a/drivers/acpi/executer/exstorob.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exstorob.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exsystem.c b/drivers/acpi/executer/exsystem.c --- a/drivers/acpi/executer/exsystem.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exsystem.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c --- a/drivers/acpi/executer/exutils.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/executer/exutils.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/hardware/hwacpi.c b/drivers/acpi/hardware/hwacpi.c --- a/drivers/acpi/hardware/hwacpi.c 2005-01-23 21:55:49 -08:00 +++ b/drivers/acpi/hardware/hwacpi.c 2005-01-23 21:55:49 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/hardware/hwgpe.c b/drivers/acpi/hardware/hwgpe.c --- a/drivers/acpi/hardware/hwgpe.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/hardware/hwgpe.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c --- a/drivers/acpi/hardware/hwregs.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/hardware/hwregs.c 2005-01-23 21:55:50 -08:00 @@ -7,7 +7,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c --- a/drivers/acpi/hardware/hwsleep.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/hardware/hwsleep.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/hardware/hwtimer.c b/drivers/acpi/hardware/hwtimer.c --- a/drivers/acpi/hardware/hwtimer.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/hardware/hwtimer.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c --- a/drivers/acpi/namespace/nsaccess.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsaccess.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -155,8 +155,7 @@ */ switch (init_val->type) { case ACPI_TYPE_METHOD: - obj_desc->method.param_count = (u8) ACPI_STRTOUL - (val, NULL, 10); + obj_desc->method.param_count = (u8) ACPI_TO_INTEGER (val); obj_desc->common.flags |= AOPOBJ_DATA_VALID; #if defined (_ACPI_ASL_COMPILER) || defined (_ACPI_DUMP_App) @@ -176,8 +175,7 @@ case ACPI_TYPE_INTEGER: - obj_desc->integer.value = - (acpi_integer) ACPI_STRTOUL (val, NULL, 10); + obj_desc->integer.value = ACPI_TO_INTEGER (val); break; @@ -195,8 +193,7 @@ case ACPI_TYPE_MUTEX: obj_desc->mutex.node = new_node; - obj_desc->mutex.sync_level = (u8) ACPI_STRTOUL - (val, NULL, 10); + obj_desc->mutex.sync_level = (u8) ACPI_TO_INTEGER (val); if (ACPI_STRCMP (init_val->name, "_GL_") == 0) { /* diff -Nru a/drivers/acpi/namespace/nsalloc.c b/drivers/acpi/namespace/nsalloc.c --- a/drivers/acpi/namespace/nsalloc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsalloc.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c --- a/drivers/acpi/namespace/nsdump.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsdump.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsdumpdv.c b/drivers/acpi/namespace/nsdumpdv.c --- a/drivers/acpi/namespace/nsdumpdv.c 2005-01-23 21:55:49 -08:00 +++ b/drivers/acpi/namespace/nsdumpdv.c 2005-01-23 21:55:49 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nseval.c b/drivers/acpi/namespace/nseval.c --- a/drivers/acpi/namespace/nseval.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nseval.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c --- a/drivers/acpi/namespace/nsinit.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsinit.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -420,6 +420,12 @@ status = AE_OK; } else { + /* Delete any return object (especially if implicit_return is enabled) */ + + if (pinfo.return_object) { + acpi_ut_remove_reference (pinfo.return_object); + } + /* Count of successful INIs */ info->num_INI++; diff -Nru a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c --- a/drivers/acpi/namespace/nsload.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsload.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsnames.c b/drivers/acpi/namespace/nsnames.c --- a/drivers/acpi/namespace/nsnames.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsnames.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c --- a/drivers/acpi/namespace/nsobject.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsobject.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c --- a/drivers/acpi/namespace/nsparse.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsparse.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c --- a/drivers/acpi/namespace/nssearch.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nssearch.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c --- a/drivers/acpi/namespace/nsutils.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsutils.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nswalk.c b/drivers/acpi/namespace/nswalk.c --- a/drivers/acpi/namespace/nswalk.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nswalk.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c --- a/drivers/acpi/namespace/nsxfeval.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsxfeval.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsxfname.c b/drivers/acpi/namespace/nsxfname.c --- a/drivers/acpi/namespace/nsxfname.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/namespace/nsxfname.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/namespace/nsxfobj.c b/drivers/acpi/namespace/nsxfobj.c --- a/drivers/acpi/namespace/nsxfobj.c 2005-01-23 21:55:49 -08:00 +++ b/drivers/acpi/namespace/nsxfobj.c 2005-01-23 21:55:49 -08:00 @@ -6,7 +6,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/psargs.c b/drivers/acpi/parser/psargs.c --- a/drivers/acpi/parser/psargs.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/psargs.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/psopcode.c b/drivers/acpi/parser/psopcode.c --- a/drivers/acpi/parser/psopcode.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/psopcode.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -322,7 +322,7 @@ #define ARGI_SLEEP_OP ARGI_LIST1 (ARGI_INTEGER) #define ARGI_STALL_OP ARGI_LIST1 (ARGI_INTEGER) #define ARGI_STATICSTRING_OP ARGI_INVALID_OPCODE -#define ARGI_STORE_OP ARGI_LIST2 (ARGI_ANYTYPE, ARGI_TARGETREF) +#define ARGI_STORE_OP ARGI_LIST2 (ARGI_DATAREFOBJ, ARGI_TARGETREF) #define ARGI_STRING_OP ARGI_INVALID_OPCODE #define ARGI_SUBTRACT_OP ARGI_LIST3 (ARGI_INTEGER, ARGI_INTEGER, ARGI_TARGETREF) #define ARGI_THERMAL_ZONE_OP ARGI_INVALID_OPCODE diff -Nru a/drivers/acpi/parser/psparse.c b/drivers/acpi/parser/psparse.c --- a/drivers/acpi/parser/psparse.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/psparse.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/psscope.c b/drivers/acpi/parser/psscope.c --- a/drivers/acpi/parser/psscope.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/psscope.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/pstree.c b/drivers/acpi/parser/pstree.c --- a/drivers/acpi/parser/pstree.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/pstree.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c --- a/drivers/acpi/parser/psutils.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/psutils.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/pswalk.c b/drivers/acpi/parser/pswalk.c --- a/drivers/acpi/parser/pswalk.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/pswalk.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/parser/psxface.c b/drivers/acpi/parser/psxface.c --- a/drivers/acpi/parser/psxface.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/parser/psxface.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c --- a/drivers/acpi/processor_idle.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/processor_idle.c 2005-01-23 21:55:50 -08:00 @@ -60,6 +60,15 @@ static unsigned int nocst = 0; module_param(nocst, uint, 0000); +/* + * bm_history -- bit-mask with a bit per jiffy of bus-master activity + * 1000 HZ: 0xFFFFFFFF: 32 jiffies = 32ms + * 800 HZ: 0xFFFFFFFF: 32 jiffies = 40ms + * 100 HZ: 0x0000000F: 4 jiffies = 40ms + * reduce history for more aggressive entry into C3 + */ +static unsigned int bm_history = (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1)); +module_param(bm_history, uint, 0644); /* -------------------------------------------------------------------------- Power Management -------------------------------------------------------------------------- */ @@ -193,8 +202,18 @@ */ if (pr->flags.bm_check) { u32 bm_status = 0; + unsigned long diff = jiffies - pr->power.bm_check_timestamp; + + if (diff > 32) + diff = 32; - pr->power.bm_activity <<= 1; + while (diff) { + /* if we didn't get called, assume there was busmaster activity */ + diff--; + if (diff) + pr->power.bm_activity |= 0x1; + pr->power.bm_activity <<= 1; + } acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status, ACPI_MTX_DO_NOT_LOCK); @@ -213,6 +232,9 @@ || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01)) pr->power.bm_activity++; } + + pr->power.bm_check_timestamp = jiffies; + /* * Apply bus mastering demotion policy. Automatically demote * to avoid a faulty transition. Note that the processor @@ -425,7 +447,7 @@ cx->demotion.threshold.ticks = cx->latency_ticks; cx->demotion.threshold.count = 1; if (cx->type == ACPI_STATE_C3) - cx->demotion.threshold.bm = 0x0F; + cx->demotion.threshold.bm = bm_history; } lower = cx; @@ -445,7 +467,7 @@ else cx->promotion.threshold.count = 10; if (higher->type == ACPI_STATE_C3) - cx->promotion.threshold.bm = 0x0F; + cx->promotion.threshold.bm = bm_history; } higher = cx; diff -Nru a/drivers/acpi/resources/rsaddr.c b/drivers/acpi/resources/rsaddr.c --- a/drivers/acpi/resources/rsaddr.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsaddr.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c --- a/drivers/acpi/resources/rscalc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rscalc.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c --- a/drivers/acpi/resources/rscreate.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rscreate.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rsdump.c b/drivers/acpi/resources/rsdump.c --- a/drivers/acpi/resources/rsdump.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsdump.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rsio.c b/drivers/acpi/resources/rsio.c --- a/drivers/acpi/resources/rsio.c 2005-01-23 21:55:49 -08:00 +++ b/drivers/acpi/resources/rsio.c 2005-01-23 21:55:49 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rsirq.c b/drivers/acpi/resources/rsirq.c --- a/drivers/acpi/resources/rsirq.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsirq.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rslist.c b/drivers/acpi/resources/rslist.c --- a/drivers/acpi/resources/rslist.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rslist.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rsmemory.c b/drivers/acpi/resources/rsmemory.c --- a/drivers/acpi/resources/rsmemory.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsmemory.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c --- a/drivers/acpi/resources/rsmisc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsmisc.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c --- a/drivers/acpi/resources/rsutils.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsutils.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -339,6 +339,13 @@ * Execute the method, no return value */ status = acpi_ns_evaluate_relative ("_SRS", &info); + if (ACPI_SUCCESS (status)) { + /* Delete any return object (especially if implicit_return is enabled) */ + + if (info.return_object) { + acpi_ut_remove_reference (info.return_object); + } + } /* * Clean up and return the status from acpi_ns_evaluate_relative diff -Nru a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c --- a/drivers/acpi/resources/rsxface.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/resources/rsxface.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbconvrt.c b/drivers/acpi/tables/tbconvrt.c --- a/drivers/acpi/tables/tbconvrt.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbconvrt.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbget.c b/drivers/acpi/tables/tbget.c --- a/drivers/acpi/tables/tbget.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbget.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbgetall.c b/drivers/acpi/tables/tbgetall.c --- a/drivers/acpi/tables/tbgetall.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbgetall.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c --- a/drivers/acpi/tables/tbinstal.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbinstal.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbrsdt.c b/drivers/acpi/tables/tbrsdt.c --- a/drivers/acpi/tables/tbrsdt.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbrsdt.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbutils.c b/drivers/acpi/tables/tbutils.c --- a/drivers/acpi/tables/tbutils.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbutils.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbxface.c b/drivers/acpi/tables/tbxface.c --- a/drivers/acpi/tables/tbxface.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbxface.c 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/tables/tbxfroot.c b/drivers/acpi/tables/tbxfroot.c --- a/drivers/acpi/tables/tbxfroot.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/tables/tbxfroot.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -114,8 +114,10 @@ /* Check oem_id and oem_table_id */ - if ((oem_id[0] && ACPI_STRCMP (oem_id, table->oem_id)) || - (oem_table_id[0] && ACPI_STRCMP (oem_table_id, table->oem_table_id))) { + if ((oem_id[0] && ACPI_STRNCMP ( + oem_id, table->oem_id, sizeof (table->oem_id))) || + (oem_table_id[0] && ACPI_STRNCMP ( + oem_table_id, table->oem_table_id, sizeof (table->oem_table_id)))) { return_ACPI_STATUS (AE_AML_NAME_NOT_FOUND); } @@ -358,7 +360,8 @@ status = acpi_tb_find_rsdp (&table_info, flags); if (ACPI_FAILURE (status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "RSDP structure not found, %s Flags=%X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + "RSDP structure not found, %s Flags=%X\n", acpi_format_exception (status), flags)); return_ACPI_STATUS (AE_NO_ACPI_TABLES); } @@ -411,7 +414,7 @@ /* Signature matches, check the appropriate checksum */ - if (((struct rsdp_descriptor *) mem_rover)->revision < 2) { + if ((ACPI_CAST_PTR (struct rsdp_descriptor, mem_rover))->revision < 2) { /* ACPI version 1.0 */ checksum = acpi_tb_checksum (mem_rover, ACPI_RSDP_CHECKSUM_LENGTH); @@ -490,7 +493,8 @@ ACPI_EBDA_PTR_LENGTH, (void *) &table_ptr); if (ACPI_FAILURE (status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X for length %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + "Could not map memory at %8.8X for length %X\n", ACPI_EBDA_PTR_LOCATION, ACPI_EBDA_PTR_LENGTH)); return_ACPI_STATUS (status); } @@ -509,7 +513,8 @@ ACPI_EBDA_WINDOW_SIZE, (void *) &table_ptr); if (ACPI_FAILURE (status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X for length %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + "Could not map memory at %8.8X for length %X\n", physical_address, ACPI_EBDA_WINDOW_SIZE)); return_ACPI_STATUS (status); } @@ -534,7 +539,8 @@ ACPI_HI_RSDP_WINDOW_SIZE, (void *) &table_ptr); if (ACPI_FAILURE (status)) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X for length %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, + "Could not map memory at %8.8X for length %X\n", ACPI_HI_RSDP_WINDOW_BASE, ACPI_HI_RSDP_WINDOW_SIZE)); return_ACPI_STATUS (status); } diff -Nru a/drivers/acpi/utilities/utalloc.c b/drivers/acpi/utilities/utalloc.c --- a/drivers/acpi/utilities/utalloc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utalloc.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utcopy.c b/drivers/acpi/utilities/utcopy.c --- a/drivers/acpi/utilities/utcopy.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utcopy.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c --- a/drivers/acpi/utilities/utdebug.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utdebug.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utdelete.c b/drivers/acpi/utilities/utdelete.c --- a/drivers/acpi/utilities/utdelete.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utdelete.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c --- a/drivers/acpi/utilities/uteval.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/uteval.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -198,6 +198,17 @@ break; } + if ((acpi_gbl_enable_interpreter_slack) && + (!expected_return_btypes)) { + /* + * We received a return object, but one was not expected. This can + * happen frequently if the "implicit return" feature is enabled. + * Just delete the return object and return AE_OK. + */ + acpi_ut_remove_reference (info.return_object); + return_ACPI_STATUS (AE_OK); + } + /* Is the return object one of the expected types? */ if (!(expected_return_btypes & return_btype)) { @@ -205,8 +216,9 @@ prefix_node, path, AE_TYPE); ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Type returned from %s was incorrect: %X\n", - path, ACPI_GET_OBJECT_TYPE (info.return_object))); + "Type returned from %s was incorrect: %s, expected Btypes: %X\n", + path, acpi_ut_get_object_type_name (info.return_object), + expected_return_btypes)); /* On error exit, we must delete the return object */ diff -Nru a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c --- a/drivers/acpi/utilities/utglobal.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utglobal.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -219,6 +219,8 @@ * NOTES: * 1) _SB_ is defined to be a device to allow \_SB_._INI to be run * during the initialization sequence. + * 2) _TZ_ is defined to be a thermal zone in order to allow ASL code to + * perform a Notify() operation on it. */ const struct acpi_predefined_names acpi_gbl_pre_defined_names[] = { {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL}, @@ -226,12 +228,12 @@ {"_SB_", ACPI_TYPE_DEVICE, NULL}, {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL}, {"_TZ_", ACPI_TYPE_THERMAL, NULL}, - {"_REV", ACPI_TYPE_INTEGER, "2"}, + {"_REV", ACPI_TYPE_INTEGER, (char *) ACPI_CA_SUPPORT_LEVEL}, {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, - {"_GL_", ACPI_TYPE_MUTEX, "0"}, + {"_GL_", ACPI_TYPE_MUTEX, (char *) 0}, #if !defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) - {"_OSI", ACPI_TYPE_METHOD, "1"}, + {"_OSI", ACPI_TYPE_METHOD, (char *) 1}, #endif {NULL, ACPI_TYPE_ANY, NULL} /* Table terminator */ }; diff -Nru a/drivers/acpi/utilities/utinit.c b/drivers/acpi/utilities/utinit.c --- a/drivers/acpi/utilities/utinit.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utinit.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c --- a/drivers/acpi/utilities/utmath.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utmath.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c --- a/drivers/acpi/utilities/utmisc.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utmisc.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c --- a/drivers/acpi/utilities/utobject.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utobject.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c --- a/drivers/acpi/utilities/utxface.c 2005-01-23 21:55:50 -08:00 +++ b/drivers/acpi/utilities/utxface.c 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acconfig.h b/include/acpi/acconfig.h --- a/include/acpi/acconfig.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acconfig.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -64,7 +64,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20041210 +#define ACPI_CA_VERSION 0x20050114 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, diff -Nru a/include/acpi/acdebug.h b/include/acpi/acdebug.h --- a/include/acpi/acdebug.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acdebug.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acdisasm.h b/include/acpi/acdisasm.h --- a/include/acpi/acdisasm.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acdisasm.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acdispat.h b/include/acpi/acdispat.h --- a/include/acpi/acdispat.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acdispat.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acevents.h b/include/acpi/acevents.h --- a/include/acpi/acevents.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acevents.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acexcep.h b/include/acpi/acexcep.h --- a/include/acpi/acexcep.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acexcep.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acglobal.h b/include/acpi/acglobal.h --- a/include/acpi/acglobal.h 2005-01-23 21:55:49 -08:00 +++ b/include/acpi/acglobal.h 2005-01-23 21:55:49 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -96,6 +96,7 @@ * 1) Allow "implicit return" of last value in a control method * 2) Allow access beyond end of operation region * 3) Allow access to uninitialized locals/args (auto-init to integer 0) + * 4) Allow ANY object type to be a source operand for the Store() operator */ ACPI_EXTERN u8 ACPI_INIT_GLOBAL (acpi_gbl_enable_interpreter_slack, FALSE); diff -Nru a/include/acpi/achware.h b/include/acpi/achware.h --- a/include/acpi/achware.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/achware.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acinterp.h b/include/acpi/acinterp.h --- a/include/acpi/acinterp.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acinterp.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/aclocal.h b/include/acpi/aclocal.h --- a/include/acpi/aclocal.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/aclocal.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acmacros.h b/include/acpi/acmacros.h --- a/include/acpi/acmacros.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acmacros.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h --- a/include/acpi/acnamesp.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acnamesp.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acobject.h b/include/acpi/acobject.h --- a/include/acpi/acobject.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acobject.h 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acoutput.h b/include/acpi/acoutput.h --- a/include/acpi/acoutput.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acoutput.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acparser.h b/include/acpi/acparser.h --- a/include/acpi/acparser.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acparser.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acpi.h b/include/acpi/acpi.h --- a/include/acpi/acpi.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acpi.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h --- a/include/acpi/acpiosxf.h 2005-01-23 21:55:49 -08:00 +++ b/include/acpi/acpiosxf.h 2005-01-23 21:55:49 -08:00 @@ -9,7 +9,7 @@ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acpixf.h b/include/acpi/acpixf.h --- a/include/acpi/acpixf.h 2005-01-23 21:55:49 -08:00 +++ b/include/acpi/acpixf.h 2005-01-23 21:55:49 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acresrc.h b/include/acpi/acresrc.h --- a/include/acpi/acresrc.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acresrc.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acstruct.h b/include/acpi/acstruct.h --- a/include/acpi/acstruct.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/acstruct.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/actables.h b/include/acpi/actables.h --- a/include/acpi/actables.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/actables.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/actbl.h b/include/acpi/actbl.h --- a/include/acpi/actbl.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/actbl.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/actbl1.h b/include/acpi/actbl1.h --- a/include/acpi/actbl1.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/actbl1.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/actbl2.h b/include/acpi/actbl2.h --- a/include/acpi/actbl2.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/actbl2.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/actypes.h b/include/acpi/actypes.h --- a/include/acpi/actypes.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/actypes.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/acutils.h b/include/acpi/acutils.h --- a/include/acpi/acutils.h 2005-01-23 21:55:49 -08:00 +++ b/include/acpi/acutils.h 2005-01-23 21:55:49 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/amlcode.h b/include/acpi/amlcode.h --- a/include/acpi/amlcode.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/amlcode.h 2005-01-23 21:55:50 -08:00 @@ -7,7 +7,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -278,6 +278,7 @@ #define ARGI_COMPLEXOBJ 0x13 /* Buffer, String, or package (Used by INDEX op only) */ #define ARGI_REF_OR_STRING 0x14 /* Reference or String (Used by DEREFOF op only) */ #define ARGI_REGION_OR_FIELD 0x15 /* Used by LOAD op only */ +#define ARGI_DATAREFOBJ 0x16 /* Note: types above can expand to 0x1F maximum */ diff -Nru a/include/acpi/amlresrc.h b/include/acpi/amlresrc.h --- a/include/acpi/amlresrc.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/amlresrc.h 2005-01-23 21:55:50 -08:00 @@ -6,7 +6,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h --- a/include/acpi/platform/acenv.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/platform/acenv.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h --- a/include/acpi/platform/acgcc.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/platform/acgcc.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h --- a/include/acpi/platform/aclinux.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/platform/aclinux.h 2005-01-23 21:55:50 -08:00 @@ -5,7 +5,7 @@ *****************************************************************************/ /* - * Copyright (C) 2000 - 2004, R. Byron Moore + * Copyright (C) 2000 - 2005, R. Byron Moore * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff -Nru a/include/acpi/processor.h b/include/acpi/processor.h --- a/include/acpi/processor.h 2005-01-23 21:55:50 -08:00 +++ b/include/acpi/processor.h 2005-01-23 21:55:50 -08:00 @@ -54,6 +54,7 @@ struct acpi_processor_power { struct acpi_processor_cx *state; + unsigned long bm_check_timestamp; u32 default_state; u32 bm_activity; int count;