| subr_syscall.c (134568) | subr_syscall.c (134571) |
|---|---|
| 1/*- 2 * Copyright (C) 1994, David Greenman 3 * Copyright (c) 1990, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * the University of Utah, and William Jolitz. 8 * --- 24 unchanged lines hidden (view full) --- 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * 37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 38 */ 39 40#include <sys/cdefs.h> | 1/*- 2 * Copyright (C) 1994, David Greenman 3 * Copyright (c) 1990, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * This code is derived from software contributed to Berkeley by 7 * the University of Utah, and William Jolitz. 8 * --- 24 unchanged lines hidden (view full) --- 33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 35 * SUCH DAMAGE. 36 * 37 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 38 */ 39 40#include <sys/cdefs.h> |
| 41__FBSDID("$FreeBSD: head/sys/kern/subr_trap.c 134568 2004-08-31 06:12:13Z julian $"); | 41__FBSDID("$FreeBSD: head/sys/kern/subr_trap.c 134571 2004-08-31 07:34:54Z julian $"); |
| 42 43#include "opt_ktrace.h" 44#include "opt_mac.h" 45#ifdef __i386__ 46#include "opt_npx.h" 47#endif 48 49#include <sys/param.h> --- 108 unchanged lines hidden (view full) --- 158 p->p_comm); 159 KASSERT(TRAPF_USERMODE(framep), ("ast in kernel mode")); 160 WITNESS_WARN(WARN_PANIC, NULL, "Returning to user mode"); 161 mtx_assert(&Giant, MA_NOTOWNED); 162 mtx_assert(&sched_lock, MA_NOTOWNED); 163 td->td_frame = framep; 164 165 if ((p->p_flag & P_SA) && (td->td_mailbox == NULL)) | 42 43#include "opt_ktrace.h" 44#include "opt_mac.h" 45#ifdef __i386__ 46#include "opt_npx.h" 47#endif 48 49#include <sys/param.h> --- 108 unchanged lines hidden (view full) --- 158 p->p_comm); 159 KASSERT(TRAPF_USERMODE(framep), ("ast in kernel mode")); 160 WITNESS_WARN(WARN_PANIC, NULL, "Returning to user mode"); 161 mtx_assert(&Giant, MA_NOTOWNED); 162 mtx_assert(&sched_lock, MA_NOTOWNED); 163 td->td_frame = framep; 164 165 if ((p->p_flag & P_SA) && (td->td_mailbox == NULL)) |
| 166 thread_user_enter(p, td); | 166 thread_user_enter(td); |
| 167 /* 168 * This updates the p_sflag's for the checks below in one 169 * "atomic" operation with turning off the astpending flag. 170 * If another AST is triggered while we are handling the 171 * AST's saved in sflag, the astpending flag will be set and 172 * ast() will be called again. 173 */ 174 mtx_lock_spin(&sched_lock); --- 91 unchanged lines hidden --- | 167 /* 168 * This updates the p_sflag's for the checks below in one 169 * "atomic" operation with turning off the astpending flag. 170 * If another AST is triggered while we are handling the 171 * AST's saved in sflag, the astpending flag will be set and 172 * ast() will be called again. 173 */ 174 mtx_lock_spin(&sched_lock); --- 91 unchanged lines hidden --- |