2 files changed, 11 insertions, 9 deletions

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 45d51e8e26f6..badd77670d00 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -89,8 +89,8 @@ struct dma_debug_entry {
         int              sg_mapped_ents;
         enum map_err_types  map_err_type;
 #ifdef CONFIG_STACKTRACE
-        struct           stack_trace stacktrace;
-        unsigned long    st_entries[DMA_DEBUG_STACKTRACE_ENTRIES];
+        unsigned int    stack_len;
+        unsigned long   stack_entries[DMA_DEBUG_STACKTRACE_ENTRIES];
 #endif
 };
 
@@ -174,7 +174,7 @@ static inline void dump_entry_trace(struct dma_debug_entry *entry)
 #ifdef CONFIG_STACKTRACE
         if (entry) {
                 pr_warning("Mapped at:\n");
-                print_stack_trace(&entry->stacktrace, 0);
+                stack_trace_print(entry->stack_entries, entry->stack_len, 0);
         }
 #endif
 }
@@ -704,12 +704,10 @@ static struct dma_debug_entry *dma_entry_alloc(void)
         spin_unlock_irqrestore(&free_entries_lock, flags);
 
 #ifdef CONFIG_STACKTRACE
-        entry->stacktrace.max_entries = DMA_DEBUG_STACKTRACE_ENTRIES;
-        entry->stacktrace.entries = entry->st_entries;
-        entry->stacktrace.skip = 2;
-        save_stack_trace(&entry->stacktrace);
+        entry->stack_len = stack_trace_save(entry->stack_entries,
+                                            ARRAY_SIZE(entry->stack_entries),
+                                            1);
 #endif
-
         return entry;
 }
 
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 53012db1e53c..6f7619c1f877 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -452,6 +452,7 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
         unsigned long mask;
         unsigned long offset_slots;
         unsigned long max_slots;
+        unsigned long tmp_io_tlb_used;
 
         if (no_iotlb_memory)
                 panic("Can not allocate SWIOTLB buffer earlier and can't now provide you with the DMA bounce buffer");
@@ -538,9 +539,12 @@ phys_addr_t swiotlb_tbl_map_single(struct device *hwdev,
         } while (index != wrap);
 
 not_found:
+        tmp_io_tlb_used = io_tlb_used;
+
         spin_unlock_irqrestore(&io_tlb_lock, flags);
         if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit())
-                dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes)\n", size);
+                dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes), total %lu (slots), used %lu (slots)\n",
+                         size, io_tlb_nslabs, tmp_io_tlb_used);
         return DMA_MAPPING_ERROR;
 found:
         io_tlb_used += nslots;