[src/bouyer-xen2]: src/sys/arch/xen/i386 sync with arch/i386/i386/trap.c 1.202.

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

details:   https://anonhg.NetBSD.org/src/rev/06612eff1b49
branches:  bouyer-xen2
changeset: 571854:06612eff1b49
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Fri Dec 17 17:27:13 2004 +0000

description:
sync with arch/i386/i386/trap.c 1.202.

diffstat:

 sys/arch/xen/i386/trap.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 17b093c7651d -r 06612eff1b49 sys/arch/xen/i386/trap.c
--- a/sys/arch/xen/i386/trap.c  Fri Dec 17 17:23:01 2004 +0000
+++ b/sys/arch/xen/i386/trap.c  Fri Dec 17 17:27:13 2004 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: trap.c,v 1.4 2004/08/28 17:53:03 jdolecek Exp $        */
-/*     NetBSD: trap.c,v 1.200 2004/03/14 01:08:48 cl Exp       */
+/*     $NetBSD: trap.c,v 1.4.4.1 2004/12/17 17:27:13 bouyer Exp $      */
+/*     NetBSD: trap.c,v 1.202 2004/08/28 17:53:01 jdolecek Exp         */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.4 2004/08/28 17:53:03 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.4.4.1 2004/12/17 17:27:13 bouyer Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -268,6 +268,10 @@
                        }
                }
 #endif
+#ifdef DDB
+               if (kdb_trap(type, 0, frame))
+                       return;
+#endif
 #ifdef KGDB
                if (kgdb_trap(type, frame))
                        return;
@@ -282,10 +286,6 @@
                        }
                }
 #endif
-#ifdef DDB
-               if (kdb_trap(type, 0, frame))
-                       return;
-#endif
                if (frame->tf_trapno < trap_types)
                        printf("fatal %s", trap_type[frame->tf_trapno]);
                else