diff options
| author |   niklas <niklas@openbsd.org> | 1998-01-17 09:57:05 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1998-01-17 09:57:05 +0000 |
| commit | 9b0a99c573452cc571e4dfd163f55bdba5a68032 (patch) | |
| tree | d47f96c8cbff84a1d701c526bcc27ef6858e51ba | |
| parent | Add rcsid tags. (diff) | |
| download | wireguard-openbsd-9b0a99c573452cc571e4dfd163f55bdba5a68032.tar.xz wireguard-openbsd-9b0a99c573452cc571e4dfd163f55bdba5a68032.zip | |
Merge from NetBSD, thorpej@netbsd.org says:
The boundary argument to bus_space_alloc() should be a bus_size_t, not
a bus_addr_t. Pointed out by Chris Demetriou <cgd@cs.cmu.edu>.
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 61230873797..04ad65d6059 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,5 +1,5 @@ -/* $OpenBSD: machdep.c,v 1.74 1998/01/12 20:54:02 weingart Exp $ */ -/* $NetBSD: machdep.c,v 1.202 1996/05/18 15:54:59 christos Exp $ */ +/* $OpenBSD: machdep.c,v 1.75 1998/01/17 09:57:05 niklas Exp $ */ +/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- * Copyright (c) 1993, 1994, 1995, 1996 Charles M. Hannum. All rights reserved. @@ -1828,8 +1828,7 @@ bus_space_alloc(t, rstart, rend, size, alignment, boundary, cacheable, bpap, bshp) bus_space_tag_t t; bus_addr_t rstart, rend; - bus_size_t size, alignment; - bus_addr_t boundary; + bus_size_t size, alignment, boundary; int cacheable; bus_addr_t *bpap; bus_space_handle_t *bshp; |