Apply our local patches. trunk
authorjruoho <jruoho@NetBSD.org>
Thu, 17 Feb 2011 07:21:14 +0000
branchtrunk
changeset 197955 41fb2526eddd
parent 197954 f7a4f8e5f53b
child 197956 5e424042a535
Apply our local patches.
sys/external/bsd/acpica/dist/common/dmtbinfo.c
sys/external/bsd/acpica/dist/compiler/aslcompile.c
sys/external/bsd/acpica/dist/compiler/aslutils.c
sys/external/bsd/acpica/dist/debugger/dbcmds.c
sys/external/bsd/acpica/dist/debugger/dbdisply.c
sys/external/bsd/acpica/dist/debugger/dbexec.c
sys/external/bsd/acpica/dist/debugger/dbinput.c
sys/external/bsd/acpica/dist/debugger/dbutils.c
sys/external/bsd/acpica/dist/disassembler/dmresrc.c
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
sys/external/bsd/acpica/dist/events/evrgnini.c
sys/external/bsd/acpica/dist/events/evxface.c
sys/external/bsd/acpica/dist/executer/exconfig.c
sys/external/bsd/acpica/dist/executer/exdebug.c
sys/external/bsd/acpica/dist/executer/exdump.c
sys/external/bsd/acpica/dist/include/acdebug.h
sys/external/bsd/acpica/dist/include/acdisasm.h
sys/external/bsd/acpica/dist/include/acglobal.h
sys/external/bsd/acpica/dist/include/acinterp.h
sys/external/bsd/acpica/dist/include/aclocal.h
sys/external/bsd/acpica/dist/include/acmacros.h
sys/external/bsd/acpica/dist/include/acnamesp.h
sys/external/bsd/acpica/dist/include/acpiosxf.h
sys/external/bsd/acpica/dist/include/acpixf.h
sys/external/bsd/acpica/dist/include/acresrc.h
sys/external/bsd/acpica/dist/include/actables.h
sys/external/bsd/acpica/dist/include/actbl1.h
sys/external/bsd/acpica/dist/include/actypes.h
sys/external/bsd/acpica/dist/include/acutils.h
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
sys/external/bsd/acpica/dist/namespace/nsaccess.c
sys/external/bsd/acpica/dist/namespace/nsdump.c
sys/external/bsd/acpica/dist/namespace/nseval.c
sys/external/bsd/acpica/dist/namespace/nsinit.c
sys/external/bsd/acpica/dist/namespace/nsrepair2.c
sys/external/bsd/acpica/dist/namespace/nsxfeval.c
sys/external/bsd/acpica/dist/namespace/nsxfname.c
sys/external/bsd/acpica/dist/parser/psopcode.c
sys/external/bsd/acpica/dist/resources/rsdump.c
sys/external/bsd/acpica/dist/resources/rsutils.c
sys/external/bsd/acpica/dist/resources/rsxface.c
sys/external/bsd/acpica/dist/tables/tbfadt.c
sys/external/bsd/acpica/dist/tables/tbutils.c
sys/external/bsd/acpica/dist/tables/tbxface.c
sys/external/bsd/acpica/dist/tables/tbxfroot.c
sys/external/bsd/acpica/dist/utilities/utcache.c
sys/external/bsd/acpica/dist/utilities/utdebug.c
sys/external/bsd/acpica/dist/utilities/uteval.c
sys/external/bsd/acpica/dist/utilities/utglobal.c
sys/external/bsd/acpica/dist/utilities/utmisc.c
sys/external/bsd/acpica/dist/utilities/uttrack.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c	Thu Feb 17 07:21:14 2011 +0000
@@ -1416,7 +1416,7 @@
     {ACPI_DMT_FLAG0,    ACPI_SRAT0_FLAG_OFFSET (Flags,0),           "Enabled", 0},
     {ACPI_DMT_UINT8,    ACPI_SRAT0_OFFSET (LocalSapicEid),          "Local Sapic EID", 0},
     {ACPI_DMT_UINT24,   ACPI_SRAT0_OFFSET (ProximityDomainHi[0]),   "Proximity Domain High(24)", 0},
-    {ACPI_DMT_UINT32,   ACPI_SRAT0_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT32,   ACPI_SRAT0_OFFSET (ClockDomain),            "Clock Domain", 0},
     ACPI_DMT_TERMINATOR
 };
 
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c	Thu Feb 17 07:21:14 2011 +0000
@@ -217,8 +217,8 @@
     /* Version, build date, copyright, compliance */
 
     FlPrintFile (FileId,
-        " version %X [%s]\n%s%s\n%s%s\n%s\n",
-        (UINT32) ACPI_CA_VERSION, __DATE__,
+        " version %X\n%s%s\n%s%s\n%s\n",
+        (UINT32) ACPI_CA_VERSION,
         Prefix, CompilerCopyright,
         Prefix, CompilerCompliance,
         Prefix);
--- a/sys/external/bsd/acpica/dist/compiler/aslutils.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslutils.c	Thu Feb 17 07:21:14 2011 +0000
@@ -521,8 +521,8 @@
     {
         /* Compiler name and version number */
 
-        FlPrintFile (FileId, "%s version %X [%s]\n",
-            CompilerId, (UINT32) ACPI_CA_VERSION, __DATE__);
+        FlPrintFile (FileId, "%s version %X\n",
+            CompilerId, (UINT32) ACPI_CA_VERSION);
     }
 
     if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA)
--- a/sys/external/bsd/acpica/dist/debugger/dbcmds.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbcmds.c	Thu Feb 17 07:21:14 2011 +0000
@@ -1786,7 +1786,7 @@
      * Perform comparison of original AML to newly created AML. This tests both
      * the AML->Resource conversion and the Resource->Aml conversion.
      */
-    Status = AcpiDmTestResourceConversion (Node, METHOD_NAME__CRS);
+    Status = AcpiDmTestResourceConversion (Node, __UNCONST(METHOD_NAME__CRS));
 
     /* Execute _SRS with the resource list */
 
--- a/sys/external/bsd/acpica/dist/debugger/dbdisply.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbdisply.c	Thu Feb 17 07:21:14 2011 +0000
@@ -816,7 +816,7 @@
     ACPI_GPE_XRUPT_INFO     *GpeXruptInfo;
     ACPI_GPE_EVENT_INFO     *GpeEventInfo;
     ACPI_GPE_REGISTER_INFO  *GpeRegisterInfo;
-    char                    *GpeType;
+    const char              *GpeType;
     UINT32                  GpeIndex;
     UINT32                  Block = 0;
     UINT32                  i;
--- a/sys/external/bsd/acpica/dist/debugger/dbexec.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbexec.c	Thu Feb 17 07:21:14 2011 +0000
@@ -237,7 +237,7 @@
 
                     Params[1].Type           = ACPI_TYPE_STRING;
                     Params[1].String.Length  = 12;
-                    Params[1].String.Pointer = "AML Debugger";
+                    Params[1].String.Pointer = __UNCONST("AML Debugger");
                     break;
 
                 default:
--- a/sys/external/bsd/acpica/dist/debugger/dbinput.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbinput.c	Thu Feb 17 07:21:14 2011 +0000
@@ -799,7 +799,7 @@
         break;
 
     case CMD_METHODS:
-        Status = AcpiDbDisplayObjects ("METHOD", AcpiGbl_DbArgs[1]);
+        Status = AcpiDbDisplayObjects (__UNCONST("METHOD"), AcpiGbl_DbArgs[1]);
         break;
 
     case CMD_NAMESPACE:
--- a/sys/external/bsd/acpica/dist/debugger/dbutils.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbutils.c	Thu Feb 17 07:21:14 2011 +0000
@@ -138,7 +138,7 @@
     UINT32                  Address);
 #endif
 
