diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-17 09:57:06 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-01-17 09:57:06 +0000 |
| commit | c70d4debfc3f5edbce7c754ec5949ab34519a1cb (patch) | |
| tree | ce19c4522ea2a199369a8f155823db5876a2fd0b /sys | |
| parent | ac09fd03216443f5ff3ce61c30d37983ae6aff1c (diff) | |
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>.
Diffstat (limited to 'sys')
| -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; |