---

yaml --- r: 99774 b: refs/heads/master c: 6695c85 h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · 6068e81 · 6068e81
1 parent 5154162
commit 6068e81
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcfa146e412023dd55f8855f240b2c2082dc1baa
+refs/heads/master: 6695c85b2e6f9f2e9ccaa8af38b72f5ab4a5184f
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -230,6 +230,27 @@ config SMP
 
 	  If you don't know what to do here, say N.
 
+config X86_FIND_SMP_CONFIG
+	def_bool y
+	depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
+	depends on X86_32
+
+if ACPI
+config X86_MPPARSE
+	def_bool y
+	bool "Enable MPS table"
+	depends on ((X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64)
+	help
+	  For old smp systems that do not have proper acpi support. Newer systems
+	  (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
+endif
+
+if !ACPI
+config X86_MPPARSE
+	def_bool y
+	depends on ((X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64)
+endif
+
 choice
 	prompt "Subarchitecture Type"
 	default X86_PC

diff --git a/trunk/arch/x86/Kconfig.debug b/trunk/arch/x86/Kconfig.debug
@@ -129,15 +129,6 @@ config 4KSTACKS
 	  on the VM subsystem for higher order allocations. This option
 	  will also use IRQ stacks to compensate for the reduced stackspace.
 
-config X86_FIND_SMP_CONFIG
-	def_bool y
-	depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
-	depends on X86_32
-
-config X86_MPPARSE
-	def_bool y
-	depends on (X86_32 && (X86_LOCAL_APIC && !X86_VISWS)) || X86_64
-
 config DOUBLEFAULT
 	default y
 	bool "Enable doublefault exception handler" if EMBEDDED