[PATCH] fix the subarch build again after ACPI breakage

From: James Bottomley
Date: Fri Apr 02 2004 - 13:38:43 EST


This patch:


ChangeSet@xxxxxxxxxxx, 2004-03-17 00:44:22-05:00, len.brown@xxxxxxxxx
[ACPI] check "maxcpus=N" early -- same as NR_CPUS check.
http://bugzilla.kernel.org/show_bug.cgi?id=2317

Broke by putting maxcpus (a variable which is only exported by
mpparse.c) into parse_cmdline_early().

The fix is to make it depend on the correct CONFIG_ option.

In the subarchitectures:

CONFIG_X86_SMP is the one that means "I want standard x86 smp code" and
that's what this should depend on.

James

===== arch/i386/kernel/setup.c 1.114 vs edited =====
--- 1.114/arch/i386/kernel/setup.c Mon Mar 22 15:03:22 2004
+++ edited/arch/i386/kernel/setup.c Fri Apr 2 12:21:43 2004
@@ -560,7 +560,7 @@
}
}

-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_SMP
/*
* If the BIOS enumerates physical processors before logical,
* maxcpus=N at enumeration-time can be used to disable HT.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/