diff options
| author |   dlg <dlg@openbsd.org> | 2019-06-08 10:27:02 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-06-08 10:27:02 +0000 |
| commit | 9864457bc4ebff253d37bf662568b1023915c899 (patch) | |
| tree | 411c47d5cddd408eab00bcf77990b51d5ddc424b | |
| parent | In rsa.h rev. 1.40, gilles@ provided several new RSA_METHOD accessors. (diff) | |
| download | wireguard-openbsd-9864457bc4ebff253d37bf662568b1023915c899.tar.xz wireguard-openbsd-9864457bc4ebff253d37bf662568b1023915c899.zip | |
disambiguate memory extent conflicts for membars and rom addresses
there's some more work to do in this space, but this helps us start.
ok kettenis@
| -rw-r--r-- | sys/dev/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 1ece6e3526d..ecb59cd7962 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.112 2018/07/28 15:28:51 kettenis Exp $ */ +/* $OpenBSD: pci.c,v 1.113 2019/06/08 10:27:02 dlg Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -911,7 +911,7 @@ pci_reserve_resources(struct pci_attach_args *pa) base, size, EX_NOWAIT) && pa->pa_memex && extent_alloc_region(pa->pa_memex, base, size, EX_NOWAIT)) { - printf("%d:%d:%d: mem address conflict 0x%lx/0x%lx\n", + printf("%d:%d:%d: rom address conflict 0x%lx/0x%lx\n", bus, dev, func, base, size); pci_conf_write(pc, tag, PCI_ROM_REG, 0); } |