Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
pgoyette 2012-12-12 22:43:35 +00:00
parent ef08078473
commit c768421a3a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/x86/x86/cpu.c
View File

@ -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. * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #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_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */ #include "opt_mpbios.h" /* for MPDEBUG */
@ -89,13 +89,16 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.101 2012/12/08 12:36:31 kiyohara Exp $");
#include <uvm/uvm.h> #include <uvm/uvm.h>
#include "acpica.h" /* for NACPICA, for mp_verbose */
#include <machine/cpufunc.h> #include <machine/cpufunc.h>
#include <machine/cpuvar.h> #include <machine/cpuvar.h>
#include <machine/pmap.h> #include <machine/pmap.h>
#include <machine/vmparam.h> #include <machine/vmparam.h>
#if MPBIOS > 0 #if defined(MULTIPROCESSOR)
#include <machine/mpbiosvar.h> #include <machine/mpbiosvar.h>
#endif #endif
#include <machine/mpconfig.h> /* for mp_verbose */
#include <machine/pcb.h> #include <machine/pcb.h>
#include <machine/specialreg.h> #include <machine/specialreg.h>
#include <machine/segments.h> #include <machine/segments.h>