diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/i386/pci/pci_addr_fixup.c | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 3dd8b3784dd..f57f741123f 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.166 2001/06/29 19:56:37 jason Exp $ */ +/* $OpenBSD: machdep.c,v 1.167 2001/07/05 10:00:30 art Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -476,9 +476,6 @@ allocsys(v) #define valloc(name, type, num) \ v = (caddr_t)(((name) = (type *)v) + (num)) -#ifdef REAL_CLISTS - valloc(cfree, struct cblock, nclist); -#endif valloc(timeouts, struct timeout, ntimeout); #ifdef SYSVSHM valloc(shmsegs, struct shmid_ds, shminfo.shmmni); @@ -2612,7 +2609,7 @@ bus_space_alloc(t, rstart, rend, size, alignment, boundary, cacheable, /* * Do the requested allocation. */ - error = extent_alloc_subregion(ex, rstart, rend, size, alignment, + error = extent_alloc_subregion(ex, rstart, rend, size, alignment, 0, boundary, EX_NOWAIT | (ioport_malloc_safe ? EX_MALLOCOK : 0), &bpa); diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c index a6f58407f91..e19ee40a952 100644 --- a/sys/arch/i386/pci/pci_addr_fixup.c +++ b/sys/arch/i386/pci/pci_addr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_addr_fixup.c,v 1.10 2001/06/17 21:11:12 mickey Exp $ */ +/* $OpenBSD: pci_addr_fixup.c,v 1.11 2001/07/05 10:00:33 art Exp $ */ /* $NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $ */ /*- @@ -291,7 +291,7 @@ pciaddr_do_resource_allocate(sc, pc, tag, mapreg, ex, type, addr, size) PCIBIOS_PRINTV(("No available resources. fixup failed\n")); return (1); } - error = extent_alloc_subregion(ex, start, ex->ex_end, size, size, 0, + error = extent_alloc_subregion(ex, start, ex->ex_end, size, size, 0, 0, EX_FAST|EX_NOWAIT|EX_MALLOCOK, addr); if (error) { PCIBIOS_PRINTV(("No available resources. fixup failed\n")); |