Module Name: src
Committed By: uebayasi
Date: Thu Nov 27 14:22:09 UTC 2014
Modified Files:
src/sys/arch/x86/x86: fpu.c pmap.c
Log Message:
Consistently use kpreempt_*() outside scheduler path.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.185 -r1.186 src/sys/arch/x86/x86/pmap.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/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.9 src/sys/arch/x86/x86/fpu.c:1.10
--- src/sys/arch/x86/x86/fpu.c:1.9 Tue Feb 25 22:16:52 2014
+++ src/sys/arch/x86/x86/fpu.c Thu Nov 27 14:22:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.9 2014/02/25 22:16:52 dsl Exp $ */
+/* $NetBSD: fpu.c,v 1.10 2014/11/27 14:22:09 uebayasi Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.9 2014/02/25 22:16:52 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.10 2014/11/27 14:22:09 uebayasi Exp $");
#include "opt_multiprocessor.h"
@@ -408,7 +408,7 @@ fpudna(struct trapframe *frame)
/* Save our state if on a remote CPU. */
if (pcb->pcb_fpcpu != NULL) {
/* Explicitly disable preemption before dropping spl. */
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
splx(s);
/* Actually enable interrupts */
@@ -417,7 +417,7 @@ fpudna(struct trapframe *frame)
fpusave_lwp(l, true);
KASSERT(pcb->pcb_fpcpu == NULL);
s = splhigh();
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
}
/*
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.185 src/sys/arch/x86/x86/pmap.c:1.186
--- src/sys/arch/x86/x86/pmap.c:1.185 Sat Nov 22 06:45:08 2014
+++ src/sys/arch/x86/x86/pmap.c Thu Nov 27 14:22:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.185 2014/11/22 06:45:08 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.186 2014/11/27 14:22:09 uebayasi Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.185 2014/11/22 06:45:08 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.186 2014/11/27 14:22:09 uebayasi Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2915,7 +2915,7 @@ pmap_extract(struct pmap *pmap, vaddr_t
pa = 0;
l = curlwp;
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
ci = l->l_cpu;
if (__predict_true(!ci->ci_want_pmapload && ci->ci_pmap == pmap) ||
pmap == pmap_kernel()) {
@@ -2948,7 +2948,7 @@ pmap_extract(struct pmap *pmap, vaddr_t
if (__predict_false(hard)) {
pmap_unmap_ptes(pmap, pmap2);
}
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
if (pap != NULL) {
*pap = pa;
}
@@ -4395,7 +4395,7 @@ pmap_update(struct pmap *pmap)
* If we have torn down this pmap, invalidate non-global TLB
* entries on any processors using it.
*/
- KPREEMPT_DISABLE(l);
+ kpreempt_disable();
if (__predict_false(l->l_md.md_gc_pmap == pmap)) {
l->l_md.md_gc_pmap = NULL;
pmap_tlb_shootdown(pmap, (vaddr_t)-1LL, 0, TLBSHOOT_UPDATE);
@@ -4405,7 +4405,7 @@ pmap_update(struct pmap *pmap)
* complete before returning control to the caller.
*/
pmap_tlb_shootnow();
- KPREEMPT_ENABLE(l);
+ kpreempt_enable();
/*
* Now that shootdowns are complete, process deferred frees,
