Module Name: src
Committed By: pgoyette
Date: Wed Dec 12 22:43:35 UTC 2012
Modified Files:
src/sys/arch/x86/x86: cpu.c
Log Message:
With recent introduction of conditionals for the various MP options, we
broke the build for x86 systems that have MULTIPROCESSOR but which do not
include MPBIOS. So let's try to untangle things just a bit. Presented
on current-users (and referenced on source-changes-d) without any comment.
XXX We really should find a better method to select kernel options; #ifdef
spaghetti is rather sub-optimal.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/x86/x86/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.101 src/sys/arch/x86/x86/cpu.c:1.102
--- src/sys/arch/x86/x86/cpu.c:1.101 Sat Dec 8 12:36:31 2012
+++ src/sys/arch/x86/x86/cpu.c Wed Dec 12 22:43:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.101 2012/12/08 12:36:31 kiyohara Exp $ */
+/* $NetBSD: cpu.c,v 1.102 2012/12/12 22:43:35 pgoyette Exp $ */
/*-
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.101 2012/12/08 12:36:31 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.102 2012/12/12 22:43:35 pgoyette Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -89,13 +89,16 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10
#include <uvm/uvm.h>
+#include "acpica.h" /* for NACPICA, for mp_verbose */
+
#include <machine/cpufunc.h>
#include <machine/cpuvar.h>
#include <machine/pmap.h>
#include <machine/vmparam.h>
-#if MPBIOS > 0
+#if defined(MULTIPROCESSOR)
#include <machine/mpbiosvar.h>
#endif
+#include <machine/mpconfig.h> /* for mp_verbose */
#include <machine/pcb.h>
#include <machine/specialreg.h>
#include <machine/segments.h>
