lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: fix recursive dependencies

Browse Source 
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: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Roman Zippel
2008-02-29 05:09:02 +01:00
committed by Ingo Molnar
parent 81e103f1f1
commit 823c248e7c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86/Kconfig
View File

@@ -241,8 +241,7 @@ config X86_ELAN
config X86_VOYAGER config X86_VOYAGER
bool "Voyager (NCR)" bool "Voyager (NCR)"
depends on X86_32 depends on X86_32 && (SMP || BROKEN)
select SMP if !BROKEN
help help
Voyager is an MCA-based 32-way capable SMP architecture proprietary Voyager is an MCA-based 32-way capable SMP architecture proprietary
to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -254,9 +253,8 @@ config X86_VOYAGER
config X86_NUMAQ config X86_NUMAQ
bool "NUMAQ (IBM/Sequent)" bool "NUMAQ (IBM/Sequent)"
select SMP depends on SMP && X86_32
select NUMA select NUMA
depends on X86_32
help help
This option is used for getting Linux to run on a (IBM/Sequent) NUMA This option is used for getting Linux to run on a (IBM/Sequent) NUMA
multiquad box. This changes the way that processors are bootstrapped, multiquad box. This changes the way that processors are bootstrapped,
@@ -327,8 +325,8 @@ config X86_RDC321X
config X86_VSMP config X86_VSMP
bool "Support for ScaleMP vSMP" bool "Support for ScaleMP vSMP"
depends on X86_64 && PCI
select PARAVIRT select PARAVIRT
depends on X86_64
help help
Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
supposed to run on these EM64T-based machines. Only choose this option supposed to run on these EM64T-based machines. Only choose this option
@@ -1380,7 +1378,7 @@ endmenu
menu "Bus options (PCI etc.)" menu "Bus options (PCI etc.)"
config PCI config PCI
bool "PCI support" if !X86_VISWS bool "PCI support" if !X86_VISWS && !X86_VSMP
depends on !X86_VOYAGER depends on !X86_VOYAGER
default y default y
select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)