summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2000-09-20 19:39:56 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2000-09-20 19:39:56 +0000
commit7d62fb68065f89cc02ba3e03ca0ea65b083962e5 (patch)
tree54ef97bee75d7498c4feb089576fd473882af1e1 /sys/arch/i386
parentabf01d6b129a731585d61dc43c365ce2fb5e79f3 (diff)
check out the bios device name we are probed w/ to not probe on apm
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/pci/pcibios.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index d5df6c265f5..9e06c998d28 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcibios.c,v 1.12 2000/09/07 20:50:39 mickey Exp $ */
+/* $OpenBSD: pcibios.c,v 1.13 2000/09/20 19:39:55 mickey Exp $ */
/* $NetBSD: pcibios.c,v 1.5 2000/08/01 05:23:59 uch Exp $ */
/*
@@ -167,10 +167,12 @@ pcibiosprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
+ struct bios_attach_args *ba = aux;
struct bios32_entry_info ei;
u_int32_t rev_maj, rev_min, mech1, mech2, scmech1, scmech2, maxbus;
- return (bios32_service(PCIBIOS_SIGNATURE, &pcibios_entry, &ei) &&
+ return (!strcmp(ba->bios_dev, "pcibios") &&
+ bios32_service(PCIBIOS_SIGNATURE, &pcibios_entry, &ei) &&
pcibios_get_status(NULL, &rev_maj, &rev_min, &mech1, &mech2,
&scmech1, &scmech2, &maxbus) == PCIBIOS_SUCCESS);
}