Silence harmless warnings (for module build).
authorYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Thu, 25 Jan 2007 15:12:06 +0000 (15:12 +0000)
committerYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Thu, 25 Jan 2007 15:12:06 +0000 (15:12 +0000)
sys/dev/acpica5/Makefile
sys/dev/acpica5/Osd/OsdSynch.c
sys/dev/acpica5/debugger,dbstats.c.patch [new file with mode: 0644]

index 63d4d00..4f61286 100644 (file)
@@ -1,9 +1,11 @@
 # $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.3 2004/01/08 16:38:32 njl Exp $
-# $DragonFly: src/sys/dev/acpica5/Makefile,v 1.18 2007/01/19 19:18:09 y0netan1 Exp $
+# $DragonFly: src/sys/dev/acpica5/Makefile,v 1.19 2007/01/25 15:12:06 y0netan1 Exp $
 
 CONTRIBDIR=    ${SYSDIR}/${ACPICA_DIR}
-PATCHES=       hardware,hwsleep.c.patch include,acglobal.h.patch \
-               tables,tbxface.c.patch
+# patches to fix problems in ACPI-CA code
+PATCHES=       hardware,hwsleep.c.patch tables,tbxface.c.patch
+# patches to silence warnings
+PATCHES+=      include,acglobal.h.patch debugger,dbstats.c.patch
 
 SYSDIR?= ${.CURDIR}/../..
 .if ACPI_DEBUG_LOCKS || ACPI_DEBUG_MEMMAP
index 65970f8..c307be9 100644 (file)
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.21 2004/05/05 20:07:52 njl Exp $
- * $DragonFly: src/sys/dev/acpica5/Osd/OsdSynch.c,v 1.10 2007/01/17 17:31:19 y0netan1 Exp $
+ * $DragonFly: src/sys/dev/acpica5/Osd/OsdSynch.c,v 1.11 2007/01/25 15:12:06 y0netan1 Exp $
  */
 
 /*
@@ -372,16 +372,16 @@ _AcpiOsAcquireLock (ACPI_SPINLOCK Spin, const char *func, int line)
 AcpiOsAcquireLock (ACPI_SPINLOCK Spin)
 #endif
 {
-    thread_t td = curthread;
-
     spin_lock_wr(&Spin->lock);
+
 #ifdef ACPI_DEBUG_LOCKS
     if (Spin->owner) {
        kprintf("%p(%s:%d): acpi_spinlock %p already held by %p(%s:%d)\n",
-               td, func, line, Spin, Spin->owner, Spin->func, Spin->line);
+               curthread, func, line, Spin, Spin->owner, Spin->func,
+               Spin->line);
        db_print_backtrace();
     } else {
-       Spin->owner = td;
+       Spin->owner = curthread;
        Spin->func = func;
        Spin->line = line;
     }
diff --git a/sys/dev/acpica5/debugger,dbstats.c.patch b/sys/dev/acpica5/debugger,dbstats.c.patch
new file mode 100644 (file)
index 0000000..1781448
--- /dev/null
@@ -0,0 +1,25 @@
+# $DragonFly: src/sys/dev/acpica5/debugger,dbstats.c.patch,v 1.1 2007/01/25 15:12:06 y0netan1 Exp $
+
+--- dbstats.c.orig     2007-01-18 01:29:39.000000000 +0900
++++ dbstats.c  2007-01-25 12:02:30.000000000 +0900
+@@ -141,10 +141,6 @@
+     void                    *Context,
+     void                    **ReturnValue);
+-static void
+-AcpiDbListInfo (
+-    ACPI_MEMORY_LIST        *List);
+-
+ /*
+  * Statistics subcommands
+@@ -171,6 +167,9 @@
+ #if defined ACPI_DBG_TRACK_ALLOCATIONS || defined ACPI_USE_LOCAL_CACHE
++static void
++AcpiDbListInfo (
++    ACPI_MEMORY_LIST        *List);
+ /*******************************************************************************
+  *