OSDN Git Service

powerpc/powernv: Replace CONFIG_POWERNV_MSI with just CONFIG_PPC_POWERNV
authorMichael Ellerman <michael@ellerman.id.au>
Thu, 26 Sep 2013 07:52:17 +0000 (17:52 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 2 Dec 2013 03:16:39 +0000 (14:16 +1100)
commit66c29da6782b9861b17f9fc81746e30315e039c2
treee4f690ec5f869d74f4a4d3057865f682d9f1b5d5
parent1edb55a473eb1151f54590371761fdeb35b3b593
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>
arch/powerpc/platforms/powernv/Kconfig
arch/powerpc/sysdev/Kconfig