Re: x86/pci: Broken build for X86_VISWS

[Ingo Molnar]

* Robert Richter <robert.richter@xxxxxxx> wrote:

> Ingo,
> 
> during testing of my pci changes I observed a build error if X86_VISWS 
> is set:
> 
> arch/x86/mach-visws/built-in.o: In function `machine_power_off':
> (.text+0x48): undefined reference to `pci_bus0'
> make[1]: *** [.tmp_vmlinux1] Error 1
> make: *** [sub-make] Error 2
> 
> The root cause is disabling PCI dependencies in change 1ac97018 that 
> disables compilation of x86/pci for VISWS though there are files in 
> needed to build. I am not sure if it is save to enable PCI for VISWS 
> to fix this.
> 
> Could you take a look at this?

well spotted. Does the patch below fix it for you?

	Ingo

------------------------->
commit 50e810529abfb39259c2877ed8dc784a4bb81167
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Thu Jul 10 12:21:58 2008 +0200

    x86: fix visws and vsmp build
    
    these two sub-architectures want PCI to be default-on, not default-off.
    
    Reported-by: Robert Richter <robert.richter@xxxxxxx>
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 4d85501..c8f7fb6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -287,7 +287,7 @@ config X86_VOYAGER
 
 config X86_VISWS
 	bool "SGI 320/540 (Visual Workstation)"
-	depends on X86_32 && !PCI
+	depends on X86_32 && PCI
 	help
 	  The SGI Visual Workstation series is an IA32-based workstation
 	  based on SGI systems chips with some legacy PC hardware attached.
@@ -359,7 +359,7 @@ config X86_RDC321X
 config X86_VSMP
 	bool "Support for ScaleMP vSMP"
 	select PARAVIRT
-	depends on X86_64 && !PCI
+	depends on X86_64 && PCI
 	help
 	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
 	  supposed to run on these EM64T-based machines.  Only choose this option

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/