Module Name: src
Committed By: martin
Date: Sat Mar 10 14:35:05 UTC 2012
Modified Files:
src/sys/kern: kern_exec.c
Log Message:
Remove a KPREEMPT_ENABLE() in an error path I overlooked in the previous
change - pointed out by Manuel Bouyer.
While there, add a KASSERT() to make sure we have preemption enabled in
the success case.
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/sys/kern/kern_exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.345 src/sys/kern/kern_exec.c:1.346
--- src/sys/kern/kern_exec.c:1.345 Sat Mar 10 08:46:45 2012
+++ src/sys/kern/kern_exec.c Sat Mar 10 14:35:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.345 2012/03/10 08:46:45 martin Exp $ */
+/* $NetBSD: kern_exec.c,v 1.346 2012/03/10 14:35:05 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.345 2012/03/10 08:46:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.346 2012/03/10 14:35:05 martin Exp $");
#include "opt_exec.h"
#include "opt_ktrace.h"
@@ -1883,6 +1883,7 @@ spawn_return(void *arg)
/* we now have our own vmspace */
KPREEMPT_ENABLE(l);
+ KASSERT(l->l_nopreempt == 0);
/* done, signal parent */
mutex_enter(&spawn_data->sed_mtx_child);
@@ -1904,7 +1905,7 @@ spawn_return(void *arg)
KPREEMPT_DISABLE(l);
pmap_deactivate(l);
l->l_proc->p_vmspace = NULL;
- KPREEMPT_ENABLE(l);
+ /* do not enable preemption without vmspace */
}
/*
