Deleted Added
full compact
subr_trap.c (242361) subr_trap.c (247116)
1/*-
2 * Copyright (C) 1994, David Greenman
3 * Copyright (c) 1990, 1993
4 * The Regents of the University of California. All rights reserved.
5 * Copyright (c) 2007 The FreeBSD Foundation
6 *
7 * This code is derived from software contributed to Berkeley by
8 * the University of Utah, and William Jolitz.

--- 28 unchanged lines hidden (view full) ---

37 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
38 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 * SUCH DAMAGE.
40 *
41 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
42 */
43
44#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 * Copyright (c) 2007 The FreeBSD Foundation
6 *
7 * This code is derived from software contributed to Berkeley by
8 * the University of Utah, and William Jolitz.

--- 28 unchanged lines hidden (view full) ---

37 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
38 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39 * SUCH DAMAGE.
40 *
41 * from: @(#)trap.c 7.4 (Berkeley) 5/13/91
42 */
43
44#include <sys/cdefs.h>
45__FBSDID("$FreeBSD: head/sys/kern/subr_trap.c 242361 2012-10-30 15:10:50Z attilio $");
45__FBSDID("$FreeBSD: head/sys/kern/subr_trap.c 247116 2013-02-21 19:02:50Z jhb $");
46
47#include "opt_hwpmc_hooks.h"
48#include "opt_ktrace.h"
49#include "opt_kdtrace.h"
50#include "opt_sched.h"
51
52#include <sys/param.h>
53#include <sys/bus.h>

--- 105 unchanged lines hidden (view full) ---

159 KASSERT((td->td_pflags & TDP_NOFAULTING) == 0,
160 ("userret: Returning with pagefaults disabled"));
161 KASSERT((td->td_pflags & TDP_NOSLEEPING) == 0,
162 ("userret: Returning with sleep disabled"));
163 KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0,
164 ("userret: Returning with with pinned thread"));
165 KASSERT(td->td_vp_reserv == 0,
166 ("userret: Returning while holding vnode reservation"));
46
47#include "opt_hwpmc_hooks.h"
48#include "opt_ktrace.h"
49#include "opt_kdtrace.h"
50#include "opt_sched.h"
51
52#include <sys/param.h>
53#include <sys/bus.h>

--- 105 unchanged lines hidden (view full) ---

159 KASSERT((td->td_pflags & TDP_NOFAULTING) == 0,
160 ("userret: Returning with pagefaults disabled"));
161 KASSERT((td->td_pflags & TDP_NOSLEEPING) == 0,
162 ("userret: Returning with sleep disabled"));
163 KASSERT(td->td_pinned == 0 || (td->td_pflags & TDP_CALLCHAIN) != 0,
164 ("userret: Returning with with pinned thread"));
165 KASSERT(td->td_vp_reserv == 0,
166 ("userret: Returning while holding vnode reservation"));
167 KASSERT((td->td_flags & TDF_SBDRY) == 0,
168 ("userret: Returning with stop signals deferred"));
167#ifdef VIMAGE
168 /* Unfortunately td_vnet_lpush needs VNET_DEBUG. */
169 VNET_ASSERT(curvnet == NULL,
170 ("%s: Returning on td %p (pid %d, %s) with vnet %p set in %s",
171 __func__, td, p->p_pid, td->td_name, curvnet,
172 (td->td_vnet_lpush != NULL) ? td->td_vnet_lpush : "N/A"));
173#endif
174#ifdef RACCT

--- 134 unchanged lines hidden ---
169#ifdef VIMAGE
170 /* Unfortunately td_vnet_lpush needs VNET_DEBUG. */
171 VNET_ASSERT(curvnet == NULL,
172 ("%s: Returning on td %p (pid %d, %s) with vnet %p set in %s",
173 __func__, td, p->p_pid, td->td_name, curvnet,
174 (td->td_vnet_lpush != NULL) ? td->td_vnet_lpush : "N/A"));
175#endif
176#ifdef RACCT

--- 134 unchanged lines hidden ---