From: Adrian Bunk <bunk@stusta.de>
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
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/i386/Kconfig | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff -puN arch/i386/Kconfig~i386-apic-kconfig-cleanups arch/i386/Kconfig
--- 25/arch/i386/Kconfig~i386-apic-kconfig-cleanups 2005-02-22 18:19:45.000000000 -0800
+++ 25-akpm/arch/i386/Kconfig 2005-02-22 18:19:45.000000000 -0800
@@ -529,9 +529,9 @@ config PREEMPT_BKL
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
@@ -541,31 +541,31 @@ config X86_UP_APIC
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
@@ -1120,21 +1120,6 @@ endmenu
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
_