---

yaml --- r: 99775 b: refs/heads/master c: a4caa18 h: refs/heads/master i: 99773: 5154162 99771: a451ae2 99767: 3c86241 99759: 0b3e603 99743: d42542a 99711: 7b07a8d v: v3
git-mirror · Jul 8, 2008 · 8526bb5 · 8526bb5
1 parent 6068e81
commit 8526bb5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6695c85b2e6f9f2e9ccaa8af38b72f5ab4a5184f
+refs/heads/master: a4caa18efe468acb3522e30763de57a67b3e438b
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -307,7 +307,7 @@ if X86_GENERICARCH
 
 config X86_NUMAQ
 	bool "NUMAQ (IBM/Sequent)"
-	depends on SMP && X86_32
+	depends on SMP && X86_32 && X86_MPPARSE
 	select NUMA
 	help
 	  This option is used for getting Linux to run on a NUMAQ (IBM/Sequent)

diff --git a/trunk/arch/x86/mm/k8topology_64.c b/trunk/arch/x86/mm/k8topology_64.c
@@ -56,18 +56,22 @@ static __init void early_get_boot_cpu_id(void)
 	/*
 	 * Find possible boot-time SMP configuration:
 	 */
+#ifdef CONFIG_X86_MPPARSE
 	early_find_smp_config();
+#endif
 #ifdef CONFIG_ACPI
 	/*
 	 * Read APIC information from ACPI tables.
 	 */
 	early_acpi_boot_init();
 #endif
+#ifdef CONFIG_X86_MPPARSE
 	/*
 	 * get boot-time SMP configuration:
 	 */
 	if (smp_found_config)
 		early_get_smp_config();
+#endif
 	early_init_lapic_mapping();
 }