diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-06 17:05:47 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-06-06 17:05:47 +0000 |
| commit | d2a285457d0c89bdbfc900ff091099f892e0e4f4 (patch) | |
| tree | 90f9b8cebefe6f5dfc9454e898129245c5465f75 /sys/kern | |
| parent | 95bb94cc96431b31e24edf923367b4cf20dc7bc4 (diff) | |
push kernel malloc(9) and kernel stacks into non-dma memory, since that
appears to be safe now. If not, we'll know soon where the bugs lie, so
that we can fix them. This diff has been in snapshots for many months.
ok oga miod
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_fork.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_malloc.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 1753df4bbf3..ebdc5a53a24 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.125 2011/04/03 14:56:28 guenther Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.126 2011/06/06 17:05:46 deraadt Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -253,7 +253,7 @@ fork1(struct proc *p1, int exitsig, int flags, void *stack, size_t stacksize, uaddr = uvm_km_kmemalloc_pla(kernel_map, uvm.kernel_object, USPACE, USPACE_ALIGN, UVM_KMF_ZERO, - dma_constraint.ucr_low, dma_constraint.ucr_high, + no_constraint.ucr_low, no_constraint.ucr_high, 0, 0, USPACE/PAGE_SIZE); if (uaddr == 0) { chgproccnt(uid, -1); diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index cfdfe419efd..2912fd97c4c 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.87 2011/05/24 15:27:36 ariane Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.88 2011/06/06 17:05:46 deraadt Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -244,7 +244,7 @@ malloc(unsigned long size, int type, int flags) (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, + no_constraint.ucr_low, no_constraint.ucr_high, 0, 0, 0); if (va == NULL) { /* |