diff options
author | jhb <jhb@FreeBSD.org> | 2000-10-20 07:43:55 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2000-10-20 07:43:55 +0000 |
commit | ab2c7bf24831714b92f839ddaf0043e2b85e8d96 (patch) | |
tree | 9a30fd64807891dc8ab8c385b534e78c9b95063c /sys | |
parent | d61f6536d559ce3db399f6c384ec101a597658c1 (diff) | |
download | FreeBSD-src-ab2c7bf24831714b92f839ddaf0043e2b85e8d96.zip FreeBSD-src-ab2c7bf24831714b92f839ddaf0043e2b85e8d96.tar.gz |
- machine/mutex.h -> sys/mutex.h
- Use cpu_throw() instead of cpu_switch() during cpu_exit() since we don't
need to save our previous state.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/amd64/vm_machdep.c | 4 | ||||
-rw-r--r-- | sys/i386/i386/vm_machdep.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 60c15a6..1984e69 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -58,12 +58,12 @@ #include <sys/vmmeter.h> #include <sys/kernel.h> #include <sys/ktr.h> +#include <sys/mutex.h> #include <sys/sysctl.h> #include <sys/unistd.h> #include <machine/cpu.h> #include <machine/md_var.h> -#include <machine/mutex.h> #ifdef SMP #include <machine/smp.h> #endif @@ -260,7 +260,7 @@ cpu_exit(p) mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH); mtx_assert(&Giant, MA_NOTOWNED); cnt.v_swtch++; - cpu_switch(); + cpu_throw(); panic("cpu_exit"); } diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 60c15a6..1984e69 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -58,12 +58,12 @@ #include <sys/vmmeter.h> #include <sys/kernel.h> #include <sys/ktr.h> +#include <sys/mutex.h> #include <sys/sysctl.h> #include <sys/unistd.h> #include <machine/cpu.h> #include <machine/md_var.h> -#include <machine/mutex.h> #ifdef SMP #include <machine/smp.h> #endif @@ -260,7 +260,7 @@ cpu_exit(p) mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH); mtx_assert(&Giant, MA_NOTOWNED); cnt.v_swtch++; - cpu_switch(); + cpu_throw(); panic("cpu_exit"); } |