From 8526bb5be9aa32da2672f24843a12776957ed898 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 19 Jun 2008 12:15:01 -0700 Subject: [PATCH] --- yaml --- r: 99775 b: refs/heads/master c: a4caa18efe468acb3522e30763de57a67b3e438b h: refs/heads/master i: 99773: 51541624ab297c5ce2145ca0fabcdb515dae9340 99771: a451ae2d4b0d96c7a14d34847105ecf92c8d480a 99767: 3c8624147a6cec5c45a3a3b5a10fc56a612dbd5b 99759: 0b3e603e9a7a92d87118cb4428468238ace1c29c 99743: d42542a51639e162c9cf232f078be56841e765d8 99711: 7b07a8d440b20ce21a608292b3abaa212f7f007a v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 2 +- trunk/arch/x86/mm/k8topology_64.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05cf791144d7..2b972dd21e81 100644 --- 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 index 0804a889c27b..25251799337f 100644 --- 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 index 1f476e477844..f75aa2ae54a3 100644 --- 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(); }