[src/trunk]: src/sys/arch Reduce the diff, and typo.

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4d3fcc7affc7
branches:  trunk
changeset: 347049:4d3fcc7affc7
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Aug 11 14:58:29 2016 +0000

description:
Reduce the diff, and typo.

diffstat:

 sys/arch/amd64/amd64/trap.c |   6 +++---
 sys/arch/i386/i386/trap.c   |  14 +++++---------
 2 files changed, 8 insertions(+), 12 deletions(-)

diffs (83 lines):

diff -r 6db0cb7c499b -r 4d3fcc7affc7 sys/arch/amd64/amd64/trap.c
--- a/sys/arch/amd64/amd64/trap.c       Thu Aug 11 14:48:47 2016 +0000
+++ b/sys/arch/amd64/amd64/trap.c       Thu Aug 11 14:58:29 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.83 2015/12/13 15:53:05 maxv Exp $   */
+/*     $NetBSD: trap.c,v 1.84 2016/08/11 14:58:29 maxv Exp $   */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.83 2015/12/13 15:53:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.84 2016/08/11 14:58:29 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -374,7 +374,7 @@
                case 0x848e:    /* mov 0xa8(%rsp),%es (8e 84 24 a8 00 00 00) */
                case 0x9c8e:    /* mov 0xb0(%rsp),%ds (8e 9c 24 b0 00 00 00) */
                        /*
-                        * We faulted loading one if the user segment registers.
+                        * We faulted loading one of the user segment registers.
                         * The stack frame containing the user registers is
                         * still valid and pointed to by tf_rsp.
                         * Maybe we should check the iretq follows.
diff -r 6db0cb7c499b -r 4d3fcc7affc7 sys/arch/i386/i386/trap.c
--- a/sys/arch/i386/i386/trap.c Thu Aug 11 14:48:47 2016 +0000
+++ b/sys/arch/i386/i386/trap.c Thu Aug 11 14:58:29 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.276 2015/12/16 18:54:03 maxv Exp $  */
+/*     $NetBSD: trap.c,v 1.277 2016/08/11 14:58:29 maxv Exp $  */
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.276 2015/12/16 18:54:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.277 2016/08/11 14:58:29 maxv Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -116,7 +116,7 @@
 #include <sys/dtrace_bsd.h>
 
 /*
- * This is a hook which is initialised by the dtrace module
+ * This is a hook which is initialized by the dtrace module
  * to handle traps which might occur during DTrace probe
  * execution.
  */
@@ -291,8 +291,7 @@
                trap_print(frame, l);
        }
 #endif
-       if (type != T_NMI &&
-           !KERNELMODE(frame->tf_cs, frame->tf_eflags)) {
+       if (type != T_NMI && !KERNELMODE(frame->tf_cs, frame->tf_eflags)) {
                type |= T_USER;
                l->l_md.md_regs = frame;
                pcb->pcb_cr2 = 0;
@@ -322,9 +321,6 @@
 
        switch (type) {
 
-       case T_ASTFLT:
-               /*FALLTHROUGH*/
-
        default:
        we_re_toast:
                if (type == T_TRCTRAP)
@@ -409,7 +405,7 @@
                                goto we_re_toast;
                        }
                        /*
-                        * We faulted loading one if the user segment registers.
+                        * We faulted loading one of the user segment registers.
                         * The stack frame containing the user registers is
                         * still valid and is just below the %eip:%cs:%fl of
                         * the kernel fault frame.