diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:17:37 -0600 |
| commit | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (patch) | |
| tree | eb80eebf368957df18c2a4c0ee02897e0a9b06d2 /drivers/acpi/utilities/utcache.c | |
| parent | 8f68abbfd9703e58920ff07d314a48654ed0bc3b (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
Merge branch 'master' into for_paulus
Diffstat (limited to 'drivers/acpi/utilities/utcache.c')
| -rw-r--r-- | drivers/acpi/utilities/utcache.c | 10 |
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); |