If MP is disabled at the boot prompt, then don't use MPBIOS. When ACPI
is also disabled, this completely avoids using ioapics.
This commit is contained in:
parent
27a3fd2a36
commit
a7fbd437d1
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mpbios.c,v 1.42 2008/04/28 20:23:40 martin Exp $ */
|
||||
/* $NetBSD: mpbios.c,v 1.43 2008/04/30 23:25:49 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
|
@ -96,7 +96,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.42 2008/04/28 20:23:40 martin Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.43 2008/04/30 23:25:49 ad Exp $");
|
||||
|
||||
#include "acpi.h"
|
||||
#include "lapic.h"
|
||||
|
@ -109,12 +109,13 @@ __KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.42 2008/04/28 20:23:40 martin Exp $");
|
|||
#include <sys/kernel.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/reboot.h>
|
||||
|
||||
#include <uvm/uvm_extern.h>
|
||||
|
||||
#include <machine/specialreg.h>
|
||||
#include <machine/cpuvar.h>
|
||||
#include <machine/bus.h>
|
||||
#include <machine/mpbiosvar.h>
|
||||
#include <machine/pio.h>
|
||||
|
||||
|
@ -287,6 +288,10 @@ mpbios_probe(struct device *self)
|
|||
|
||||
struct mp_map t;
|
||||
|
||||
/* If MP is disabled, don't use MPBIOS or the ioapics. */
|
||||
if ((boothowto & RB_MD1) != 0)
|
||||
return 0;
|
||||
|
||||
/* see if EBDA exists */
|
||||
|
||||
mpbios_page = mpbios_map (0, PAGE_SIZE, &t);
|
||||
|
|
Loading…
Reference in New Issue