diff options
| author | kib <kib@FreeBSD.org> | 2014-12-01 17:36:10 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-12-01 17:36:10 +0000 |
| commit | 1941346c9da7dde6f28d67d3053d7713294d012c (patch) | |
| tree | 2772ef4631f2ded191d1cd6a68770e7c263a1c68 | |
| parent | 5433f2d015ff533097afa7b2bc5e29d8463bf461 (diff) | |
| download | FreeBSD-src-1941346c9da7dde6f28d67d3053d7713294d012c.zip FreeBSD-src-1941346c9da7dde6f28d67d3053d7713294d012c.tar.gz | |
Disable recursion for the process spinlock.
Tested by: pho
Discussed with: jhb
Sponsored by: The FreeBSD Foundation
MFC after: 1 month
| -rw-r--r-- | sys/kern/kern_mutex.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_proc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index e1469b7..d21be50 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -968,7 +968,7 @@ mutex_init(void) mtx_init(&blocked_lock, "blocked lock", NULL, MTX_SPIN); blocked_lock.mtx_lock = 0xdeadc0de; /* Always blocked. */ mtx_init(&proc0.p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); - mtx_init(&proc0.p_slock, "process slock", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&proc0.p_slock, "process slock", NULL, MTX_SPIN); mtx_init(&proc0.p_statmtx, "pstatl", NULL, MTX_SPIN); mtx_init(&proc0.p_itimmtx, "pitiml", NULL, MTX_SPIN); mtx_init(&proc0.p_profmtx, "pprofl", NULL, MTX_SPIN); diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 009ccce..b6ac876 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -227,7 +227,7 @@ proc_init(void *mem, int size, int flags) p->p_sched = (struct p_sched *)&p[1]; bzero(&p->p_mtx, sizeof(struct mtx)); mtx_init(&p->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); - mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&p->p_slock, "process slock", NULL, MTX_SPIN); mtx_init(&p->p_statmtx, "pstatl", NULL, MTX_SPIN); mtx_init(&p->p_itimmtx, "pitiml", NULL, MTX_SPIN); mtx_init(&p->p_profmtx, "pprofl", NULL, MTX_SPIN); |
