diff --git a/source/common/dmrestag.c b/source/common/dmrestag.c
index 9659aab6f..d25914b12 100644
--- a/source/common/dmrestag.c
+++ b/source/common/dmrestag.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: dmrestag - Add tags to resource descriptors (Application-level)
- *              $Revision: 1.6 $
+ *              $Revision: 1.7 $
  *
  *****************************************************************************/
 
@@ -160,7 +160,7 @@ AcpiDmAddResourceToNamespace (
     UINT32                  Length,
     UINT32                  Offset,
     UINT8                   ResourceIndex,
-    ACPI_NAMESPACE_NODE     *BufferNode);
+    void                    *Context);
 
 static void
 AcpiDmAddResourcesToNamespace (
@@ -956,8 +956,9 @@ AcpiDmAddResourceToNamespace (
     UINT32                  Length,
     UINT32                  Offset,
     UINT8                   ResourceIndex,
-    ACPI_NAMESPACE_NODE     *BufferNode)
+    void                    *Context)
 {
+    ACPI_NAMESPACE_NODE     *BufferNode = Context;
     ACPI_STATUS             Status;
     ACPI_GENERIC_STATE      ScopeInfo;
     ACPI_NAMESPACE_NODE     *Node;
diff --git a/source/components/resources/rslist.c b/source/components/resources/rslist.c
index a9163cafe..213a28516 100644
--- a/source/components/resources/rslist.c
+++ b/source/components/resources/rslist.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Module Name: rslist - Linked list utilities
- *              $Revision: 1.56 $
+ *              $Revision: 1.57 $
  *
  ******************************************************************************/
 
@@ -144,9 +144,10 @@ AcpiRsConvertAmlToResources (
     UINT32                  Length,
     UINT32                  Offset,
     UINT8                   ResourceIndex,
-    void                    **ResourcePtr)
+    void                    *Context)
 {
-    ACPI_RESOURCE           *Resource = *ResourcePtr;
+    void                    **ResourcePtr = *(void **) Context;
+    ACPI_RESOURCE           *Resource = *(void **) Context;
     ACPI_STATUS             Status;