diff options
| author | Michael Ellerman | 2013-09-26 09:52:17 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2013-12-02 04:16:39 +0100 |
| commit | 66c29da6782b9861b17f9fc81746e30315e039c2 (patch) | |
| tree | e4f690ec5f869d74f4a4d3057865f682d9f1b5d5 /arch/powerpc | |
| parent | powerpc/pseries: CONFIG_PSERIES_MSI should depend on PPC_PSERIES (diff) | |
| download | kernel-qcow2-linux-66c29da6782b9861b17f9fc81746e30315e039c2.tar.gz kernel-qcow2-linux-66c29da6782b9861b17f9fc81746e30315e039c2.tar.xz kernel-qcow2-linux-66c29da6782b9861b17f9fc81746e30315e039c2.zip | |
powerpc/powernv: Replace CONFIG_POWERNV_MSI with just CONFIG_PPC_POWERNV
We currently have a user visible CONFIG_POWERNV_MSI option, but it
doesn't actually disable MSI for powernv. The MSI code is always built,
what it does disable is the inclusion of the MSI bitmap code, which
leads to a build error.
eg, with PPC_POWERNV=y and POWERNV_MSI=n we get:
arch/powerpc/platforms/built-in.o: In function `.pnv_teardown_msi_irqs':
pci.c:(.text+0x3558): undefined reference to `.msi_bitmap_free_hwirqs'
We don't really need a POWERNV_MSI symbol, just have the MSI bitmap code
depend directly on PPC_POWERNV.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/powernv/Kconfig | 5 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/Kconfig | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig index 9fced3f6d2dc..895e8a20a3fc 100644 --- a/arch/powerpc/platforms/powernv/Kconfig +++ b/arch/powerpc/platforms/powernv/Kconfig @@ -13,11 +13,6 @@ config PPC_POWERNV select ARCH_RANDOM default y -config POWERNV_MSI - bool "Support PCI MSI on PowerNV platform" - depends on PCI_MSI - default y - config PPC_POWERNV_RTAS depends on PPC_POWERNV bool "Support for RTAS based PowerNV platforms such as BML" diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig index 13ec968be4c7..7baa70d6dc01 100644 --- a/arch/powerpc/sysdev/Kconfig +++ b/arch/powerpc/sysdev/Kconfig @@ -19,7 +19,7 @@ config PPC_MSI_BITMAP default y if MPIC default y if FSL_PCI default y if PPC4xx_MSI - default y if POWERNV_MSI + default y if PPC_POWERNV source "arch/powerpc/sysdev/xics/Kconfig" |