diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 08:25:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-12 08:25:16 -0700 |
| commit | 8ee15f3248660f85102a47410079d408615723d4 (patch) | |
| tree | 96e57bb60585f81f2bc99bf112aed8e782d12f08 /kernel | |
| parent | 4876191cbe2a4702b0067d4156e1d8648ac36801 (diff) | |
| parent | 8c5165430c0194df92369162d1c7f53f8672baa5 (diff) | |
Merge tag 'dma-mapping-5.1-1' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"Fix a sparc64 sun4v_pci regression introduced in this merged window,
and a dma-debug stracktrace regression from the big refactor last
merge window"
* tag 'dma-mapping-5.1-1' of git://git.infradead.org/users/hch/dma-mapping:
dma-debug: only skip one stackframe entry
sparc64/pci_sun4v: fix ATU checks for large DMA masks
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 45d51e8e26f6..a218e43cc382 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -706,7 +706,7 @@ static struct dma_debug_entry *dma_entry_alloc(void) #ifdef CONFIG_STACKTRACE entry->stacktrace.max_entries = DMA_DEBUG_STACKTRACE_ENTRIES; entry->stacktrace.entries = entry->st_entries; - entry->stacktrace.skip = 2; + entry->stacktrace.skip = 1; save_stack_trace(&entry->stacktrace); #endif |