2014-06-19 09:31:30

by Vincent Stehlé

Subject: [PATCH linux-next] ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area

Commit 5ea3b1b2f8ad 'cma: add placement specifier for "cma=" kernel parameter'
adds a new 'fixed' parameter to dma_contiguous_reserve_area(). Update
rcar_gen2_reserve() accordingly.

This fixes the following compilation error:

arch/arm/mach-shmobile/setup-rcar-gen2.c: In function ‘rcar_gen2_reserve’:
arch/arm/mach-shmobile/setup-rcar-gen2.c:182:10: error: too few arguments to function ‘dma_contiguous_reserve_area’

Signed-off-by: Vincent Stehlé <[email protected]>
Cc: Simon Horman <[email protected]>
Cc: Magnus Damm <[email protected]>
Cc: Russell King <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
---

Hi,

This can be seen with linux next-20140619 and e.g. arm allmodconfig.

Best regards,

V.

arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 73fb2a6..42d5b43 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -179,6 +179,6 @@ void __init rcar_gen2_reserve(void)
#ifdef CONFIG_DMA_CMA
if (mrc.size)
dma_contiguous_reserve_area(mrc.size, mrc.base, 0,
- &rcar_gen2_dma_contiguous);
+ &rcar_gen2_dma_contiguous, true);
#endif
}
--
2.0.0

2014-06-20 11:11:05

by Laurent Pinchart

Subject: Re: [PATCH linux-next] ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area

Hi Vincent,

Thank you for the patch.

On Thursday 19 June 2014 11:31:10 Vincent Stehlé wrote:
> Commit 5ea3b1b2f8ad 'cma: add placement specifier for "cma=" kernel
> parameter' adds a new 'fixed' parameter to dma_contiguous_reserve_area().
> Update rcar_gen2_reserve() accordingly.
>
> This fixes the following compilation error:
>
> arch/arm/mach-shmobile/setup-rcar-gen2.c: In function ‘rcar_gen2_reserve’:
> arch/arm/mach-shmobile/setup-rcar-gen2.c:182:10: error: too few arguments
> to function ‘dma_contiguous_reserve_area’
>
> Signed-off-by: Vincent Stehlé <[email protected]>
> Cc: Simon Horman <[email protected]>
> Cc: Magnus Damm <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: Geert Uytterhoeven <[email protected]>

Acked-by: Laurent Pinchart <[email protected]>

> ---
>
> Hi,
>
> This can be seen with linux next-20140619 and e.g. arm allmodconfig.
>
> Best regards,
>
> V.
>
> arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 73fb2a6..42d5b43 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -179,6 +179,6 @@ void __init rcar_gen2_reserve(void)
> #ifdef CONFIG_DMA_CMA
> if (mrc.size)
> dma_contiguous_reserve_area(mrc.size, mrc.base, 0,
> - &rcar_gen2_dma_contiguous);
> + &rcar_gen2_dma_contiguous, true);
> #endif
> }

--
Regards,

Laurent Pinchart

2014-06-23 00:15:48

by Simon Horman

Subject: Re: [PATCH linux-next] ARM: shmobile: rcar-gen2: update call to dma_contiguous_reserve_area

On Thu, Jun 19, 2014 at 11:31:10AM +0200, Vincent Stehlé wrote:
> Commit 5ea3b1b2f8ad 'cma: add placement specifier for "cma=" kernel parameter'
> adds a new 'fixed' parameter to dma_contiguous_reserve_area(). Update
> rcar_gen2_reserve() accordingly.
>
> This fixes the following compilation error:
>
> arch/arm/mach-shmobile/setup-rcar-gen2.c: In function ‘rcar_gen2_reserve’:
> arch/arm/mach-shmobile/setup-rcar-gen2.c:182:10: error: too few arguments to function ‘dma_contiguous_reserve_area’
>
> Signed-off-by: Vincent Stehlé <[email protected]>
> Cc: Simon Horman <[email protected]>
> Cc: Magnus Damm <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: Geert Uytterhoeven <[email protected]>
> ---
>
> Hi,
>
> This can be seen with linux next-20140619 and e.g. arm allmodconfig.

Thanks, I will queue this up in the branch where the patch
that adds this problem lies.

> Best regards,
>
> V.
>
> arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index 73fb2a6..42d5b43 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -179,6 +179,6 @@ void __init rcar_gen2_reserve(void)
> #ifdef CONFIG_DMA_CMA
> if (mrc.size)
> dma_contiguous_reserve_area(mrc.size, mrc.base, 0,
> - &rcar_gen2_dma_contiguous);
> + &rcar_gen2_dma_contiguous, true);
> #endif
> }
> --
> 2.0.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>