diff options
| author |   art <art@openbsd.org> | 2010-07-02 01:25:05 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2010-07-02 01:25:05 +0000 |
| commit | 42096da3ae4c342a82999d07ee4cdfde744caa0f (patch) | |
| tree | ea95543e8547ac6f46ec0a436995b369890079c0 /sys/kern/kern_malloc.c | |
| parent | Drop the uvm_km_pages.mtx mutex in uvm_km_putpage before we free va's, (diff) | |
| download | wireguard-openbsd-42096da3ae4c342a82999d07ee4cdfde744caa0f.tar.xz wireguard-openbsd-42096da3ae4c342a82999d07ee4cdfde744caa0f.zip | |
add an align argument to uvm_km_kmemalloc_pla.
Use uvm_km_kmemalloc_pla with the dma constraint to allocate kernel stacks.
Yes, that means DMA is possible to kernel stacks, but only until we've fixed
all the scary drivers.
deraadt@ ok
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 68186a63cab..afc39fe6790 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.82 2010/07/01 19:51:13 thib Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.83 2010/07/02 01:25:05 art Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -234,7 +234,7 @@ malloc(unsigned long size, int type, int flags) allocsize = 1 << indx; npg = atop(round_page(allocsize)); va = (caddr_t)uvm_km_kmemalloc_pla(kmem_map, NULL, - (vsize_t)ptoa(npg), + (vsize_t)ptoa(npg), 0, ((flags & M_NOWAIT) ? UVM_KMF_NOWAIT : 0) | ((flags & M_CANFAIL) ? UVM_KMF_CANFAIL : 0), dma_constraint.ucr_low, dma_constraint.ucr_high, |