-static char                 *Converter = "0123456789ABCDEF";
+static const char           *Converter = "0123456789ABCDEF";
 
 
 /*******************************************************************************
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrc.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrc.c	Thu Feb 17 07:21:14 2011 +0000
@@ -222,7 +222,7 @@
 void
 AcpiDmDumpInteger8 (
     UINT8                   Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%2.2X,               // %s\n", Value, Name);
 }
@@ -230,7 +230,7 @@
 void
 AcpiDmDumpInteger16 (
     UINT16                  Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%4.4X,             // %s\n", Value, Name);
 }
@@ -238,7 +238,7 @@
 void
 AcpiDmDumpInteger32 (
     UINT32                  Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%8.8X,         // %s\n", Value, Name);
 }
@@ -246,7 +246,7 @@
 void
 AcpiDmDumpInteger64 (
     UINT64                  Value,
-    char                    *Name)
+    const char              *Name)
 {
     AcpiOsPrintf ("0x%8.8X%8.8X, // %s\n", ACPI_FORMAT_UINT64 (Value), Name);
 }
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c	Thu Feb 17 07:21:14 2011 +0000
@@ -127,7 +127,7 @@
 
 /* Common names for address and memory descriptors */
 
-static char                 *AcpiDmAddressNames[] =
+static const char           *AcpiDmAddressNames[] =
 {
     "Granularity",
     "Range Minimum",
@@ -136,7 +136,7 @@
     "Length"
 };
 
-static char                 *AcpiDmMemoryNames[] =
+static const char           *AcpiDmMemoryNames[] =
 {
     "Range Minimum",
     "Range Maximum",
@@ -1067,7 +1067,7 @@
 
 void
 AcpiDmVendorCommon (
-    char                    *Name,
+    const char              *Name,
     UINT8                   *ByteData,
     UINT32                  Length,
     UINT32                  Level)
--- a/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c	Thu Feb 17 07:21:14 2011 +0000
@@ -1564,7 +1564,7 @@
         /* Call to the OSL in case OS wants a piece of the action */
 
         Status = AcpiOsSignal (ACPI_SIGNAL_BREAKPOINT,
-                    "Executed AML Breakpoint opcode");
+                    __UNCONST("Executed AML Breakpoint opcode"));
         break;
 
 
--- a/sys/external/bsd/acpica/dist/events/evrgnini.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/events/evrgnini.c	Thu Feb 17 07:21:14 2011 +0000
@@ -638,7 +638,7 @@
     ACPI_NAMESPACE_NODE     *Node;
     ACPI_STATUS             Status;
     ACPI_NAMESPACE_NODE     *MethodNode;
-    ACPI_NAME               *RegNamePtr = (ACPI_NAME *) METHOD_NAME__REG;
+    ACPI_NAME               *RegNamePtr = (ACPI_NAME *) __UNCONST(METHOD_NAME__REG);
     ACPI_OPERAND_OBJECT     *RegionObj2;
 
 
--- a/sys/external/bsd/acpica/dist/events/evxface.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/events/evxface.c	Thu Feb 17 07:21:14 2011 +0000
@@ -749,6 +749,8 @@
 
     /* Disable the GPE before installing the handler */
 
+    if (GpeEventInfo->RuntimeCount)
+        GpeEventInfo->RuntimeCount--;
     Status = AcpiEvDisableGpe (GpeEventInfo);
     if (ACPI_FAILURE (Status))
     {
--- a/sys/external/bsd/acpica/dist/executer/exconfig.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exconfig.c	Thu Feb 17 07:21:14 2011 +0000
@@ -356,7 +356,7 @@
     Status = AcpiGetTableByIndex (TableIndex, &Table);
     if (ACPI_SUCCESS (Status))
     {
-        ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Dynamic OEM Table Load:"));
         AcpiTbPrintTableHeader (0, Table);
     }
 
@@ -652,7 +652,7 @@
         return_ACPI_STATUS (Status);
     }
 
-    ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
+    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Dynamic OEM Table Load:"));
     AcpiTbPrintTableHeader (0, TableDesc.Pointer);
 
     /* Remove the reference by added by AcpiExStore above */
--- a/sys/external/bsd/acpica/dist/executer/exdebug.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exdebug.c	Thu Feb 17 07:21:14 2011 +0000
@@ -140,10 +140,9 @@
  *
  * This function is not compiled if ACPI_NO_ERROR_MESSAGES is set.
  *
- * This function is only enabled if AcpiGbl_EnableAmlDebugObject is set, or
- * if ACPI_LV_DEBUG_OBJECT is set in the AcpiDbgLevel. Thus, in the normal
- * operational case, stores to the debug object are ignored but can be easily
- * enabled if necessary.
+ * This function is only enabled if AcpiGbl_EnableAmlDebugObject is set.
+ * Thus, in the normal operational case, stores to the debug object are
+ * ignored but can be easily enabled if necessary.
  *
  ******************************************************************************/
 
@@ -159,10 +158,9 @@
     ACPI_FUNCTION_TRACE_PTR (ExDoDebugObject, SourceDesc);
 
 
-    /* Output must be enabled via the DebugObject global or the DbgLevel */
+    /* Output must be enabled via the DebugObject global */
 
-    if (!AcpiGbl_EnableAmlDebugObject &&
-        !(AcpiDbgLevel & ACPI_LV_DEBUG_OBJECT))
+    if (!AcpiGbl_EnableAmlDebugObject)
     {
         return_VOID;
     }
--- a/sys/external/bsd/acpica/dist/executer/exdump.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exdump.c	Thu Feb 17 07:21:14 2011 +0000
@@ -134,12 +134,12 @@
 
 static void
 AcpiExOutString (
-    char                    *Title,
-    char                    *Value);
+    const char              *Title,
+    const char              *Value);
 
 static void
 AcpiExOutPointer (
-    char                    *Title,
+    const char              *Title,
     void                    *Value);
 
 static void
