- 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.
This commit is contained in:
parent
d61f6536d5
commit
ab2c7bf248
@ -58,12 +58,12 @@
|
|||||||
#include <sys/vmmeter.h>
|
#include <sys/vmmeter.h>
|
||||||
#include <sys/kernel.h>
|
#include <sys/kernel.h>
|
||||||
#include <sys/ktr.h>
|
#include <sys/ktr.h>
|
||||||
|
#include <sys/mutex.h>
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
#include <sys/unistd.h>
|
#include <sys/unistd.h>
|
||||||
|
|
||||||
#include <machine/cpu.h>
|
#include <machine/cpu.h>
|
||||||
#include <machine/md_var.h>
|
#include <machine/md_var.h>
|
||||||
#include <machine/mutex.h>
|
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
#include <machine/smp.h>
|
#include <machine/smp.h>
|
||||||
#endif
|
#endif
|
||||||
@ -260,7 +260,7 @@ cpu_exit(p)
|
|||||||
mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH);
|
mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH);
|
||||||
mtx_assert(&Giant, MA_NOTOWNED);
|
mtx_assert(&Giant, MA_NOTOWNED);
|
||||||
cnt.v_swtch++;
|
cnt.v_swtch++;
|
||||||
cpu_switch();
|
cpu_throw();
|
||||||
panic("cpu_exit");
|
panic("cpu_exit");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,12 +58,12 @@
|
|||||||
#include <sys/vmmeter.h>
|
#include <sys/vmmeter.h>
|
||||||
#include <sys/kernel.h>
|
#include <sys/kernel.h>
|
||||||
#include <sys/ktr.h>
|
#include <sys/ktr.h>
|
||||||
|
#include <sys/mutex.h>
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
#include <sys/unistd.h>
|
#include <sys/unistd.h>
|
||||||
|
|
||||||
#include <machine/cpu.h>
|
#include <machine/cpu.h>
|
||||||
#include <machine/md_var.h>
|
#include <machine/md_var.h>
|
||||||
#include <machine/mutex.h>
|
|
||||||
#ifdef SMP
|
#ifdef SMP
|
||||||
#include <machine/smp.h>
|
#include <machine/smp.h>
|
||||||
#endif
|
#endif
|
||||||
@ -260,7 +260,7 @@ cpu_exit(p)
|
|||||||
mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH);
|
mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH);
|
||||||
mtx_assert(&Giant, MA_NOTOWNED);
|
mtx_assert(&Giant, MA_NOTOWNED);
|
||||||
cnt.v_swtch++;
|
cnt.v_swtch++;
|
||||||
cpu_switch();
|
cpu_throw();
|
||||||
panic("cpu_exit");
|
panic("cpu_exit");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user