|
@@ -642,7 +642,7 @@ source "kernel/Kconfig.preempt"
|
|
|
|
|
|
config X86_UP_APIC
|
|
|
bool "Local APIC support on uniprocessors"
|
|
|
- depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH)
|
|
|
+ depends on X86_32 && !SMP && !X86_GENERICARCH
|
|
|
help
|
|
|
A local APIC (Advanced Programmable Interrupt Controller) is an
|
|
|
integrated interrupt controller in the CPU. If you have a single-CPU
|
|
@@ -667,11 +667,11 @@ config X86_UP_IOAPIC
|
|
|
|
|
|
config X86_LOCAL_APIC
|
|
|
def_bool y
|
|
|
- depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
|
|
|
+ depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC
|
|
|
|
|
|
config X86_IO_APIC
|
|
|
def_bool y
|
|
|
- depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH))
|
|
|
+ depends on X86_64 || SMP || X86_GENERICARCH || X86_UP_APIC
|
|
|
|
|
|
config X86_VISWS_APIC
|
|
|
def_bool y
|