diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pci.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pci_map.c | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 6bd03cb39dd..3a0a1570557 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.97 2012/10/08 21:47:50 deraadt Exp $ */ +/* $OpenBSD: pci.c,v 1.98 2013/02/09 20:43:33 miod Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -820,13 +820,11 @@ pci_reserve_resources(struct pci_attach_args *pa) switch (type) { case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_32BIT: case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT: -#ifdef BUS_SPACE_MAP_PREFETCHABLE if (ISSET(flags, BUS_SPACE_MAP_PREFETCHABLE) && pa->pa_pmemex && extent_alloc_region(pa->pa_pmemex, base, size, EX_NOWAIT) == 0) { break; } -#endif if (pa->pa_memex && extent_alloc_region(pa->pa_memex, base, size, EX_NOWAIT)) { printf("%d:%d:%d: mem address conflict 0x%x/0x%x\n", diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c index 32ac4bfc4f5..f2478865345 100644 --- a/sys/dev/pci/pci_map.c +++ b/sys/dev/pci/pci_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_map.c,v 1.29 2010/09/06 12:30:35 kettenis Exp $ */ +/* $OpenBSD: pci_map.c,v 1.30 2013/02/09 20:43:33 miod Exp $ */ /* $NetBSD: pci_map.c,v 1.7 2000/05/10 16:58:42 thorpej Exp $ */ /*- @@ -249,11 +249,8 @@ obsd_pci_mem_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type, } if (flagsp != 0) *flagsp = -#ifdef BUS_SPACE_MAP_PREFETCHABLE PCI_MAPREG_MEM_PREFETCHABLE(address) ? - BUS_SPACE_MAP_PREFETCHABLE : -#endif - 0; + BUS_SPACE_MAP_PREFETCHABLE : 0; return (0); } |