2024-02-07 14:38:43

by Lukas Bulwahn

Subject: [PATCH] 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.

Signed-off-by: Lukas Bulwahn <[email protected]>
---
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

2024-02-08 04:01:29

by Anshuman Khandual

Subject: Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG

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 <[email protected]>
> ---
> 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 <[email protected]>

2024-02-27 15:45:02

by Christoph Hellwig

Subject: Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG

Thanks,

added to the dma-mapping for-next branch.

2024-02-27 18:24:00

by Lukas Bulwahn

Subject: Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG

On Tue, Feb 27, 2024 at 4:44 PM Christoph Hellwig <[email protected]> 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

2024-02-27 18:45:01

by Christoph Hellwig

Subject: Re: [PATCH] dma-contiguous: remove debug code to removed CONFIG_CMA_DEBUG

On Tue, Feb 27, 2024 at 07:23:36PM +0100, Lukas Bulwahn wrote:
> On Tue, Feb 27, 2024 at 4:44 PM Christoph Hellwig <[email protected]> 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.