diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-05-26 15:16:25 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-06-06 19:11:13 -0400 |
| commit | e3b5360919a2491a6ed34426a083f4afdcbc7973 (patch) | |
| tree | 18ef68bad6163409e01a85bee421ba6c4360f559 /lib | |
| parent | 20f38c9653aac20261fe13cfe410627680161c47 (diff) | |
| download | linux-stable-e3b5360919a2491a6ed34426a083f4afdcbc7973.tar.gz linux-stable-e3b5360919a2491a6ed34426a083f4afdcbc7973.tar.bz2 linux-stable-e3b5360919a2491a6ed34426a083f4afdcbc7973.zip | |
dma-debug: avoid spinlock recursion when disabling dma-debug
[ Upstream commit 3017cd63f26fc655d56875aaf497153ba60e9edf ]
With netconsole (at least) the pr_err("... disablingn") call can
recurse back into the dma-debug code, where it'll try to grab
free_entries_lock again. Avoid the problem by doing the printk after
dropping the lock.
Link: http://lkml.kernel.org/r/1463678421-18683-1-git-send-email-ville.syrjala@linux.intel.com
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dma-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 1ff0fd098504..c83ac43418be 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -646,9 +646,9 @@ static struct dma_debug_entry *dma_entry_alloc(void) spin_lock_irqsave(&free_entries_lock, flags); if (list_empty(&free_entries)) { - pr_err("DMA-API: debugging out of memory - disabling\n"); global_disable = true; spin_unlock_irqrestore(&free_entries_lock, flags); + pr_err("DMA-API: debugging out of memory - disabling\n"); return NULL; } |