diff options
| author | Christian Brauner <brauner@kernel.org> | 2025-11-11 09:59:08 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-11-11 09:59:08 +0100 |
| commit | a67ee4e2ba7643b2ff2b808155429aa4f51d57a4 (patch) | |
| tree | 36cae6262b542c047c5e0f172722ef795e30f7a3 /kernel/dma | |
| parent | Merge patch series "ns: fixes for namespace iteration and active reference co... (diff) | |
| parent | Merge patch "kbuild: Add '-fms-extensions' to areas with dedicated CFLAGS" (diff) | |
| download | linux-a67ee4e2ba7643b2ff2b808155429aa4f51d57a4.tar.gz linux-a67ee4e2ba7643b2ff2b808155429aa4f51d57a4.zip | |
Merge branch 'kbuild-6.19.fms.extension'
Bring in the shared branch with the kbuild tree to enable
'-fms-extensions' for 6.19. Further namespace cleanup work
requires this extension.
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/debug.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 1e5c64cb6a42..138ede653de4 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -23,6 +23,7 @@ #include <linux/ctype.h> #include <linux/list.h> #include <linux/slab.h> +#include <linux/swiotlb.h> #include <asm/sections.h> #include "debug.h" @@ -594,7 +595,9 @@ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs) if (rc == -ENOMEM) { pr_err_once("cacheline tracking ENOMEM, dma-debug disabled\n"); global_disable = true; - } else if (rc == -EEXIST && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) { + } else if (rc == -EEXIST && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) && + !(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) && + is_swiotlb_active(entry->dev))) { err_printk(entry->dev, entry, "cacheline tracking EEXIST, overlapping mappings aren't supported\n"); } |