diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-06-23 12:29:46 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-06-23 12:29:46 +0000 |
| commit | 14371e470ab807b443273f49490c2e09f67cf67b (patch) | |
| tree | 018e2c7cd6f9ebb780e2a2e8740dd4675a89fec8 | |
| parent | Adapt bridge(4) to the new if_input() framework. (diff) | |
| download | wireguard-openbsd-14371e470ab807b443273f49490c2e09f67cf67b.tar.xz wireguard-openbsd-14371e470ab807b443273f49490c2e09f67cf67b.zip | |
delete more p==NULL checks; discussed with miod, kettenis, dlg before
| -rw-r--r-- | sys/arch/alpha/alpha/trap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c index fd8423d3d74..ad9373346ec 100644 --- a/sys/arch/alpha/alpha/trap.c +++ b/sys/arch/alpha/alpha/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.79 2015/06/05 16:59:10 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.80 2015/06/23 12:29:46 deraadt Exp $ */ /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */ /*- @@ -409,7 +409,7 @@ do_fault: * argument space is lazy-allocated. */ if (!user && (a0 >= VM_MIN_KERNEL_ADDRESS || - p == NULL || p->p_addr->u_pcb.pcb_onfault == 0)) { + p->p_addr->u_pcb.pcb_onfault == 0)) { vm = NULL; map = kernel_map; } else { @@ -433,8 +433,7 @@ do_fault: if (map != kernel_map && (caddr_t)va >= vm->vm_maxsaddr) { if (rv == 0) { - if (p != NULL) - uvm_grow(p, va); + uvm_grow(p, va); } else if (rv == EACCES) rv = EFAULT; } |