diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-05-26 15:16:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-07 18:18:53 -0700 |
| commit | e799b0ec06796a861c6b0075d25b908bcd4158e9 (patch) | |
| tree | 8f663a5497dc0c15489864b39a3ad975b76771c5 | |
| parent | 0c42f6c9199233f3947d531df81fc44574ace18e (diff) | |
| download | linux-stable-e799b0ec06796a861c6b0075d25b908bcd4158e9.tar.gz linux-stable-e799b0ec06796a861c6b0075d25b908bcd4158e9.tar.bz2 linux-stable-e799b0ec06796a861c6b0075d25b908bcd4158e9.zip | |
dma-debug: avoid spinlock recursion when disabling dma-debug
commit 3017cd63f26fc655d56875aaf497153ba60e9edf upstream.
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 4a1515f4b452..51a76af25c66 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -657,9 +657,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; } |