i386 APIC Kconfig cleanups
PATCH 1/1 i386 APIC Kconfig cleanups
This patch contains the following changes to arch/i386/Kconfig:
- update the X86_UP_APIC and X86_UP_IOAPIC help texts:
- in the SMP case, these options are not visible
- today, it's no longer only "a small number of uniprocessor systems" that have an IO-APIC
- there were two X86_LOCAL_APIC and two X86_IO_APIC options - in both cases, merge them
- move X86_VISWS_APIC to the other APIC options
Please review this patch (it shouldn't have any visible effects).
Signed-off-by Adrian Bunk <[email protected]>
---
arch/i386/Kconfig | 41 +++++++++++++---------------------------- 1 files changed, 13 insertions(+), 28 deletions(-)
This patch was already sent on:
- 21 Nov 2004
arch/i386/Kconfig renamed from arch/i386/Kconfig.old +13 -28
@@ -514,9 +514,9 @@ or real-time system. Say N if you are unsure. config X86_UP_APIC - bool "Local APIC support on uniprocessors" if !SMP - depends on !(X86_VISWS || X86_VOYAGER) - ---help--- + bool "Local APIC support on uniprocessors" + depends on !SMP && !(X86_VISWS || X86_VOYAGER) + help A local APIC (Advanced Programmable Interrupt Controller) is an integrated interrupt controller in the CPU. If you have a single-CPU system which has a processor with a local APIC, you can say Y here to
@@ -526,31 +526,31 @@ performance counters), and the NMI watchdog which detects hard lockups. - If you have a system with several CPUs, you do not need to say Y - here: the local APIC will be used automatically. - config X86_UP_IOAPIC bool "IO-APIC support on uniprocessors" - depends on !SMP && X86_UP_APIC + depends on X86_UP_APIC help An IO-APIC (I/O Advanced Programmable Interrupt Controller) is an SMP-capable replacement for PC-style interrupt controllers. Most - SMP systems and a small number of uniprocessor systems have one. + SMP systems and many recent uniprocessor systems have one. + If you have a single-CPU system with an IO-APIC, you can say Y here to use it. If you say Y here even though your machine doesn't have an IO-APIC, then the kernel will still run with no slowdown at all. - If you have a system with several CPUs, you do not need to say Y - here: the IO-APIC will be used automatically. - config X86_LOCAL_APIC bool - depends on !SMP && X86_UP_APIC + depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) default y config X86_IO_APIC bool - depends on !SMP && X86_UP_IOAPIC + depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) + default y + +config X86_VISWS_APIC + bool + depends on X86_VISWS default y config X86_TSC
@@ -1038,21 +1038,6 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" -config X86_VISWS_APIC - bool - depends on X86_VISWS - default y - -config X86_LOCAL_APIC - bool - depends on (X86_VISWS || SMP) && !X86_VOYAGER - default y - -config X86_IO_APIC - bool - depends on SMP && !(X86_VISWS || X86_VOYAGER) - default y - config PCI bool "PCI support" if !X86_VISWS depends on !X86_VOYAGER