@@ -441,7 +441,7 @@
     while (Count)
     {
         Target = ACPI_ADD_PTR (UINT8, ObjDesc, Info->Offset);
-        Name = Info->Name;
+        Name = __UNCONST(Info->Name);
 
         switch (Info->Opcode)
         {
@@ -902,15 +902,15 @@
 
 static void
 AcpiExOutString (
-    char                    *Title,
-    char                    *Value)
+    const char              *Title,
+    const char              *Value)
 {
     AcpiOsPrintf ("%20s : %s\n", Title, Value);
 }
 
 static void
 AcpiExOutPointer (
-    char                    *Title,
+    const char              *Title,
     void                    *Value)
 {
     AcpiOsPrintf ("%20s : %p\n", Title, Value);
--- a/sys/external/bsd/acpica/dist/include/acdebug.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acdebug.h	Thu Feb 17 07:21:14 2011 +0000
@@ -121,14 +121,14 @@
 
 typedef struct CommandInfo
 {
-    char                    *Name;          /* Command Name */
+    const char              *Name;          /* Command Name */
     UINT8                   MinArgs;        /* Minimum arguments required */
 
 } COMMAND_INFO;
 
 typedef struct ArgumentInfo
 {
-    char                    *Name;          /* Argument Name */
+    const char              *Name;          /* Argument Name */
 
 } ARGUMENT_INFO;
 
--- a/sys/external/bsd/acpica/dist/include/acdisasm.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acdisasm.h	Thu Feb 17 07:21:14 2011 +0000
@@ -123,7 +123,7 @@
 #define BLOCK_PAREN             1
 #define BLOCK_BRACE             2
 #define BLOCK_COMMA_LIST        4
-#define ACPI_DEFAULT_RESNAME    *(UINT32 *) "__RD"
+#define ACPI_DEFAULT_RESNAME    *(const UINT32 *) "__RD"
 
 
 typedef const struct acpi_dmtable_info
@@ -598,22 +598,22 @@
 void
 AcpiDmDumpInteger8 (
     UINT8                   Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmDumpInteger16 (
     UINT16                  Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmDumpInteger32 (
     UINT32                  Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmDumpInteger64 (
     UINT64                  Value,
-    char                    *Name);
+    const char              *Name);
 
 void
 AcpiDmResourceTemplate (
@@ -700,7 +700,7 @@
 
 void
 AcpiDmVendorCommon (
-    char                    *Name,
+    const char              *Name,
     UINT8                   *ByteData,
     UINT32                  Length,
     UINT32                  Level);
--- a/sys/external/bsd/acpica/dist/include/acglobal.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acglobal.h	Thu Feb 17 07:21:14 2011 +0000
@@ -447,10 +447,10 @@
 
 /* Event counters */
 
-ACPI_EXTERN UINT32                      AcpiMethodCount;
-ACPI_EXTERN UINT32                      AcpiGpeCount;
-ACPI_EXTERN UINT32                      AcpiSciCount;
-ACPI_EXTERN UINT32                      AcpiFixedEventCount[ACPI_NUM_FIXED_EVENTS];
+ACPI_EXTERN UINT64                      AcpiMethodCount;
+ACPI_EXTERN UINT64                      AcpiGpeCount;
+ACPI_EXTERN UINT64                      AcpiSciCount;
+ACPI_EXTERN UINT64                      AcpiFixedEventCount[ACPI_NUM_FIXED_EVENTS];
 
 /* Support for dynamic control method tracing mechanism */
 
--- a/sys/external/bsd/acpica/dist/include/acinterp.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acinterp.h	Thu Feb 17 07:21:14 2011 +0000
@@ -141,7 +141,7 @@
 {
     UINT8                   Opcode;
     UINT8                   Offset;
-    char                    *Name;
+    const char              *Name;
 
 } ACPI_EXDUMP_INFO;
 
--- a/sys/external/bsd/acpica/dist/include/aclocal.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/aclocal.h	Thu Feb 17 07:21:14 2011 +0000
@@ -170,7 +170,7 @@
 
 /* Debug names for the mutexes above */
 
-static char                 *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
+static const char           *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
 {
     "ACPI_MTX_Interpreter",
     "ACPI_MTX_Namespace",
@@ -848,7 +848,7 @@
 typedef struct acpi_opcode_info
 {
 #if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
-    char                            *Name;          /* Opcode name (disassembler/debug only) */
+    const char                      *Name;          /* Opcode name (disassembler/debug only) */
 #endif
     UINT32                          ParseArgs;      /* Grammar/Parse time arguments */
     UINT32                          RuntimeArgs;    /* Interpret time arguments */
@@ -1143,14 +1143,14 @@
 
 typedef struct acpi_interface_info
 {
-    char                    *Name;
+    const char              *Name;
     UINT8                   Value;
 
 } ACPI_INTERFACE_INFO;
 
 typedef struct acpi_port_info
 {
-    char                    *Name;
+    const char              *Name;
     UINT16                  Start;
     UINT16                  End;
     UINT8                   OsiDependency;
--- a/sys/external/bsd/acpica/dist/include/acmacros.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acmacros.h	Thu Feb 17 07:21:14 2011 +0000
@@ -162,31 +162,31 @@
                                                      /*  Hi...Lo                     Lo...Hi     */
 /* 16-bit source, 16/32/64 destination */
 
-#define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[1];\
-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[0];}
+#define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((const UINT8 *)(const void *)(s))[1];\
+                                         ((  UINT8 *)(void *)(d))[1] = ((const UINT8 *)(const void *)(s))[0];}
 
 #define ACPI_MOVE_16_TO_32(d, s)        {(*(UINT32 *)(void *)(d))=0;\
-                                           ((UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
-                                           ((UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
+                                           ((UINT8 *)(void *)(d))[2] = ((const UINT8 *)(const void *)(s))[1];\
+                                           ((UINT8 *)(void *)(d))[3] = ((const UINT8 *)(const void *)(s))[0];}
 
 #define ACPI_MOVE_16_TO_64(d, s)        {(*(UINT64 *)(void *)(d))=0;\
-                                           ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                           ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
+                                           ((UINT8 *)(void *)(d))[6] = ((const UINT8 *)(const void *)(s))[1];\
+                                           ((UINT8 *)(void *)(d))[7] = ((const UINT8 *)(const void *)(s))[0];}
 
 /* 32-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
 
-#define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\
-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\
-                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[1];\
-                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[0];}
+#define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((const UINT8 *)(const void *)(s))[3];\
+                                         ((  UINT8 *)(void *)(d))[1] = ((const UINT8 *)(const void *)(s))[2];\
+                                         ((  UINT8 *)(void *)(d))[2] = ((const UINT8 *)(const void *)(s))[1];\
+                                         ((  UINT8 *)(void *)(d))[3] = ((const UINT8 *)(const void *)(s))[0];}
 
 #define ACPI_MOVE_32_TO_64(d, s)        {(*(UINT64 *)(void *)(d))=0;\
-                                           ((UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
-                                           ((UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
-                                           ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                           ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
+                                           ((UINT8 *)(void *)(d))[4] = ((const UINT8 *)(const void *)(s))[3];\
+                                           ((UINT8 *)(void *)(d))[5] = ((const UINT8 *)(const void *)(s))[2];\
+                                           ((UINT8 *)(void *)(d))[6] = ((const UINT8 *)(const void *)(s))[1];\
+                                           ((UINT8 *)(void *)(d))[7] = ((const UINT8 *)(const void *)(s))[0];}
 
 /* 64-bit source, 16/32/64 destination */
 
@@ -194,14 +194,14 @@
 
 #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
 
-#define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\
-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\
-                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[5];\
-                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[4];\
-                                         ((  UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[3];\
-                                         ((  UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[2];\
-                                         ((  UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
-                                         ((  UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
+#define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((const UINT8 *)(const void *)(s))[7];\
+                                         ((  UINT8 *)(void *)(d))[1] = ((const UINT8 *)(const void *)(s))[6];\
+                                         ((  UINT8 *)(void *)(d))[2] = ((const UINT8 *)(const void *)(s))[5];\
+                                         ((  UINT8 *)(void *)(d))[3] = ((const UINT8 *)(const void *)(s))[4];\
+                                         ((  UINT8 *)(void *)(d))[4] = ((const UINT8 *)(const void *)(s))[3];\
+                                         ((  UINT8 *)(void *)(d))[5] = ((const UINT8 *)(const void *)(s))[2];\
+                                         ((  UINT8 *)(void *)(d))[6] = ((const UINT8 *)(const void *)(s))[1];\
+                                         ((  UINT8 *)(void *)(d))[7] = ((const UINT8 *)(const void *)(s))[0];}
 #else
 /*
  * Macros for little-endian machines
@@ -213,21 +213,21 @@
 
 /* 16-bit source, 16/32/64 destination */
 
-#define ACPI_MOVE_16_TO_16(d, s)        *(UINT16 *)(void *)(d) = *(UINT16 *)(void *)(s)
-#define ACPI_MOVE_16_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(UINT16 *)(void *)(s)
-#define ACPI_MOVE_16_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT16 *)(void *)(s)
+#define ACPI_MOVE_16_TO_16(d, s)        *(UINT16 *)(void *)(d) = *(const UINT16 *)(const void *)(s)
+#define ACPI_MOVE_16_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(const UINT16 *)(const void *)(s)
+#define ACPI_MOVE_16_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(const UINT16 *)(const void *)(s)
 
 /* 32-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
-#define ACPI_MOVE_32_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s)
-#define ACPI_MOVE_32_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s)
+#define ACPI_MOVE_32_TO_32(d, s)        *(UINT32 *)(void *)(d) = *(const UINT32 *)(const void *)(s)
+#define ACPI_MOVE_32_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(const UINT32 *)(const void *)(s)
 
 /* 64-bit source, 16/32/64 destination */
 
 #define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
 #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
-#define ACPI_MOVE_64_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(UINT64 *)(void *)(s)
+#define ACPI_MOVE_64_TO_64(d, s)        *(UINT64 *)(void *)(d) = *(const UINT64 *)(const void *)(s)
 
 #else
 /*
@@ -238,8 +238,8 @@
 
 /* 16-bit source, 16/32/64 destination */
 
-#define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];}
+#define ACPI_MOVE_16_TO_16(d, s)        {((  UINT8 *)(void *)(d))[0] = ((const UINT8 *)(const void *)(s))[0];\
+                                         ((  UINT8 *)(void *)(d))[1] = ((const UINT8 *)(const void *)(s))[1];}
 
 #define ACPI_MOVE_16_TO_32(d, s)        {(*(UINT32 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
 #define ACPI_MOVE_16_TO_64(d, s)        {(*(UINT64 *)(void *)(d)) = 0; ACPI_MOVE_16_TO_16(d, s);}
@@ -248,10 +248,10 @@
 
 #define ACPI_MOVE_32_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
 
-#define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];\
-                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[2];\
-                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[3];}
+#define ACPI_MOVE_32_TO_32(d, s)        {((  UINT8 *)(void *)(d))[0] = ((const UINT8 *)(const void *)(s))[0];\
+                                         ((  UINT8 *)(void *)(d))[1] = ((const UINT8 *)(const void *)(s))[1];\
+                                         ((  UINT8 *)(void *)(d))[2] = ((const UINT8 *)(const void *)(s))[2];\
+                                         ((  UINT8 *)(void *)(d))[3] = ((const UINT8 *)(const void *)(s))[3];}
 
 #define ACPI_MOVE_32_TO_64(d, s)        {(*(UINT64 *)(void *)(d)) = 0; ACPI_MOVE_32_TO_32(d, s);}
 
@@ -259,14 +259,14 @@
 
 #define ACPI_MOVE_64_TO_16(d, s)        ACPI_MOVE_16_TO_16(d, s)    /* Truncate to 16 */
 #define ACPI_MOVE_64_TO_32(d, s)        ACPI_MOVE_32_TO_32(d, s)    /* Truncate to 32 */
-#define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[0];\
-                                         ((  UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[1];\
-                                         ((  UINT8 *)(void *)(d))[2] = ((UINT8 *)(void *)(s))[2];\
-                                         ((  UINT8 *)(void *)(d))[3] = ((UINT8 *)(void *)(s))[3];\
-                                         ((  UINT8 *)(void *)(d))[4] = ((UINT8 *)(void *)(s))[4];\
-                                         ((  UINT8 *)(void *)(d))[5] = ((UINT8 *)(void *)(s))[5];\
-                                         ((  UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[6];\
-                                         ((  UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[7];}
+#define ACPI_MOVE_64_TO_64(d, s)        {((  UINT8 *)(void *)(d))[0] = ((const UINT8 *)(const void *)(s))[0];\
+                                         ((  UINT8 *)(void *)(d))[1] = ((const UINT8 *)(const void *)(s))[1];\
+                                         ((  UINT8 *)(void *)(d))[2] = ((const UINT8 *)(const void *)(s))[2];\
+                                         ((  UINT8 *)(void *)(d))[3] = ((const UINT8 *)(const void *)(s))[3];\
+                                         ((  UINT8 *)(void *)(d))[4] = ((const UINT8 *)(const void *)(s))[4];\
+                                         ((  UINT8 *)(void *)(d))[5] = ((const UINT8 *)(const void *)(s))[5];\
+                                         ((  UINT8 *)(void *)(d))[6] = ((const UINT8 *)(const void *)(s))[6];\
+                                         ((  UINT8 *)(void *)(d))[7] = ((const UINT8 *)(const void *)(s))[7];}
 #endif
 #endif
 
--- a/sys/external/bsd/acpica/dist/include/acnamesp.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acnamesp.h	Thu Feb 17 07:21:14 2011 +0000
@@ -291,7 +291,7 @@
 void
 AcpiNsDumpPathname (
     ACPI_HANDLE             Handle,
-    char                    *Msg,
+    const char              *Msg,
     UINT32                  Level,
     UINT32                  Component);
 
--- a/sys/external/bsd/acpica/dist/include/acpiosxf.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acpiosxf.h	Thu Feb 17 07:21:14 2011 +0000
@@ -289,7 +289,7 @@
  */
 ACPI_STATUS
 AcpiOsCreateCache (
-    char                    *CacheName,
+    const char              *CacheName,
     UINT16                  ObjectSize,
     UINT16                  MaxDepth,
     ACPI_CACHE_T            **ReturnCache);
--- a/sys/external/bsd/acpica/dist/include/acpixf.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acpixf.h	Thu Feb 17 07:21:14 2011 +0000
@@ -237,13 +237,13 @@
 
 ACPI_STATUS
 AcpiGetTableHeader (
-    ACPI_STRING             Signature,
+    ACPI_CONST_STRING       Signature,
     UINT32                  Instance,
     ACPI_TABLE_HEADER       *OutTableHeader);
 
 ACPI_STATUS
 AcpiGetTable (
-    ACPI_STRING             Signature,
+    ACPI_CONST_STRING       Signature,
     UINT32                  Instance,
     ACPI_TABLE_HEADER       **OutTable);
 
@@ -291,7 +291,7 @@
 ACPI_STATUS
 AcpiGetHandle (
     ACPI_HANDLE             Parent,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_HANDLE             *RetHandle);
 
 ACPI_STATUS
@@ -325,14 +325,14 @@
 ACPI_STATUS
 AcpiEvaluateObject (
     ACPI_HANDLE             Object,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ParameterObjects,
     ACPI_BUFFER             *ReturnObjectBuffer);
 
 ACPI_STATUS
 AcpiEvaluateObjectTyped (
     ACPI_HANDLE             Object,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer,
     ACPI_OBJECT_TYPE        ReturnType);
@@ -546,7 +546,7 @@
 ACPI_STATUS
 AcpiWalkResources (
     ACPI_HANDLE                 Device,
-    char                        *Name,
+    const char                  *Name,
     ACPI_WALK_RESOURCE_CALLBACK UserFunction,
     void                        *Context);
 
--- a/sys/external/bsd/acpica/dist/include/acresrc.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acresrc.h	Thu Feb 17 07:21:14 2011 +0000
@@ -186,8 +186,8 @@
 {
     UINT8                   Opcode;
     UINT8                   Offset;
-    char                    *Name;
-    const char              **Pointer;
+    const char              *Name;
+    const char * const      *Pointer;
 
 } ACPI_RSDUMP_INFO;
 
--- a/sys/external/bsd/acpica/dist/include/actables.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/actables.h	Thu Feb 17 07:21:14 2011 +0000
@@ -241,7 +241,7 @@
 void
 AcpiTbInstallTable (
     ACPI_PHYSICAL_ADDRESS   Address,
-    char                    *Signature,
+    const char              *Signature,
     UINT32                  TableIndex);
 
 ACPI_STATUS
--- a/sys/external/bsd/acpica/dist/include/actbl1.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/actbl1.h	Thu Feb 17 07:21:14 2011 +0000
@@ -1088,7 +1088,7 @@
     UINT32                  Flags;
     UINT8                   LocalSapicEid;
     UINT8                   ProximityDomainHi[3];
-    UINT32                  Reserved;           /* Reserved, must be zero */
+    UINT32                  ClockDomain;
 
 } ACPI_SRAT_CPU_AFFINITY;
 
--- a/sys/external/bsd/acpica/dist/include/actypes.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/actypes.h	Thu Feb 17 07:21:14 2011 +0000
@@ -447,6 +447,7 @@
 typedef UINT32                          ACPI_STATUS;    /* All ACPI Exceptions */
 typedef UINT32                          ACPI_NAME;      /* 4-byte ACPI name */
 typedef char *                          ACPI_STRING;    /* Null terminated ASCII string */
+typedef const char *                    ACPI_CONST_STRING;    /* Null terminated ASCII string */
 typedef void *                          ACPI_HANDLE;    /* Actually a ptr to a NS Node */
 
 
@@ -965,9 +966,9 @@
  */
 typedef struct acpi_predefined_names
 {
-    char                            *Name;
+    const char                      *Name;
     UINT8                           Type;
-    char                            *Val;
+    const char                      *Val;
 
 } ACPI_PREDEFINED_NAMES;
 
--- a/sys/external/bsd/acpica/dist/include/acutils.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acutils.h	Thu Feb 17 07:21:14 2011 +0000
@@ -195,7 +195,7 @@
 
 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
 
-char *
+const char *
 AcpiUtGetMutexName (
     UINT32                  MutexId);
 
@@ -213,7 +213,7 @@
 AcpiUtGetNodeName (
     void                    *Object);
 
-char *
+const char *
 AcpiUtGetDescriptorName (
     void                    *Object);
 
@@ -542,13 +542,13 @@
 ACPI_STATUS
 AcpiUtEvaluateObject (
     ACPI_NAMESPACE_NODE     *PrefixNode,
-    char                    *Path,
+    const char              *Path,
     UINT32                  ExpectedReturnBtypes,
     ACPI_OPERAND_OBJECT     **ReturnDesc);
 
 ACPI_STATUS
 AcpiUtEvaluateNumericObject (
-    char                    *ObjectName,
+    const char              *ObjectName,
     ACPI_NAMESPACE_NODE     *DeviceNode,
     UINT64                  *Value);
 
@@ -825,7 +825,7 @@
 AcpiUtDisplayInitPathname (
     UINT8                   Type,
     ACPI_NAMESPACE_NODE     *ObjHandle,
-    char                    *Path);
+    const char              *Path);
 #endif
 
 
@@ -953,7 +953,7 @@
 
 ACPI_STATUS
 AcpiUtCreateList (
-    char                    *ListName,
+    const char              *ListName,
     UINT16                  ObjectSize,
     ACPI_MEMORY_LIST        **ReturnCache);
 
--- a/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h	Thu Feb 17 07:21:14 2011 +0000
@@ -1,6 +1,7 @@
 /******************************************************************************
  *
  * Name: acnetbsd.h - OS specific defines, etc.
+ *       $Revision: 1.2 $
  *
  *****************************************************************************/
 
@@ -120,6 +121,10 @@
 
 #include "acgcc.h"
 
+#define ACPI_THREAD_ID		uintptr_t
+#define ACPI_UINTPTR_T		uintptr_t
+#define ACPI_USE_LOCAL_CACHE
+
 #ifdef _LP64
 #define ACPI_MACHINE_WIDTH      64
 #else
@@ -129,26 +134,51 @@
 #define COMPILER_DEPENDENT_INT64  int64_t
 #define COMPILER_DEPENDENT_UINT64 uint64_t
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_STANDALONE)
+#ifdef _KERNEL_OPT
 #include "opt_acpi.h"           /* collect build-time options here */
+#endif /* _KERNEL */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <machine/stdarg.h>
-#include <machine/acpi_func.h>
+#include <dev/acpi/acpica/acpi_func.h>
 
 #define asm         __asm
 
 #define ACPI_USE_NATIVE_DIVIDE
 
+#define ACPI_ASM_MACROS         /* tell acenv.h */
+
 #define ACPI_SYSTEM_XFACE
 #define ACPI_EXTERNAL_XFACE
 #define ACPI_INTERNAL_XFACE
 #define ACPI_INTERNAL_VAR_XFACE
 
+/*
+ * XXX: The internal memory tracking of ACPICA, available when
+ *      ACPI_DBG_TRACK_ALLOCATIONS is defined, has been removed
+ *      from ACPI_DEBUG.
+ *
+ *      This is due to the instability of the ABI of ACPICA.
+ *
+ *      If the memory tracking is enabled, ACPICA will insert a header
+ *      to each memory allocation. As a consequence, when ACPI specific
+ *      code is loaded as a kernel module and the running kernel has
+ *      been compiled with ACPI_DEBUG, the result is an instant panic.
+ *      This happens because of unaligned memory access when the code
+ *      tries to use ACPI_FREE for a buffer obtained via ACPI_ALLOCATE,
+ *      AcpiEvaluateObject(), and related calls.
+ *
+ *      If the involved memory statistics are required, a separate constant
+ *      ACPI_DEBUG_ALLOC is available in options(4) for ACPI_DEBUG kernels.
+ */
+
 #ifdef ACPI_DEBUG
 #define ACPI_DEBUG_OUTPUT
+#ifdef ACPI_DEBUG_ALLOC
 #define ACPI_DBG_TRACK_ALLOCATIONS
+#endif
 #ifdef DEBUGGER_THREADING
 #undef DEBUGGER_THREADING
 #endif /* DEBUGGER_THREADING */
@@ -166,7 +196,7 @@
         return(isspace(ch) || isascii(ch));
 }
 
-#else /* _KERNEL */
+#else /* defined(_KERNEL) || defined(_STANDALONE) */
 
 #include <ctype.h>
 
@@ -179,7 +209,7 @@
 /* XXX */
 #define __inline inline
 
-#endif /* _KERNEL */
+#endif /* defined(_KERNEL) || defined(_STANDALONE) */
 
 /* Always use NetBSD code over our local versions */
 #define ACPI_USE_SYSTEM_CLIBRARY
--- a/sys/external/bsd/acpica/dist/namespace/nsaccess.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nsaccess.c	Thu Feb 17 07:21:14 2011 +0000
@@ -190,7 +190,7 @@
             continue;
         }
 
-        Status = AcpiNsLookup (NULL, InitVal->Name, InitVal->Type,
+        Status = AcpiNsLookup (NULL, __UNCONST(InitVal->Name), InitVal->Type,
                         ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH,
                         NULL, &NewNode);
 
@@ -217,7 +217,7 @@
 
             if (!Val)
             {
-                Val = InitVal->Val;
+                Val = __UNCONST(InitVal->Val);
             }
 
             /*
@@ -453,7 +453,7 @@
 
         NumSegments = 0;
         ThisNode = AcpiGbl_RootNode;
-        Path = "";
+        Path = __UNCONST("");
 
         ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
             "Null Pathname (Zero segments), Flags=%X\n", Flags));
--- a/sys/external/bsd/acpica/dist/namespace/nsdump.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nsdump.c	Thu Feb 17 07:21:14 2011 +0000
@@ -214,7 +214,7 @@
 void
 AcpiNsDumpPathname (
     ACPI_HANDLE             Handle,
-    char                    *Msg,
+    const char              *Msg,
     UINT32                  Level,
     UINT32                  Component)
 {
--- a/sys/external/bsd/acpica/dist/namespace/nseval.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nseval.c	Thu Feb 17 07:21:14 2011 +0000
@@ -429,7 +429,7 @@
         AcpiUtRemoveReference (Prev);
     }
 
-    ACPI_INFO ((AE_INFO,
+    ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
         "Executed %u blocks of module-level executable AML code",
         MethodCount));
 
--- a/sys/external/bsd/acpica/dist/namespace/nsinit.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nsinit.c	Thu Feb 17 07:21:14 2011 +0000
@@ -270,7 +270,7 @@
      * part of the ACPI specification.
      */
     Info.EvaluateInfo->PrefixNode = AcpiGbl_RootNode;
-    Info.EvaluateInfo->Pathname = METHOD_NAME__INI;
+    Info.EvaluateInfo->Pathname = __UNCONST(METHOD_NAME__INI);
     Info.EvaluateInfo->Parameters = NULL;
     Info.EvaluateInfo->Flags = ACPI_IGNORE_RETURN_VALUE;
 
@@ -691,7 +691,7 @@
         ACPI_TYPE_METHOD, DeviceNode, METHOD_NAME__INI));
 
     Info->PrefixNode = DeviceNode;
-    Info->Pathname = METHOD_NAME__INI;
+    Info->Pathname = __UNCONST(METHOD_NAME__INI);
     Info->Parameters = NULL;
     Info->Flags = ACPI_IGNORE_RETURN_VALUE;
 
--- a/sys/external/bsd/acpica/dist/namespace/nsrepair2.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nsrepair2.c	Thu Feb 17 07:21:14 2011 +0000
@@ -326,7 +326,7 @@
 
 
     Status = AcpiNsCheckSortedList (Data, ReturnObject, 2, 1,
-                ACPI_SORT_ASCENDING, "AmbientIlluminance");
+	ACPI_SORT_ASCENDING, __UNCONST("AmbientIlluminance"));
 
     return (Status);
 }
@@ -450,7 +450,7 @@
 
 
     Status = AcpiNsCheckSortedList (Data, ReturnObject, 5, 1,
-                ACPI_SORT_DESCENDING, "PowerDissipation");
+	ACPI_SORT_DESCENDING, __UNCONST("PowerDissipation"));
 
     return (Status);
 }
@@ -495,7 +495,7 @@
      * should be proportional to the power.
      */
     Status =AcpiNsCheckSortedList (Data, ReturnObject, 6, 0,
-                ACPI_SORT_DESCENDING, "CpuFrequency");
+	ACPI_SORT_DESCENDING, __UNCONST("CpuFrequency"));
     if (ACPI_FAILURE (Status))
     {
         return (Status);
--- a/sys/external/bsd/acpica/dist/namespace/nsxfeval.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nsxfeval.c	Thu Feb 17 07:21:14 2011 +0000
@@ -157,7 +157,7 @@
 ACPI_STATUS
 AcpiEvaluateObjectTyped (
     ACPI_HANDLE             Handle,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer,
     ACPI_OBJECT_TYPE        ReturnType)
@@ -165,7 +165,6 @@
     ACPI_STATUS             Status;
     BOOLEAN                 MustFree = FALSE;
 
-
     ACPI_FUNCTION_TRACE (AcpiEvaluateObjectTyped);
 
 
@@ -256,7 +255,7 @@
 ACPI_STATUS
 AcpiEvaluateObject (
     ACPI_HANDLE             Handle,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_OBJECT_LIST        *ExternalParams,
     ACPI_BUFFER             *ReturnBuffer)
 {
@@ -277,7 +276,7 @@
         return_ACPI_STATUS (AE_NO_MEMORY);
     }
 
-    Info->Pathname = Pathname;
+    Info->Pathname = __UNCONST(Pathname);
 
     /* Convert and validate the device handle */
 
--- a/sys/external/bsd/acpica/dist/namespace/nsxfname.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/namespace/nsxfname.c	Thu Feb 17 07:21:14 2011 +0000
@@ -156,12 +156,13 @@
 ACPI_STATUS
 AcpiGetHandle (
     ACPI_HANDLE             Parent,
-    ACPI_STRING             Pathname,
+    ACPI_CONST_STRING       Pathname,
     ACPI_HANDLE             *RetHandle)
 {
     ACPI_STATUS             Status;
     ACPI_NAMESPACE_NODE     *Node = NULL;
     ACPI_NAMESPACE_NODE     *PrefixNode = NULL;
+    ACPI_STRING             UPathname = __UNCONST(Pathname);
 
 
     ACPI_FUNCTION_ENTRY ();
@@ -192,13 +193,13 @@
      *
      * Error for <null Parent + relative path>
      */
-    if (AcpiNsValidRootPrefix (Pathname[0]))
+    if (AcpiNsValidRootPrefix (UPathname[0]))
     {
         /* Pathname is fully qualified (starts with '\') */
 
         /* Special case for root-only, since we can't search for it */
 
-        if (!ACPI_STRCMP (Pathname, ACPI_NS_ROOT_PATH))
+        if (!ACPI_STRCMP (UPathname, ACPI_NS_ROOT_PATH))
         {
             *RetHandle = ACPI_CAST_PTR (ACPI_HANDLE, AcpiGbl_RootNode);
             return (AE_OK);
@@ -213,7 +214,7 @@
 
     /* Find the Node and convert to a handle */
 
-    Status = AcpiNsGetNode (PrefixNode, Pathname, ACPI_NS_NO_UPSEARCH, &Node);
+    Status = AcpiNsGetNode (PrefixNode, UPathname, ACPI_NS_NO_UPSEARCH, &Node);
     if (ACPI_SUCCESS (Status))
     {
         *RetHandle = ACPI_CAST_PTR (ACPI_HANDLE, Node);
--- a/sys/external/bsd/acpica/dist/parser/psopcode.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/parser/psopcode.c	Thu Feb 17 07:21:14 2011 +0000
@@ -554,10 +554,10 @@
 
     /* Always guaranteed to return a valid pointer */
 
-    return (Op->Name);
+    return __UNCONST(Op->Name);
 
 #else
-    return ("OpcodeName unavailable");
+    return __UNCONST("OpcodeName unavailable");
 
 #endif
 }
--- a/sys/external/bsd/acpica/dist/resources/rsdump.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/resources/rsdump.c	Thu Feb 17 07:21:14 2011 +0000
@@ -130,32 +130,32 @@
 
 static void
 AcpiRsOutString (
-    char                    *Title,
-    char                    *Value);
+    const char              *Title,
+    const char              *Value);
 
 static void
 AcpiRsOutInteger8 (
-    char                    *Title,
+    const char              *Title,
     UINT8                   Value);
 
 static void
 AcpiRsOutInteger16 (
-    char                    *Title,
+    const char              *Title,
     UINT16                  Value);
 
 static void
 AcpiRsOutInteger32 (
-    char                    *Title,
+    const char              *Title,
     UINT32                  Value);
 
 static void
 AcpiRsOutInteger64 (
-    char                    *Title,
+    const char              *Title,
     UINT64                  Value);
 
 static void
 AcpiRsOutTitle (
-    char                    *Title);
+    const char              *Title);
 
 static void
 AcpiRsDumpByteList (
@@ -376,7 +376,7 @@
 
 static ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] =
 {
-    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags),        "Resource Type",            (void *) "Memory Range"},
+    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags),        "Resource Type",            (const char * const *) "Memory Range"},
     {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.WriteProtect),    "Write Protect",            AcpiGbl_RwDecode},
     {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.Caching),         "Caching",                  AcpiGbl_MemDecode},
     {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.RangeType),       "Range Type",               AcpiGbl_MtpDecode},
@@ -385,7 +385,7 @@
 
 static ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] =
 {
-    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags),            "Resource Type",            (void *) "I/O Range"},
+    {ACPI_RSD_LITERAL,  ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags),            "Resource Type",            (const char * const *) "I/O Range"},
     {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.RangeType),        "Range Type",               AcpiGbl_RngDecode},
     {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.Translation),      "Translation",              AcpiGbl_TtpDecode},
     {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.TranslationType),  "Translation Type",         AcpiGbl_TrsDecode}
