[src/trunk]: src/sys/uvm Fix another merge botch - bracket vm space assigneme...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b1c9498e783f
branches:  trunk
changeset: 773675:b1c9498e783f
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Feb 12 20:28:14 2012 +0000

description:
Fix another merge botch - bracket vm space assignement with kpreempt-
disable/enable.

diffstat:

 sys/uvm/uvm_map.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r c6a934013688 -r b1c9498e783f sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Sun Feb 12 20:11:03 2012 +0000
+++ b/sys/uvm/uvm_map.c Sun Feb 12 20:28:14 2012 +0000
@@ -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 @@
         * 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;
        }