diff options
author | Jakub Kicinski <kubakici@wp.pl> | 2012-04-03 21:19:10 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-04-12 06:28:46 -0400 |
commit | 29cdd4e4ec91aae239192bb122d377d15a9d75e3 (patch) | |
tree | 2407fb9f3c7144d110029ad7d32328dee45758bc /lib | |
parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) |
dma-debug: release free_entries_lock before saving stack trace
Saving stack trace can take a while and once the entry
is allocated free_entries_lock is no longer needed.
Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dma-debug.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 13ef2338be41..518aea714d21 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -430,7 +430,7 @@ static struct dma_debug_entry *__dma_entry_alloc(void) | |||
430 | */ | 430 | */ |
431 | static struct dma_debug_entry *dma_entry_alloc(void) | 431 | static struct dma_debug_entry *dma_entry_alloc(void) |
432 | { | 432 | { |
433 | struct dma_debug_entry *entry = NULL; | 433 | struct dma_debug_entry *entry; |
434 | unsigned long flags; | 434 | unsigned long flags; |
435 | 435 | ||
436 | spin_lock_irqsave(&free_entries_lock, flags); | 436 | spin_lock_irqsave(&free_entries_lock, flags); |
@@ -438,11 +438,14 @@ static struct dma_debug_entry *dma_entry_alloc(void) | |||
438 | if (list_empty(&free_entries)) { | 438 | if (list_empty(&free_entries)) { |
439 | pr_err("DMA-API: debugging out of memory - disabling\n"); | 439 | pr_err("DMA-API: debugging out of memory - disabling\n"); |
440 | global_disable = true; | 440 | global_disable = true; |
441 | goto out; | 441 | spin_unlock_irqrestore(&free_entries_lock, flags); |
442 | return NULL; | ||
442 | } | 443 | } |
443 | 444 | ||
444 | entry = __dma_entry_alloc(); | 445 | entry = __dma_entry_alloc(); |
445 | 446 | ||
447 | spin_unlock_irqrestore(&free_entries_lock, flags); | ||
448 | |||
446 | #ifdef CONFIG_STACKTRACE | 449 | #ifdef CONFIG_STACKTRACE |
447 | entry->stacktrace.max_entries = DMA_DEBUG_STACKTRACE_ENTRIES; | 450 | entry->stacktrace.max_entries = DMA_DEBUG_STACKTRACE_ENTRIES; |
448 | entry->stacktrace.entries = entry->st_entries; | 451 | entry->stacktrace.entries = entry->st_entries; |
@@ -450,9 +453,6 @@ static struct dma_debug_entry *dma_entry_alloc(void) | |||
450 | save_stack_trace(&entry->stacktrace); | 453 | save_stack_trace(&entry->stacktrace); |
451 | #endif | 454 | #endif |
452 | 455 | ||
453 | out: | ||
454 | spin_unlock_irqrestore(&free_entries_lock, flags); | ||
455 | |||
456 | return entry; | 456 | return entry; |
457 | } | 457 | } |
458 | 458 | ||