Module Name: src
Committed By: drochner
Date: Wed Jan 18 21:34:38 UTC 2012
Modified Files:
src/sys/arch/i386/i386: mainbus.c
Log Message:
revert previous, the assumption "all buses 1 and up must be subordinate
to pci0" doesn't even hold on i386 -- there are server-class chipsets
with multiple primary PCI buses, see arch/x86/pci/pchb.c for examples
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/i386/i386/mainbus.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/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.92 src/sys/arch/i386/i386/mainbus.c:1.93
--- src/sys/arch/i386/i386/mainbus.c:1.92 Fri Oct 21 21:35:28 2011
+++ src/sys/arch/i386/i386/mainbus.c Wed Jan 18 21:34:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.92 2011/10/21 21:35:28 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.93 2012/01/18 21:34:38 drochner 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.92 2011/10/21 21:35:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.93 2012/01/18 21:34:38 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -406,7 +406,6 @@ mainbus_rescan(device_t self, const char
mba.mba_pba.pba_pc = NULL;
mba.mba_pba.pba_flags = pci_bus_flags();
mba.mba_pba.pba_bus = 0;
- mba.mba_pba.pba_sub = 255;
mba.mba_pba.pba_bridgetag = NULL;
#if NACPICA > 0 && defined(ACPI_SCANPCI)
if (npcibus == 0 && sc->sc_mpacpi_active)