summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2013-10-31 02:31:00 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-31 14:37:34 +0100
commitdba47d3af92bb2e443cdb689422bf30b498bd209 (patch)
treeca28d68dcb9069545368d892c15e81448f6afc02 /drivers/acpi
parentACPICA: Remove dead AOPOBJ_INVALID check. (diff)
downloadlinux-dba47d3af92bb2e443cdb689422bf30b498bd209.tar.xz
linux-dba47d3af92bb2e443cdb689422bf30b498bd209.zip
ACPICA: Fix cached object deletion code.
Function acpi_ut_delete_caches() is meant to be used to implement ACPI_ALLOCATE()/ACPI_FREE() mechanisms in ACPICA, so it should call acpi_os_free() rather than ACPI_FREE(). Linux is not affected by this issue as it uses kmem_cache instead of the ACPICA local cache, but the change helps to reduce source code differences between Linux and ACPICA upstream. [rjw: Changelog] Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpica/utalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utalloc.c b/drivers/acpi/acpica/utalloc.c
index d84479610971..814267f52715 100644
--- a/drivers/acpi/acpica/utalloc.c
+++ b/drivers/acpi/acpica/utalloc.c
@@ -209,10 +209,10 @@ acpi_status acpi_ut_delete_caches(void)
/* Free memory lists */
- ACPI_FREE(acpi_gbl_global_list);
+ acpi_os_free(acpi_gbl_global_list);
acpi_gbl_global_list = NULL;
- ACPI_FREE(acpi_gbl_ns_node_list);
+ acpi_os_free(acpi_gbl_ns_node_list);
acpi_gbl_ns_node_list = NULL;
#endif