A few symbols remained in Kconfig.x86_64 where the

dependencies were different or the help text was

different from the i386 one.

Modify all relevant Kconfig.i386 symbols such that

they have X86_64 dependencies for x86_64 specific items

and update the help text as appropriate.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

---

 arch/x86/Kconfig.i386 |   51 ++++++++++++++++++++++++++++++++++++++++--------

 1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/arch/x86/Kconfig.i386 b/arch/x86/Kconfig.i386

index 890c258..4984904 100644

--- a/arch/x86/Kconfig.i386

+++ b/arch/x86/Kconfig.i386

@@ -307,9 +307,17 @@ source "arch/x86/Kconfig.cpu"

 config HPET_TIMER

 	bool

 	prompt "HPET Timer Support" if X86_32

+	default y if X86_64

 	help

-	  This enables the use of the HPET for the kernel's internal timer.

+	  Use the IA-PC HPET (High Precision Event Timer) to manage

+	  time in preference to the PIT and RTC, if a HPET is

+	  present.

 	  HPET is the next generation timer replacing legacy 8254s.

+          The HPET provides a stable time base on SMP

+	  systems, unlike the TSC, but it is more expensive to access,

+	  as it is off-chip.  You can find the HPET spec at

+	  <http://www.intel.com/hardwaredesign/hpetspec.htm>.

+

 	  You can safely choose Y here.  However, HPET will only be

 	  activated if the platform and the BIOS support this feature.

 	  Otherwise the 8254 will be used for timing services.

@@ -377,8 +385,8 @@ config NR_CPUS

 	default "8"

 	help

 	  This allows you to specify the maximum number of CPUs which this

-	  kernel will support.  The maximum supported value is 255 and the

-	  minimum value which makes sense is 2.

+	  kernel will support. Current maximum is 255 CPUs due to

+	  APIC addressing limits. Less depending on the hardware.
 	  This is purely to save memory - each supported CPU adds

 	  approximately eight kilobytes to the kernel image.

@@ -444,8 +452,10 @@ config X86_VISWS_APIC

 	default y
 config X86_MCE

-	bool "Ma...
[ message continues ]

With this change Kconifg now contain all config options

with a prompt. The rest is typical very ARCH specific setup.

There are room for additional unification of these symbols

but for now they are kep in the two files:

Kconfig.i386 and Kconfig.x86_64
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

---

 arch/x86/Kconfig        |  904 ++++++++++++++++++++++++++++

 arch/x86/Kconfig.i386   | 1500 ++++++++++-------------------------------------

 arch/x86/Kconfig.x86_64 | 1000 ++++++++++----------------------

 3 files changed, 1506 insertions(+), 1898 deletions(-)

 rewrite

arch/x86/Kconfig.i386 (87%)

 rewrite

arch/x86/Kconfig.x86_64 (77%)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig

index 0f08145..c325606 100644

--- a/arch/x86/Kconfig

+++ b/arch/x86/Kconfig

@@ -1,3 +1,907 @@

+

+source "init/Kconfig"

+

+menu "Processor type and features"

+

+source "kernel/time/Kconfig"

+

+config SMP

+	bool "Symmetric multi-processing support"

+	---help---

+	  This enables support for systems with more than one CPU. If you have

+	  a system with only one CPU, like most personal computers, say N. If

+	  you have a system with more than one CPU, say Y.

+

+	  If you say N here, the kernel will run on single and multiprocessor

+	  machines, but will use only one CPU of a multiprocessor machine. If

+	  you say Y here, the kernel will run on many, but not all,

+	  singleprocessor machines. On a singleprocessor machine, the kernel

+	  will run faster if you say N here.

+

+	  Note that if you say Y here and choose architecture "586" or

+	  "Pentium" under "Processor family", the kernel will not work on 486

+	  architectures. Similarly, multiprocessor kernels for the "PPro"

+	  architecture may not work on all Pentium based boards.

+

+	  People using multiprocessor machines who say Y here should also say

+	  Y to "Enhanced Real Time Clock Support", below. The "Advanced Power

+	  Management" code will be disabled if you say Y here.

+

+	  See also the <file:Documentation/smp.txt>...
[ message continues ]