Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 823c248e authored by Roman Zippel's avatar Roman Zippel Committed by Ingo Molnar
Browse files

x86: fix recursive dependencies 



The proper dependency check uncovered a few dependency problems,
the subarchitecture used a mixture of selects and depends on SMP
and PCI dependency was messed up.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 81e103f1

arch/x86/Kconfig

+4 −6
Original line number Diff line number Diff line
@@ -241,8 +241,7 @@ config X86_ELAN 


config X86_VOYAGER

	bool "Voyager (NCR)"

	depends on X86_32

	select SMP if !BROKEN

	depends on X86_32 && (SMP || BROKEN)

	help

	  Voyager is an MCA-based 32-way capable SMP architecture proprietary

	  to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -254,9 +253,8 @@ config X86_VOYAGER 


config X86_NUMAQ

	bool "NUMAQ (IBM/Sequent)"

	select SMP

	depends on SMP && X86_32

	select NUMA

	depends on X86_32

	help

	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA

	  multiquad box. This changes the way that processors are bootstrapped,
@@ -327,8 +325,8 @@ config X86_RDC321X 


config X86_VSMP

	bool "Support for ScaleMP vSMP"

	depends on X86_64 && PCI

	select PARAVIRT

	depends on X86_64

	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
@@ -1380,7 +1378,7 @@ endmenu 
menu "Bus options (PCI etc.)"



config PCI

	bool "PCI support" if !X86_VISWS

	bool "PCI support" if !X86_VISWS && !X86_VSMP

	depends on !X86_VOYAGER

	default y

	select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)