 @@ -1,15 +1,15 @@
-/*	$NetBSD: trap.c,v 1.294 2018/05/16 08:16:36 maxv Exp $	*/
+/*	$NetBSD: trap.c,v 1.295 2018/05/16 16:33:23 maxv Exp $	*/
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,27 +59,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)trap.c	7.4 (Berkeley) 5/13/91
  */
 /*
  * 386 Trap and System call handling
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.294 2018/05/16 08:16:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.295 2018/05/16 16:33:23 maxv Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #include "opt_dtrace.h"
 #include "opt_compat_netbsd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/acct.h>
 @@ -118,27 +118,29 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.2
 /*
  * This is a hook which is initialized by the dtrace module
  * to handle traps which might occur during DTrace probe
  * execution.
  */
 dtrace_trap_func_t	dtrace_trap_func = NULL;
 dtrace_doubletrap_func_t	dtrace_doubletrap_func = NULL;
 #endif
 void trap(struct trapframe *);
 void trap_tss(struct i386tss *, int, int);
 void trap_return_fault_return(struct trapframe *) __dead;
 #ifndef XEN
 int ss_shadow(struct trapframe *tf);
 #endif
 const char * const trap_type[] = {
 	"privileged instruction fault",		/*  0 T_PRIVINFLT */
 	"breakpoint trap",			/*  1 T_BPTFLT */
 	"arithmetic trap",			/*  2 T_ARITHTRAP */
 	"asynchronous system trap",		/*  3 T_ASTFLT */
 	"protection fault",			/*  4 T_PROTFLT */
 	"trace trap",				/*  5 T_TRCTRAP */
 	"page fault",				/*  6 T_PAGEFLT */
 	"alignment fault",			/*  7 T_ALIGNFLT */
 	"integer divide fault",			/*  8 T_DIVIDE */
 	"non-maskable interrupt",		/*  9 T_NMI */
 	"overflow trap",			/* 10 T_OFLOW */
 @@ -227,44 +229,46 @@ trap_print(const struct trapframe *frame
 		printf("unknown trap %d", type);
+	}
 	printf(" in %s mode\n", (type & T_USER) ? "user" : "supervisor");
 	printf("trap type %d code %#x eip %#x cs %#x eflags %#x cr2 %#lx "
 	    "ilevel %#x esp %#x\n",
 	    type, frame->tf_err, frame->tf_eip, frame->tf_cs, frame->tf_eflags,
 	    (long)rcr2(), curcpu()->ci_ilevel, frame->tf_esp);
 	printf("curlwp %p pid %d lid %d lowest kstack %p\n",
 	    l, l->l_proc->p_pid, l->l_lid, KSTACK_LOWEST_ADDR(l));
+}
 #ifndef XEN
 int
 ss_shadow(struct trapframe *tf)
+{
 	struct gate_descriptor *gd;
 	uintptr_t eip, func;
 	size_t i;
 	eip = tf->tf_eip;
 	for (i = 0; i < 256; i++) {
 		gd = &idt[i];
 		func = (gd->gd_hioffset << 16) | gd->gd_looffset;
 		if (eip == func)
 			return 1;
+	}
 	return 0;
+}
 #endif
 /*
  * trap(frame): exception, fault, and trap interface to BSD kernel.
+ *
  * This common code is called from assembly language IDT gate entry routines
  * that prepare a suitable stack frame, and restore this frame after the
  * exception has been processed. Note that the effect is as if the arguments
  * were passed call by reference.
  */
 void
 trap(struct trapframe *frame)
+{
 	struct lwp *l = curlwp;