@@ -424,7 +424,7 @@
 {
     UINT8                   *Target = NULL;
     UINT8                   *PreviousTarget;
-    char                    *Name;
+    const char              *Name;
     UINT8                    Count;
 
 
@@ -758,8 +758,8 @@
 
 static void
 AcpiRsOutString (
-    char                    *Title,
-    char                    *Value)
+    const char              *Title,
+    const char              *Value)
 {
     AcpiOsPrintf ("%27s : %s", Title, Value);
     if (!*Value)
@@ -771,7 +771,7 @@
 
 static void
 AcpiRsOutInteger8 (
-    char                    *Title,
+    const char              *Title,
     UINT8                   Value)
 {
     AcpiOsPrintf ("%27s : %2.2X\n", Title, Value);
@@ -779,7 +779,7 @@
 
 static void
 AcpiRsOutInteger16 (
-    char                    *Title,
+    const char              *Title,
     UINT16                  Value)
 {
     AcpiOsPrintf ("%27s : %4.4X\n", Title, Value);
@@ -787,7 +787,7 @@
 
 static void
 AcpiRsOutInteger32 (
-    char                    *Title,
+    const char              *Title,
     UINT32                  Value)
 {
     AcpiOsPrintf ("%27s : %8.8X\n", Title, Value);
@@ -795,7 +795,7 @@
 
 static void
 AcpiRsOutInteger64 (
-    char                    *Title,
+    const char              *Title,
     UINT64                  Value)
 {
     AcpiOsPrintf ("%27s : %8.8X%8.8X\n", Title,
@@ -804,7 +804,7 @@
 
 static void
 AcpiRsOutTitle (
-    char                    *Title)
+    const char              *Title)
 {
     AcpiOsPrintf ("%27s : ", Title);
 }
--- a/sys/external/bsd/acpica/dist/resources/rsutils.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/resources/rsutils.c	Thu Feb 17 07:21:14 2011 +0000
@@ -822,7 +822,7 @@
     }
 
     Info->PrefixNode = Node;
-    Info->Pathname = METHOD_NAME__SRS;
+    Info->Pathname = __UNCONST(METHOD_NAME__SRS);
     Info->Parameters = Args;
     Info->Flags = ACPI_IGNORE_RETURN_VALUE;
 
--- a/sys/external/bsd/acpica/dist/resources/rsxface.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/resources/rsxface.c	Thu Feb 17 07:21:14 2011 +0000
@@ -632,7 +632,7 @@
 ACPI_STATUS
 AcpiWalkResources (
     ACPI_HANDLE                 DeviceHandle,
-    char                        *Name,
+    const char                  *Name,
     ACPI_WALK_RESOURCE_CALLBACK UserFunction,
     void                        *Context)
 {
@@ -640,7 +640,7 @@
     ACPI_BUFFER                 Buffer;
     ACPI_RESOURCE               *Resource;
     ACPI_RESOURCE               *ResourceEnd;
-
+    char                        *UName = __UNCONST(Name);
 
     ACPI_FUNCTION_TRACE (AcpiWalkResources);
 
@@ -648,8 +648,8 @@
     /* Parameter validation */
 
     if (!DeviceHandle || !UserFunction || !Name ||
-        (!ACPI_COMPARE_NAME (Name, METHOD_NAME__CRS) &&
-         !ACPI_COMPARE_NAME (Name, METHOD_NAME__PRS)))
+        (!ACPI_COMPARE_NAME (UName, METHOD_NAME__CRS) &&
+         !ACPI_COMPARE_NAME (UName, METHOD_NAME__PRS)))
     {
         return_ACPI_STATUS (AE_BAD_PARAMETER);
     }
@@ -657,7 +657,7 @@
     /* Get the _CRS or _PRS resource list */
 
     Buffer.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
-    Status = AcpiRsGetMethodData (DeviceHandle, Name, &Buffer);
+    Status = AcpiRsGetMethodData (DeviceHandle, UName, &Buffer);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
--- a/sys/external/bsd/acpica/dist/tables/tbfadt.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/tables/tbfadt.c	Thu Feb 17 07:21:14 2011 +0000
@@ -148,7 +148,7 @@
 
 typedef struct acpi_fadt_info
 {
-    char                    *Name;
+    const char              *Name;
     UINT8                   Address64;
     UINT8                   Address32;
     UINT8                   Length;
@@ -566,7 +566,7 @@
 AcpiTbValidateFadt (
     void)
 {
-    char                    *Name;
+    const char              *Name;
     ACPI_GENERIC_ADDRESS    *Address64;
     UINT8                   Length;
     UINT32                  i;
--- a/sys/external/bsd/acpica/dist/tables/tbutils.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/tables/tbutils.c	Thu Feb 17 07:21:14 2011 +0000
@@ -283,7 +283,7 @@
     {
         /* FACS only has signature and length fields */
 
-        ACPI_INFO ((AE_INFO, "%4.4s %p %05X",
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "%4.4s %p %05X",
             Header->Signature, ACPI_CAST_PTR (void, Address),
             Header->Length));
     }
@@ -295,7 +295,7 @@
             ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->OemId, ACPI_OEM_ID_SIZE);
         AcpiTbFixString (LocalHeader.OemId, ACPI_OEM_ID_SIZE);
 
-        ACPI_INFO ((AE_INFO, "RSDP %p %05X (v%.2d %6.6s)",
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "RSDP %p %05X (v%.2d %6.6s)",
             ACPI_CAST_PTR (void, Address),
             (ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->Revision > 0) ?
                 ACPI_CAST_PTR (ACPI_TABLE_RSDP, Header)->Length : 20,
@@ -308,7 +308,7 @@
 
         AcpiTbCleanupTableHeader (&LocalHeader, Header);
 
-        ACPI_INFO ((AE_INFO,
+        ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
             "%4.4s %p %05X (v%.2d %6.6s %8.8s %08X %4.4s %08X)",
             LocalHeader.Signature, ACPI_CAST_PTR (void, Address),
             LocalHeader.Length, LocalHeader.Revision, LocalHeader.OemId,
@@ -496,7 +496,7 @@
 void
 AcpiTbInstallTable (
     ACPI_PHYSICAL_ADDRESS   Address,
-    char                    *Signature,
+    const char              *Signature,
     UINT32                  TableIndex)
 {
     UINT8                   Flags;
--- a/sys/external/bsd/acpica/dist/tables/tbxface.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/tables/tbxface.c	Thu Feb 17 07:21:14 2011 +0000
@@ -336,14 +336,14 @@
 
 ACPI_STATUS
 AcpiGetTableHeader (
-    char                    *Signature,
+    ACPI_CONST_STRING       Signature,
     UINT32                  Instance,
     ACPI_TABLE_HEADER       *OutTableHeader)
 {
     UINT32                  i;
     UINT32                  j;
     ACPI_TABLE_HEADER       *Header;
-
+    ACPI_STRING             USignature = __UNCONST(Signature);
 
     /* Parameter validation */
 
@@ -357,7 +357,7 @@
     for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
     {
         if (!ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
-                    Signature))
+                    USignature))
         {
             continue;
         }
@@ -421,14 +421,14 @@
 
 ACPI_STATUS
 AcpiGetTable (
-    char                    *Signature,
+    ACPI_CONST_STRING       Signature,
     UINT32                  Instance,
     ACPI_TABLE_HEADER       **OutTable)
 {
     UINT32                  i;
     UINT32                  j;
     ACPI_STATUS             Status;
-
+    ACPI_STRING             USignature = __UNCONST(Signature);
 
     /* Parameter validation */
 
@@ -442,7 +442,7 @@
     for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
     {
         if (!ACPI_COMPARE_NAME (&(AcpiGbl_RootTableList.Tables[i].Signature),
-                Signature))
+                USignature))
         {
             continue;
         }
--- a/sys/external/bsd/acpica/dist/tables/tbxfroot.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/tables/tbxfroot.c	Thu Feb 17 07:21:14 2011 +0000
@@ -306,7 +306,7 @@
 
     /* A valid RSDP was not found */
 
-    ACPI_ERROR ((AE_INFO, "A valid RSDP was not found"));
+    ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "A valid RSDP was not found"));
     return_ACPI_STATUS (AE_NOT_FOUND);
 }
 
--- a/sys/external/bsd/acpica/dist/utilities/utcache.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utcache.c	Thu Feb 17 07:21:14 2011 +0000
@@ -140,7 +140,7 @@
 
 ACPI_STATUS
 AcpiOsCreateCache (
-    char                    *CacheName,
+    const char              *CacheName,
     UINT16                  ObjectSize,
     UINT16                  MaxDepth,
     ACPI_MEMORY_LIST        **ReturnCache)
@@ -168,7 +168,7 @@
 
     ACPI_MEMSET (Cache, 0, sizeof (ACPI_MEMORY_LIST));
     Cache->LinkOffset = 8;
-    Cache->ListName   = CacheName;
+    Cache->ListName   = __UNCONST(CacheName);
     Cache->ObjectSize = ObjectSize;
     Cache->MaxDepth   = MaxDepth;
 
--- a/sys/external/bsd/acpica/dist/utilities/utdebug.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utdebug.c	Thu Feb 17 07:21:14 2011 +0000
@@ -125,8 +125,8 @@
 #ifdef ACPI_DEBUG_OUTPUT
 
 static ACPI_THREAD_ID       AcpiGbl_PrevThreadId = (ACPI_THREAD_ID) 0xFFFFFFFF;
-static char                 *AcpiGbl_FnEntryStr = "----Entry";
-static char                 *AcpiGbl_FnExitStr  = "----Exit-";
+static const char           *AcpiGbl_FnEntryStr = "----Entry";
+static const char           *AcpiGbl_FnExitStr  = "----Exit-";
 
 /* Local prototypes */
 
--- a/sys/external/bsd/acpica/dist/utilities/uteval.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/uteval.c	Thu Feb 17 07:21:14 2011 +0000
@@ -279,13 +279,14 @@
 ACPI_STATUS
 AcpiUtEvaluateObject (
     ACPI_NAMESPACE_NODE     *PrefixNode,
-    char                    *Path,
+    const char              *Path,
     UINT32                  ExpectedReturnBtypes,
     ACPI_OPERAND_OBJECT     **ReturnDesc)
 {
     ACPI_EVALUATE_INFO      *Info;
     ACPI_STATUS             Status;
     UINT32                  ReturnBtype;
+    char                    *UPath = __UNCONST(Path);
 
 
     ACPI_FUNCTION_TRACE (UtEvaluateObject);
@@ -300,7 +301,7 @@
     }
 
     Info->PrefixNode = PrefixNode;
-    Info->Pathname = Path;
+    Info->Pathname = UPath;
 
     /* Evaluate the object/method */
 
@@ -310,7 +311,7 @@
         if (Status == AE_NOT_FOUND)
         {
             ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s.%s] was not found\n",
-                AcpiUtGetNodeName (PrefixNode), Path));
+                AcpiUtGetNodeName (PrefixNode), UPath));
         }
         else
         {
@@ -421,7 +422,7 @@
 
 ACPI_STATUS
 AcpiUtEvaluateNumericObject (
-    char                    *ObjectName,
+    const char              *ObjectName,
     ACPI_NAMESPACE_NODE     *DeviceNode,
     UINT64                  *Value)
 {
--- a/sys/external/bsd/acpica/dist/utilities/utglobal.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utglobal.c	Thu Feb 17 07:21:14 2011 +0000
@@ -419,11 +419,11 @@
 
     if (SpaceId >= ACPI_USER_REGION_BEGIN)
     {
-        return ("UserDefinedRegion");
+        return __UNCONST("UserDefinedRegion");
     }
     else if (SpaceId >= ACPI_NUM_PREDEFINED_REGIONS)
     {
-        return ("InvalidSpaceId");
+        return __UNCONST("InvalidSpaceId");
     }
 
     return (ACPI_CAST_PTR (char, AcpiGbl_RegionTypes[SpaceId]));
@@ -461,7 +461,7 @@
 
     if (EventId > ACPI_EVENT_MAX)
     {
-        return ("InvalidEventID");
+        return __UNCONST("InvalidEventID");
     }
 
     return (ACPI_CAST_PTR (char, AcpiGbl_EventTypes[EventId]));
@@ -549,7 +549,7 @@
 
     if (!ObjDesc)
     {
-        return ("[NULL Object Descriptor]");
+        return __UNCONST("[NULL Object Descriptor]");
     }
 
     return (AcpiUtGetTypeName (ObjDesc->Common.Type));
@@ -579,7 +579,7 @@
 
     if (!Object)
     {
-        return ("NULL");
+        return __UNCONST("NULL");
     }
 
     /* Check for Root node */
@@ -587,14 +587,14 @@
     if ((Object == ACPI_ROOT_OBJECT) ||
         (Object == AcpiGbl_RootNode))
     {
-        return ("\"\\\" ");
+        return __UNCONST("\"\\\" ");
     }
 
     /* Descriptor must be a namespace node */
 
     if (ACPI_GET_DESCRIPTOR_TYPE (Node) != ACPI_DESC_TYPE_NAMED)
     {
-        return ("####");
+        return __UNCONST("####");
     }
 
     /*
@@ -644,7 +644,7 @@
 };
 
 
-char *
+const char *
 AcpiUtGetDescriptorName (
     void                    *Object)
 {
@@ -737,7 +737,7 @@
  *
  ******************************************************************************/
 
-char *
+const char *
 AcpiUtGetMutexName (
     UINT32                  MutexId)
 {
--- a/sys/external/bsd/acpica/dist/utilities/utmisc.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utmisc.c	Thu Feb 17 07:21:14 2011 +0000
@@ -703,7 +703,7 @@
 AcpiUtDisplayInitPathname (
     UINT8                   Type,
     ACPI_NAMESPACE_NODE     *ObjHandle,
-    char                    *Path)
+    const char              *Path)
 {
     ACPI_STATUS             Status;
     ACPI_BUFFER             Buffer;
--- a/sys/external/bsd/acpica/dist/utilities/uttrack.c	Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/uttrack.c	Thu Feb 17 07:21:14 2011 +0000
@@ -173,7 +173,7 @@
 
 ACPI_STATUS
 AcpiUtCreateList (
-    char                    *ListName,
+    const char              *ListName,
     UINT16                  ObjectSize,
     ACPI_MEMORY_LIST        **ReturnCache)
 {
@@ -188,7 +188,7 @@
 
     ACPI_MEMSET (Cache, 0, sizeof (ACPI_MEMORY_LIST));
 
-    Cache->ListName   = ListName;
+    Cache->ListName   = __UNCONST(ListName);
     Cache->ObjectSize = ObjectSize;
 
     *ReturnCache = Cache;