Skip to contentSkip to conversation

dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG

PATCH In review Lukas Bulwahn 3 participants 5 messages Feb 7, 2024 – Feb 27, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG

Commit acc2f3e42d4a ("mm/cma: drop CONFIG_CMA_DEBUG") removes the config CMA_DEBUG and the debug code in cma.c, but misses debug code in kernel/dma/contiguous.c.

Remove this dead code from this removed config option.

---
Andrew, please pick this minor clean-up patch of top of the commit above.

 kernel/dma/contiguous.c | 6 ------
 1 file changed, 6 deletions(-)
kernel/dma/contiguous.c +0 -6
index f005c66f378c..055da410ac71 100644
@@ -37,12 +37,6 @@
 
 #define pr_fmt(fmt) "cma: " fmt
 
-#ifdef CONFIG_CMA_DEBUG
-#ifndef DEBUG
-#  define DEBUG
-#endif
-#endif
-
 #include <asm/page.h>
 
 #include <linux/memblock.h>
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 20 lines · Lukas Bulwahn

Commit acc2f3e42d4a ("mm/cma: drop CONFIG_CMA_DEBUG") removes the config CMA_DEBUG and the debug code in cma.c, but misses debug code in kernel/dma/contiguous.c.

Remove this dead code from this removed config option.

---
Andrew, please pick this minor clean-up patch of top of the commit above.

 kernel/dma/contiguous.c | 6 ------
 1 file changed, 6 deletions(-)
kernel/dma/contiguous.c +0 -0
index f005c66f378c..055da410ac71 100644
@@ -37,12 +37,6 @@
 
 #define pr_fmt(fmt) "cma: " fmt

kernel/dma/contiguous.c line 42

Quoted 10 lines
kernel/dma/contiguous.c +0 -6
 
-#ifdef CONFIG_CMA_DEBUG
-#ifndef DEBUG
-#  define DEBUG
-#endif
-#endif
-
 #include <asm/page.h>
 
 #include <linux/memblock.h>
#3 lore raw
Quoted 5 lines · Christoph Hellwig

Thanks,

added to the dma-mapping for-next branch.

Christoph, please drop this patch in your for-next branch if possible.

Andrew has picked this patch already and squashed it together with the commit "mm/cma: drop CONFIG_CMA_DEBUG" in the mm tree. So, you do not need to add it anymore.

Lukas

#4 lore raw
Quoted 4 lines · Lukas Bulwahn
Quoted 3 lines · Christoph Hellwig

Thanks,

Quoted 8 lines
Quoted 2 lines

added to the dma-mapping for-next branch.

Christoph, please drop this patch in your for-next branch if possible.

Andrew has picked this patch already and squashed it together with the commit "mm/cma: drop CONFIG_CMA_DEBUG" in the mm tree. So, you do not need to add it anymore.

Ok, I'll drop it.