From 750d72f9eedbcb3492745cedd91f82e2590162cc Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Thu, 15 Oct 2009 00:07:52 +0800
Subject: [PATCH] ACPICA: Unbreak ACPI_DEBUG_CACHE support

---
 sys/contrib/dev/acpica-unix/include/acpiosxf.h   | 11 +++++++++++
 sys/contrib/dev/acpica-unix/namespace/nsalloc.c  |  4 ++--
 sys/contrib/dev/acpica-unix/parser/psutils.c     |  4 ++--
 sys/contrib/dev/acpica-unix/utilities/utobject.c |  2 +-
 sys/contrib/dev/acpica-unix/utilities/utstate.c  |  2 +-
 sys/dev/acpica5/Osd/OsdCache.c                   |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/sys/contrib/dev/acpica-unix/include/acpiosxf.h b/sys/contrib/dev/acpica-unix/include/acpiosxf.h
index 730057d1ef..4f41aeb19e 100644
--- a/sys/contrib/dev/acpica-unix/include/acpiosxf.h
+++ b/sys/contrib/dev/acpica-unix/include/acpiosxf.h
@@ -306,10 +306,21 @@ void *
 AcpiOsAcquireObject (
     ACPI_CACHE_T            *Cache);
 
+#ifndef ACPI_DEBUG_CACHE
 ACPI_STATUS
 AcpiOsReleaseObject (
     ACPI_CACHE_T            *Cache,
     void                    *Object);
+#define ACPI_OS_RELEASE_OBJECT(c, o)	AcpiOsReleaseObject((c), (o))
+#else
+ACPI_STATUS
+_AcpiOsReleaseObject (
+    ACPI_CACHE_T            *Cache,
+    void                    *Object,
+    const char *, int);
+#define ACPI_OS_RELEASE_OBJECT(c, o)	\
+	_AcpiOsReleaseObject((c), (o), __func__, __LINE__)
+#endif
 
 
 /*
diff --git a/sys/contrib/dev/acpica-unix/namespace/nsalloc.c b/sys/contrib/dev/acpica-unix/namespace/nsalloc.c
index c3113b6cb3..e66c9f76a7 100644
--- a/sys/contrib/dev/acpica-unix/namespace/nsalloc.c
+++ b/sys/contrib/dev/acpica-unix/namespace/nsalloc.c
@@ -242,7 +242,7 @@ AcpiNsDeleteNode (
     /* Detach an object if there is one, then delete the node */
 
     AcpiNsDetachObject (Node);
-    (void) AcpiOsReleaseObject (AcpiGbl_NamespaceCache, Node);
+    ACPI_OS_RELEASE_OBJECT(AcpiGbl_NamespaceCache, Node);
     return_VOID;
 }
 
@@ -398,7 +398,7 @@ AcpiNsDeleteChildren (
 
         /* Now we can delete the node */
 
-        (void) AcpiOsReleaseObject (AcpiGbl_NamespaceCache, ChildNode);
+        ACPI_OS_RELEASE_OBJECT(AcpiGbl_NamespaceCache, ChildNode);
 
         /* And move on to the next child in the list */
 
diff --git a/sys/contrib/dev/acpica-unix/parser/psutils.c b/sys/contrib/dev/acpica-unix/parser/psutils.c
index 42f2b015d6..a4ff03eba0 100644
--- a/sys/contrib/dev/acpica-unix/parser/psutils.c
+++ b/sys/contrib/dev/acpica-unix/parser/psutils.c
@@ -280,11 +280,11 @@ AcpiPsFreeOp (
 
     if (Op->Common.Flags & ACPI_PARSEOP_GENERIC)
     {
-        (void) AcpiOsReleaseObject (AcpiGbl_PsNodeCache, Op);
+        ACPI_OS_RELEASE_OBJECT(AcpiGbl_PsNodeCache, Op);
     }
     else
     {
-        (void) AcpiOsReleaseObject (AcpiGbl_PsNodeExtCache, Op);
+        ACPI_OS_RELEASE_OBJECT(AcpiGbl_PsNodeExtCache, Op);
     }
 }
 
diff --git a/sys/contrib/dev/acpica-unix/utilities/utobject.c b/sys/contrib/dev/acpica-unix/utilities/utobject.c
index e38d2b2879..2cd351909e 100644
--- a/sys/contrib/dev/acpica-unix/utilities/utobject.c
+++ b/sys/contrib/dev/acpica-unix/utilities/utobject.c
@@ -520,7 +520,7 @@ AcpiUtDeleteObjectDesc (
         return_VOID;
     }
 
-    (void) AcpiOsReleaseObject (AcpiGbl_OperandCache, Object);
+    ACPI_OS_RELEASE_OBJECT(AcpiGbl_OperandCache, Object);
     return_VOID;
 }
 
diff --git a/sys/contrib/dev/acpica-unix/utilities/utstate.c b/sys/contrib/dev/acpica-unix/utilities/utstate.c
index 245ca02bfc..6dbef0b493 100644
--- a/sys/contrib/dev/acpica-unix/utilities/utstate.c
+++ b/sys/contrib/dev/acpica-unix/utilities/utstate.c
@@ -462,7 +462,7 @@ AcpiUtDeleteGenericState (
 
     if (State)
     {
-        (void) AcpiOsReleaseObject (AcpiGbl_StateCache, State);
+        ACPI_OS_RELEASE_OBJECT(AcpiGbl_StateCache, State);
     }
     return_VOID;
 }
diff --git a/sys/dev/acpica5/Osd/OsdCache.c b/sys/dev/acpica5/Osd/OsdCache.c
index b11258ecf7..2e083cef01 100644
--- a/sys/dev/acpica5/Osd/OsdCache.c
+++ b/sys/dev/acpica5/Osd/OsdCache.c
@@ -112,7 +112,7 @@ AcpiOsAcquireObject(ACPI_CACHE_T *Cache)
 ACPI_STATUS
 #if ACPI_DEBUG_CACHE
 _AcpiOsReleaseObject(ACPI_CACHE_T *Cache, void *Object,
- const char *func, int line)
+    const char *func, int line)
 #else
 AcpiOsReleaseObject(ACPI_CACHE_T *Cache, void *Object)
 #endif
-- 
2.41.0