X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Facpi%2Futilities%2Futcache.c;h=2177cb1ef2c43708c8af51e520bbdc8ad3e8a49f;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=1a1f8109159cec3d9d988d1513a75cdb1638ecf4;hpb=3944158a6d33f94668dbd6bdc32ff5c67bb53ec2;p=linux-2.6.git

diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 1a1f81091..2177cb1ef 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -118,14 +118,13 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
 	/* Walk the list of objects in this cache */
 
 	while (cache->list_head) {
-
 		/* Delete and unlink one cached state object */
 
 		next = *(ACPI_CAST_INDIRECT_PTR(char,
 						&(((char *)cache->
 						   list_head)[cache->
 							      link_offset])));
-		ACPI_FREE(cache->list_head);
+		ACPI_MEM_FREE(cache->list_head);
 
 		cache->list_head = next;
 		cache->current_depth--;
@@ -162,7 +161,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
 
 	/* Now we can delete the cache object */
 
-	ACPI_FREE(cache);
+	acpi_os_free(cache);
 	return (AE_OK);
 }
 
@@ -194,7 +193,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)
 	/* If cache is full, just free this object */
 
 	if (cache->current_depth >= cache->max_depth) {
-		ACPI_FREE(object);
+		ACPI_MEM_FREE(object);
 		ACPI_MEM_TRACKING(cache->total_freed++);
 	}
 
@@ -244,7 +243,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 	acpi_status status;
 	void *object;
 
-	ACPI_FUNCTION_NAME(os_acquire_object);
+	ACPI_FUNCTION_NAME("os_acquire_object");
 
 	if (!cache) {
 		return (NULL);
@@ -260,7 +259,6 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 	/* Check the cache first */
 
 	if (cache->list_head) {
-
 		/* There is an object available, use it */
 
 		object = cache->list_head;
@@ -272,9 +270,9 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 		cache->current_depth--;
 
 		ACPI_MEM_TRACKING(cache->hits++);
-		ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-				  "Object %p from %s cache\n", object,
-				  cache->list_name));
+		ACPI_MEM_TRACKING(ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+						    "Object %p from %s cache\n",
+						    object, cache->list_name)));
 
 		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
 		if (ACPI_FAILURE(status)) {
@@ -289,14 +287,14 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
 		ACPI_MEM_TRACKING(cache->total_allocated++);
 
-		/* Avoid deadlock with ACPI_ALLOCATE_ZEROED */
+		/* Avoid deadlock with ACPI_MEM_CALLOCATE */
 
 		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);
 		if (ACPI_FAILURE(status)) {
 			return (NULL);
 		}
 
-		object = ACPI_ALLOCATE_ZEROED(cache->object_size);
+		object = ACPI_MEM_CALLOCATE(cache->object_size);
 		if (!object) {
 			return (NULL);
 		}