diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-05-10 07:59:07 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-05-10 07:59:07 +0000 |
| commit | 4fc0744584b136b73eee0c8778f998813a5bab13 (patch) | |
| tree | 1b4e1a8d86cb187f0ab77fc76e0c80df80f95b43 /sys/arch/mac68k | |
| parent | 39c048cf21de365deb06f965b0af2dcc52f41fd4 (diff) | |
Some locking protocol fixes and better enforcement of wiring limits.
From NetBSD.
Diffstat (limited to 'sys/arch/mac68k')
| -rw-r--r-- | sys/arch/mac68k/dev/grf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c index cfc63247957..71e990f23a0 100644 --- a/sys/arch/mac68k/dev/grf.c +++ b/sys/arch/mac68k/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.10 2001/05/08 17:30:39 aaron Exp $ */ +/* $OpenBSD: grf.c,v 1.11 2001/05/10 07:59:05 art Exp $ */ /* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */ /* @@ -376,7 +376,8 @@ grfmap(dev, addrp, p) #if defined(UVM) error = uvm_mmap(&p->p_vmspace->vm_map, (vm_offset_t *)addrp, - (vm_size_t)len, VM_PROT_ALL, VM_PROT_ALL, flags, (caddr_t)&vn, 0); + (vm_size_t)len, VM_PROT_ALL, VM_PROT_ALL, flags, (caddr_t)&vn, 0 + p->p_rlimit[RLIMIT_MEMLOCK].rlim_cur); #else error = vm_mmap(&p->p_vmspace->vm_map, (vm_offset_t *) addrp, (vm_size_t) len, VM_PROT_ALL, VM_PROT_ALL, flags, (caddr_t) &vn, 0); |