]> err.no Git - linux-2.6/commitdiff
x86: fix compiling when CONFIG_X86_MPPARSE is not set
authorYinghai Lu <yhlu.kernel@gmail.com>
Thu, 19 Jun 2008 19:15:01 +0000 (12:15 -0700)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 08:39:19 +0000 (10:39 +0200)
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
arch/x86/mm/k8topology_64.c

index 0804a889c27b883c3cf05c60094a8ee6b052fc90..25251799337f55e65c49481d1fb4b0e23206751a 100644 (file)
@@ -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)
index 1f476e477844df02d09f21ec23ddb8f5084c4cba..f75aa2ae54a388e555fb65bba64c29c1158ef74d 100644 (file)
@@ -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();
 }