diff options
author | jhb <jhb@FreeBSD.org> | 2012-03-01 19:58:34 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2012-03-01 19:58:34 +0000 |
commit | 5013ab31bdd0c853bd73031dd2246844cd9f9cfe (patch) | |
tree | c681791d9aa316edfa305bde95f3cea4802aee56 /sys/sys/malloc.h | |
parent | fbe3c228aa921805fe715fd6cd18c7f02d936815 (diff) | |
download | FreeBSD-src-5013ab31bdd0c853bd73031dd2246844cd9f9cfe.zip FreeBSD-src-5013ab31bdd0c853bd73031dd2246844cd9f9cfe.tar.gz |
- Change contigmalloc() to use the vm_paddr_t type instead of an unsigned
long for specifying a boundary constraint.
- Change bus_dma tags to use bus_addr_t instead of bus_size_t for boundary
constraints.
These allow boundary constraints to be fully expressed for cases where
sizeof(bus_addr_t) != sizeof(bus_size_t). Specifically, it allows a
driver to properly specify a 4GB boundary in a PAE kernel.
Note that this cannot be safely MFC'd without a lot of compat shims due
to KBI changes, so I do not intend to merge it.
Reviewed by: scottl
Diffstat (limited to 'sys/sys/malloc.h')
-rw-r--r-- | sys/sys/malloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index a6450b3..b0e1805 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -171,7 +171,7 @@ typedef void malloc_type_list_func_t(struct malloc_type *, void *); void contigfree(void *addr, unsigned long size, struct malloc_type *type); void *contigmalloc(unsigned long size, struct malloc_type *type, int flags, vm_paddr_t low, vm_paddr_t high, unsigned long alignment, - unsigned long boundary) __malloc_like; + vm_paddr_t boundary) __malloc_like; void free(void *addr, struct malloc_type *type); void *malloc(unsigned long size, struct malloc_type *type, int flags) __malloc_like; void malloc_init(void *); |