Pull test into release branch

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/acpi/utilities/utcache.c b/drivers/acpi/utilities/utcache.c
index 1a1f8109159c..870f6edeb5f2 100644
--- a/drivers/acpi/utilities/utcache.c
+++ b/drivers/acpi/utilities/utcache.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -289,6 +289,14 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
 
                 ACPI_MEM_TRACKING(cache->total_allocated++);
 
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
+                if ((cache->total_allocated - cache->total_freed) >
+                    cache->max_occupied) {
+                        cache->max_occupied =
+                            cache->total_allocated - cache->total_freed;
+                }
+#endif
+
                 /* Avoid deadlock with ACPI_ALLOCATE_ZEROED */
 
                 status = acpi_ut_release_mutex(ACPI_MTX_CACHES);