[PATCH] powerpc: do not redefined NEED_DMA_MAP_STATE

Michael Ellerman mpe at ellerman.id.au
Tue Jul 31 20:47:53 AEST 2018


Christoph Hellwig <hch at lst.de> writes:

> kernel/dma/Kconfig already defines NEED_DMA_MAP_STATE, just select it
> from PPC64 and NOT_COHERENT_CACHE instead.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
>  arch/powerpc/Kconfig                   | 3 ---
>  arch/powerpc/platforms/Kconfig.cputype | 2 ++
>  2 files changed, 2 insertions(+), 3 deletions(-)

Thanks.

I did this instead:

commit 870771ae76010c5e42ee8e0278f5823e46e96e3f (HEAD -> next-test)
Author:     Christoph Hellwig <hch at lst.de>
AuthorDate: Mon Jul 30 09:37:21 2018 +0200
Commit:     Michael Ellerman <mpe at ellerman.id.au>
CommitDate: Tue Jul 31 20:43:57 2018 +1000

    powerpc: Do not redefine NEED_DMA_MAP_STATE
    
    kernel/dma/Kconfig already defines NEED_DMA_MAP_STATE, just select it
    from CONFIG_PPC using the same condition as an if guard.
    
    Signed-off-by: Christoph Hellwig <hch at lst.de>
    [mpe: Move it under PPC]
    Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5eb4d969afbf..ee38fce075ee 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -226,6 +226,7 @@ config PPC
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_RELA
+       select NEED_DMA_MAP_STATE               if PPC64 || NOT_COHERENT_CACHE
        select NEED_SG_DMA_LENGTH
        select NO_BOOTMEM
        select OF
@@ -885,9 +886,6 @@ config ZONE_DMA
        bool
        default y
 
-config NEED_DMA_MAP_STATE
-       def_bool (PPC64 || NOT_COHERENT_CACHE)
-
 config GENERIC_ISA_DMA
        bool
        depends on ISA_DMA_API


cheers


More information about the Linuxppc-dev mailing list