Fix another merge botch - bracket vm space assignement with kpreempt-

disable/enable.
This commit is contained in:
martin 2012-02-12 20:28:14 +00:00
parent f4db024f0d
commit 7e9aef18d8
1 changed files with 6 additions and 3 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.c,v 1.312 2012/01/28 00:00:06 rmind Exp $ */
/* $NetBSD: uvm_map.c,v 1.313 2012/02/12 20:28:14 martin Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.312 2012/01/28 00:00:06 rmind Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.313 2012/02/12 20:28:14 martin Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@ -4056,8 +4056,11 @@ uvmspace_exec(struct lwp *l, vaddr_t start, vaddr_t end)
* no races possible in this case.
*/
if (ovm == NULL) {
p->p_vmspace = uvmspace_alloc(start, end);
ovm = uvmspace_alloc(start, end);
kpreempt_disable();
p->p_vmspace = ovm;
pmap_activate(l);
kpreempt_enable();
return;
}