2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h
index ed7943b9044f..8b7ca40c4eb5 100644
--- a/drivers/acpi/acpica/acmacros.h
+++ b/drivers/acpi/acpica/acmacros.h
@@ -322,8 +322,10 @@
  * where a pointer to an object of type union acpi_operand_object can also
  * appear. This macro is used to distinguish them.
  *
- * The "Descriptor" field is the first field in both structures.
+ * The "DescriptorType" field is the second field in both structures.
  */
+#define ACPI_GET_DESCRIPTOR_PTR(d)      (((union acpi_descriptor *)(void *)(d))->common.common_pointer)
+#define ACPI_SET_DESCRIPTOR_PTR(d, o)   (((union acpi_descriptor *)(void *)(d))->common.common_pointer = o)
 #define ACPI_GET_DESCRIPTOR_TYPE(d)     (((union acpi_descriptor *)(void *)(d))->common.descriptor_type)
 #define ACPI_SET_DESCRIPTOR_TYPE(d, t)  (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = t)
 
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c
index 2de22fbacf4b..a877a9647fd9 100644
--- a/drivers/acpi/acpica/utcache.c
+++ b/drivers/acpi/acpica/utcache.c
@@ -127,9 +127,7 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
 
                 /* Delete and unlink one cached state object */
 
-                next =
-                    ((struct acpi_object_common *)cache->list_head)->
-                    next_object;
+                next = ACPI_GET_DESCRIPTOR_PTR(cache->list_head);
                 ACPI_FREE(cache->list_head);
 
                 cache->list_head = next;
@@ -219,8 +217,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)
 
                 /* Put the object at the head of the cache list */
 
-                ((struct acpi_object_common *)object)->next_object =
-                    cache->list_head;
+                ACPI_SET_DESCRIPTOR_PTR(object, cache->list_head);
                 cache->list_head = object;
                 cache->current_depth++;
 
@@ -268,8 +265,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
                 /* There is an object available, use it */
 
                 object = cache->list_head;
-                cache->list_head =
-                    ((struct acpi_object_common *)object)->next_object;
+                cache->list_head = ACPI_GET_DESCRIPTOR_PTR(object);
 
                 cache->current_depth--;