--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Feb 07, 2006 at 03:39:56PM +0100, Nicolas Joly wrote:
> Hi,
> 
> I just updated my -current sources, rebuilded my kernel, and noticed
> some strange PCI messages at boot (full dmesg attached).
> 
> Where i previously had 5 PCI busses, the kernel now detect 9
> busses. Some of them looks like ghost of real ones; by example, pci5
> report devices from pci2 :
> 
> It seems that that the `pci_machdep.c' vs. `pci_intr_machdep.c' change
> triggers this new behaviour; i tried to revert it and all PCI were
> fine again.
> 
> Any idea of what's going on ?

Looks like I removed too much includes. I just commited the attached
patch, this should fix the issue.


-- 
Manuel Bouyer <bouyer@antioche.eu.org>
     NetBSD: 26 ans d'experience feront toujours la difference
--

--Q68bSM7Ycu6FN28Q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pci_machdep.c,v
retrieving revision 1.13
diff -u -r1.13 pci_machdep.c
--- pci_machdep.c	3 Feb 2006 19:58:21 -0000	1.13
+++ pci_machdep.c	7 Feb 2006 20:05:38 -0000
@@ -103,6 +103,17 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
+#include "opt_mpbios.h"
+#include "opt_mpacpi.h"
+
+#ifdef MPBIOS
+#include <machine/mpbiosvar.h>
+#endif
+
+#ifdef MPACPI
+#include <machine/mpacpi.h>
+#endif
+
 #include "opt_pci_conf_mode.h"
 
 int pci_mode = -1;

--Q68bSM7Ycu6FN28Q--