[PATCH master] sandbox: dma: fix recursive dependency between headers

[PATCH master] sandbox: dma: fix recursive dependency between headers

[Ahmad Fatoum]

If <dma.h> includes <linux/kernel.h> via <asm/dma.h>, it will end up
including <linux/slab.h>, which in turn includes <dma.h>.

This leads to use of symbols before definition, so remove the
<linux/kernel.h> definition.

Fixes: 9b12861830e0 ("include: linux/slab: use dma_alloc for kmalloc")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/sandbox/include/asm/dma.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/sandbox/include/asm/dma.h b/arch/sandbox/include/asm/dma.h
index ab84166846a2..2dbce1ad6c9a 100644
--- a/arch/sandbox/include/asm/dma.h
+++ b/arch/sandbox/include/asm/dma.h
@@ -8,7 +8,8 @@
 #ifndef __ASM_DMA_H
 #define __ASM_DMA_H
 
-#include <linux/kernel.h>
+#include <xfuncs.h>
+#include <linux/types.h>
 #include <linux/string.h>
 
 #define DMA_ALIGNMENT	64
-- 
2.39.2

Re: [PATCH master] sandbox: dma: fix recursive dependency between headers

[Sascha Hauer]

On Fri, Apr 26, 2024 at 12:41:47PM +0200, Ahmad Fatoum wrote:
> If <dma.h> includes <linux/kernel.h> via <asm/dma.h>, it will end up
> including <linux/slab.h>, which in turn includes <dma.h>.
> 
> This leads to use of symbols before definition, so remove the
> <linux/kernel.h> definition.
> 
> Fixes: 9b12861830e0 ("include: linux/slab: use dma_alloc for kmalloc")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/sandbox/include/asm/dma.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/arch/sandbox/include/asm/dma.h b/arch/sandbox/include/asm/dma.h
> index ab84166846a2..2dbce1ad6c9a 100644
> --- a/arch/sandbox/include/asm/dma.h
> +++ b/arch/sandbox/include/asm/dma.h
> @@ -8,7 +8,8 @@
>  #ifndef __ASM_DMA_H
>  #define __ASM_DMA_H
>  
> -#include <linux/kernel.h>
> +#include <xfuncs.h>
> +#include <linux/types.h>
>  #include <linux/string.h>
>  
>  #define DMA_ALIGNMENT	64
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |