* [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
@ 2024-02-07 14:38 Lukas Bulwahn
2024-02-08 4:01 ` Anshuman Khandual
2024-02-27 15:44 ` Christoph Hellwig
0 siblings, 2 replies; 5+ messages in thread
From: Lukas Bulwahn @ 2024-02-07 14:38 UTC (permalink / raw)
To: Anshuman Khandual, Andrew Morton, Christoph Hellwig,
Marek Szyprowski, Robin Murphy, iommu
Cc: kernel-janitors, linux-kernel, 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.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
Andrew, please pick this minor clean-up patch of top of the commit above.
kernel/dma/contiguous.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index f005c66f378c..055da410ac71 100644
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -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>
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
2024-02-07 14:38 [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG Lukas Bulwahn
@ 2024-02-08 4:01 ` Anshuman Khandual
2024-02-27 15:44 ` Christoph Hellwig
1 sibling, 0 replies; 5+ messages in thread
From: Anshuman Khandual @ 2024-02-08 4:01 UTC (permalink / raw)
To: Lukas Bulwahn, Andrew Morton, Christoph Hellwig, Marek Szyprowski,
Robin Murphy, iommu
Cc: kernel-janitors, linux-kernel
On 2/7/24 20:08, Lukas Bulwahn wrote:
> 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.
>
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> Andrew, please pick this minor clean-up patch of top of the commit above.
>
> kernel/dma/contiguous.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
> index f005c66f378c..055da410ac71 100644
> --- a/kernel/dma/contiguous.c
> +++ b/kernel/dma/contiguous.c
> @@ -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>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
2024-02-07 14:38 [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG Lukas Bulwahn
2024-02-08 4:01 ` Anshuman Khandual
@ 2024-02-27 15:44 ` Christoph Hellwig
2024-02-27 18:23 ` Lukas Bulwahn
1 sibling, 1 reply; 5+ messages in thread
From: Christoph Hellwig @ 2024-02-27 15:44 UTC (permalink / raw)
To: Lukas Bulwahn
Cc: Anshuman Khandual, Andrew Morton, Christoph Hellwig,
Marek Szyprowski, Robin Murphy, iommu, kernel-janitors,
linux-kernel
Thanks,
added to the dma-mapping for-next branch.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
2024-02-27 15:44 ` Christoph Hellwig
@ 2024-02-27 18:23 ` Lukas Bulwahn
2024-02-27 18:44 ` Christoph Hellwig
0 siblings, 1 reply; 5+ messages in thread
From: Lukas Bulwahn @ 2024-02-27 18:23 UTC (permalink / raw)
To: Christoph Hellwig
Cc: Anshuman Khandual, Andrew Morton, Marek Szyprowski, Robin Murphy,
iommu, kernel-janitors, linux-kernel
On Tue, Feb 27, 2024 at 4:44 PM Christoph Hellwig <hch@lst.de> wrote:
>
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG
2024-02-27 18:23 ` Lukas Bulwahn
@ 2024-02-27 18:44 ` Christoph Hellwig
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2024-02-27 18:44 UTC (permalink / raw)
To: Lukas Bulwahn
Cc: Christoph Hellwig, Anshuman Khandual, Andrew Morton,
Marek Szyprowski, Robin Murphy, iommu, kernel-janitors,
linux-kernel
On Tue, Feb 27, 2024 at 07:23:36PM +0100, Lukas Bulwahn wrote:
> On Tue, Feb 27, 2024 at 4:44 PM Christoph Hellwig <hch@lst.de> wrote:
> >
> > 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.
Ok, I'll drop it.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-27 18:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-07 14:38 [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG Lukas Bulwahn
2024-02-08 4:01 ` Anshuman Khandual
2024-02-27 15:44 ` Christoph Hellwig
2024-02-27 18:23 ` Lukas Bulwahn
2024-02-27 18:44 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox