diff mbox

powerpc: Fix incorrect PPC32 PAMU dependency

Message ID 1454638566-1953-1-git-send-email-afleming@gmail.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Andy Fleming Feb. 5, 2016, 2:16 a.m. UTC
The Freescale PAMU can also be enabled on 64-bit power
chips. Commit 477ab7a19cec8409e4e2dd10e7348e4cac3c06e5
(iommu: Make more drivers depend on COMPILE_TEST)
added this false dependency. Fixed it by allowing PPC64, too.

Signed-off-by: Andy Fleming <afleming@gmail.com>
---
 drivers/iommu/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Ellerman Feb. 8, 2016, 11:13 a.m. UTC | #1
On Thu, 2016-02-04 at 20:16 -0600, Andy Fleming wrote:

> The Freescale PAMU can also be enabled on 64-bit power
> chips. Commit 477ab7a19cec8409e4e2dd10e7348e4cac3c06e5
> (iommu: Make more drivers depend on COMPILE_TEST)
> added this false dependency. Fixed it by allowing PPC64, too.
>
> Signed-off-by: Andy Fleming <afleming@gmail.com>
> ---
>  drivers/iommu/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
> index a1e75cb..63ec7ae 100644
> --- a/drivers/iommu/Kconfig
> +++ b/drivers/iommu/Kconfig
> @@ -57,7 +57,7 @@ config IOMMU_DMA
>
>  config FSL_PAMU
>  	bool "Freescale IOMMU support"
> -	depends on PPC32
> +	depends on PPC32 || PPC64

That's == PPC.

>  	depends on PPC_E500MC || COMPILE_TEST

But then you have that ^

Multiple depends are joined with &&, so you get:

	depends on PPC && (PPC_E500MC || COMPILE_TEST)

PPC_E500MC depends (indirectly) on PPC, so I think it would be clearer as:

	depends on PPC_E500MC || (COMPILE_TEST && PPC)

Which I /think/ matches the original intention?

cheers
diff mbox

Patch

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index a1e75cb..63ec7ae 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -57,7 +57,7 @@  config IOMMU_DMA
 
 config FSL_PAMU
 	bool "Freescale IOMMU support"
-	depends on PPC32
+	depends on PPC32 || PPC64
 	depends on PPC_E500MC || COMPILE_TEST
 	select IOMMU_API
 	select GENERIC_ALLOCATOR