kernel/acpica: Stop being prepared for using ACPICA's local cache.
authorSascha Wildner <saw@online.de>
Thu, 9 Oct 2014 11:19:37 +0000 (13:19 +0200)
committerSascha Wildner <saw@online.de>
Thu, 9 Oct 2014 11:19:37 +0000 (13:19 +0200)
We provide our own objcache(9) based one for some time now.

sys/conf/files
sys/contrib/dev/acpica/source/include/platform/acdragonfly.h
sys/dev/acpica/Makefile
sys/dev/acpica/Osd/OsdCache.c

index 1ed8789..61aab4f 100644 (file)
@@ -2241,7 +2241,6 @@ ${ACPICA_COMP_DIR}/tables/tbxfroot.c              optional acpi
 ${ACPICA_COMP_DIR}/utilities/utaddress.c       optional acpi
 ${ACPICA_COMP_DIR}/utilities/utalloc.c         optional acpi
 ${ACPICA_COMP_DIR}/utilities/utbuffer.c                optional acpi
-${ACPICA_COMP_DIR}/utilities/utcache.c         optional acpi
 ${ACPICA_COMP_DIR}/utilities/utcopy.c          optional acpi
 ${ACPICA_COMP_DIR}/utilities/utdebug.c         optional acpi
 ${ACPICA_COMP_DIR}/utilities/utdecode.c                optional acpi
index bc2b642..1154b9b 100644 (file)
 #define ACPI_SPINLOCK  struct acpi_spinlock *
 struct acpi_spinlock;
 
-#ifndef ACPI_USE_LOCAL_CACHE
 #define ACPI_CACHE_T   struct acpicache
 struct acpicache;
-#endif
 
 #else /* _KERNEL */
 
index a073596..f041c35 100644 (file)
@@ -76,7 +76,7 @@ SRCS+=        acpi_pci.c acpi_pcib.c acpi_pcib_acpi.c acpi_pcib_pci.c
 SRCS+= acpi_pci_link.c
 SRCS+=  acpi_powerres.c acpi_quirk.c acpi_resource.c acpi_thermal.c
 SRCS+=  acpi_timer.c acpi_hpet.c acpi_if.c acpi_wmi_if.c
-SRCS+=  OsdDebug.c
+SRCS+=  OsdCache.c OsdDebug.c
 SRCS+=  OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=  OsdStream.c OsdSynch.c OsdTable.c OsdEnvironment.c
 SRCS+=  opt_acpi.h opt_ddb.h opt_ktr.h
@@ -94,12 +94,6 @@ opt_ddb.h: Makefile
 opt_ddb.h: Makefile
        echo -n > ${.TARGET}
 .endif
-.if ACPI_USE_LOCAL_CACHE
-CFLAGS+= -DACPI_USE_LOCAL_CACHE
-SRCS+=         utcache.c
-.else
-SRCS+=         OsdCache.c
-.endif
 
 # Machine-specific code for P-State
 SRCS+= acpi_pstate_machdep.c
index 63a15b6..9f8e6b5 100644 (file)
@@ -56,8 +56,6 @@ struct acpiobjhead {
 
 #include "acpi.h"
 
-#ifndef ACPI_USE_LOCAL_CACHE
-
 ACPI_STATUS
 AcpiOsCreateCache(char *CacheName, UINT16 ObjectSize, UINT16 MaxDepth,
     ACPI_CACHE_T **ReturnCache)
@@ -145,5 +143,3 @@ AcpiOsReleaseObject(ACPI_CACHE_T *Cache, void *Object)
        objcache_put(Cache->cache, head);
        return AE_OK;
 }
-
-#endif