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

Minor correction to previous.

This commit is contained in:
ad 2008-04-29 19:19:29 +00:00
parent 9a4949249f
commit 5804d4a96d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/amd64/amd64/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.22 2008/04/29 19:18:19 ad Exp $ */
/* $NetBSD: mainbus.c,v 1.23 2008/04/29 19:19:29 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.22 2008/04/29 19:18:19 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.23 2008/04/29 19:19:29 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -167,7 +167,7 @@ mainbus_attach(device_t parent, device_t self, void *aux)
#endif
#if NACPI > 0
if ((boothowto & RB_MD1) == 0 && acpi_check(self, "acpibus"))
if ((boothowto & RB_MD2) == 0 && acpi_check(self, "acpibus"))
acpi_present = acpi_probe();
/*
* First, see if the MADT contains CPUs, and possibly I/O APICs.

6
sys/arch/i386/i386/mainbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mainbus.c,v 1.75 2008/04/29 19:18:19 ad Exp $ */
/* $NetBSD: mainbus.c,v 1.76 2008/04/29 19:19:29 ad Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.75 2008/04/29 19:18:19 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.76 2008/04/29 19:19:29 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -229,7 +229,7 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
#endif
#if NACPI > 0
if ((boothowto & RB_MD1) == 0 && acpi_check(self, "acpibus"))
if ((boothowto & RB_MD2) == 0 && acpi_check(self, "acpibus"))
acpi_present = acpi_probe();
/*
* First, see if the MADT contains CPUs, and possibly I/O APICs.

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

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.35 2008/04/29 19:18:19 ad Exp $ */
/* $NetBSD: cpu.c,v 1.36 2008/04/29 19:19:29 ad Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.35 2008/04/29 19:18:19 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.36 2008/04/29 19:19:29 ad Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@ -286,7 +286,7 @@ cpu_attach(device_t parent, device_t self, void *aux)
* structure, otherwise use the primary's.
*/
if (caa->cpu_role == CPU_ROLE_AP) {
if ((boothowto & RB_MD2) != 0) {
if ((boothowto & RB_MD1) != 0) {
aprint_error(": multiprocessor boot disabled\n");
return;
}