diff options
Diffstat (limited to 'drivers/acpi/utilities/utcache.c')
-rw-r--r-- | drivers/acpi/utilities/utcache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c index 044c890e5b3c..5d2f4b2802a5 100644 --- a/drivers/acpi/utilities/utcache.c +++ b/drivers/acpi/utilities/utcache.c | |||
@@ -125,7 +125,7 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache) | |||
125 | &(((char *)cache-> | 125 | &(((char *)cache-> |
126 | list_head)[cache-> | 126 | list_head)[cache-> |
127 | link_offset]))); | 127 | link_offset]))); |
128 | ACPI_MEM_FREE(cache->list_head); | 128 | ACPI_FREE(cache->list_head); |
129 | 129 | ||
130 | cache->list_head = next; | 130 | cache->list_head = next; |
131 | cache->current_depth--; | 131 | cache->current_depth--; |
@@ -194,7 +194,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object) | |||
194 | /* If cache is full, just free this object */ | 194 | /* If cache is full, just free this object */ |
195 | 195 | ||
196 | if (cache->current_depth >= cache->max_depth) { | 196 | if (cache->current_depth >= cache->max_depth) { |
197 | ACPI_MEM_FREE(object); | 197 | ACPI_FREE(object); |
198 | ACPI_MEM_TRACKING(cache->total_freed++); | 198 | ACPI_MEM_TRACKING(cache->total_freed++); |
199 | } | 199 | } |
200 | 200 | ||
@@ -289,14 +289,14 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache) | |||
289 | 289 | ||
290 | ACPI_MEM_TRACKING(cache->total_allocated++); | 290 | ACPI_MEM_TRACKING(cache->total_allocated++); |
291 | 291 | ||
292 | /* Avoid deadlock with ACPI_MEM_CALLOCATE */ | 292 | /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */ |
293 | 293 | ||
294 | status = acpi_ut_release_mutex(ACPI_MTX_CACHES); | 294 | status = acpi_ut_release_mutex(ACPI_MTX_CACHES); |
295 | if (ACPI_FAILURE(status)) { | 295 | if (ACPI_FAILURE(status)) { |
296 | return (NULL); | 296 | return (NULL); |
297 | } | 297 | } |
298 | 298 | ||
299 | object = ACPI_MEM_CALLOCATE(cache->object_size); | 299 | object = ACPI_ALLOCATE_ZEROED(cache->object_size); |
300 | if (!object) { | 300 | if (!object) { |
301 | return (NULL); | 301 | return (NULL); |
302 | } | 302 | } |