Patchwork [1/4] powerpc: Add Kconfig dependency for PCI_MSI as needed by XICS

login
register
mail settings
Submitter Mel Gorman
Date Nov. 17, 2009, 12:07 p.m.
Message ID <1258459659-11770-2-git-send-email-mel@csn.ul.ie>
Download mbox | patch
Permalink /patch/38625/
State Changes Requested
Headers show

Comments

Mel Gorman - Nov. 17, 2009, 12:07 p.m.
It's possible to set CONFIG_XICS without CONFIG_PCI_MSI. When that
happens, the kernel fails to build with

arch/powerpc/platforms/built-in.o: In function `.xics_startup':
xics.c:(.text+0x12f60): undefined reference to `.unmask_msi_irq'
make: *** [.tmp_vmlinux1] Error 1

This patch adds the dependency in KConfig.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
---
 arch/powerpc/platforms/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Michael Ellerman - Nov. 17, 2009, 12:40 p.m.
On Tue, 2009-11-17 at 12:07 +0000, Mel Gorman wrote:
> It's possible to set CONFIG_XICS without CONFIG_PCI_MSI. When that
> happens, the kernel fails to build with
> 
> arch/powerpc/platforms/built-in.o: In function `.xics_startup':
> xics.c:(.text+0x12f60): undefined reference to `.unmask_msi_irq'
> make: *** [.tmp_vmlinux1] Error 1
> 
> This patch adds the dependency in KConfig.

Actually we should ifdef the code instead, XICS doesn't require MSI -
that code chunk just needs to be conditional.

cheers

Patch

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 04a8061..21a1fa1 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -52,7 +52,7 @@  config PPC_UDBG_BEAT
 	default n
 
 config XICS
-	depends on PPC_PSERIES
+	depends on PPC_PSERIES && PCI_MSI
 	bool
 	default y