[src/netbsd-6]: src/sys/arch/amd64/amd64 Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/4957fe240470
branches:  netbsd-6
changeset: 773807:4957fe240470
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Feb 23 18:36:06 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #37):
        sys/arch/amd64/amd64/db_machdep.c: revision 1.2
fix stack backtraces through traps.

diffstat:

 sys/arch/amd64/amd64/db_machdep.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r e974171b9ca3 -r 4957fe240470 sys/arch/amd64/amd64/db_machdep.c
--- a/sys/arch/amd64/amd64/db_machdep.c Thu Feb 23 18:34:33 2012 +0000
+++ b/sys/arch/amd64/amd64/db_machdep.c Thu Feb 23 18:36:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_machdep.c,v 1.1 2011/04/10 20:36:49 christos Exp $  */
+/*     $NetBSD: db_machdep.c,v 1.1.16.1 2012/02/23 18:36:06 riz Exp $  */
 
 /* 
  * Mach Operating System
@@ -26,7 +26,7 @@
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1 2011/04/10 20:36:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1.16.1 2012/02/23 18:36:06 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -131,7 +131,7 @@
            default:
 
                /* The only argument to trap() or syscall() is the trapframe. */
-               tf = *(struct trapframe **)argp;
+               tf = (struct trapframe *)argp;
                switch (is_trap) {
                case TRAP:
                        (*pr)("--- trap (number %d) ---\n", tf->tf_trapno);
@@ -141,7 +141,6 @@
                        break;
                case INTERRUPT:
                        (*pr)("--- interrupt ---\n");
-                       tf = (struct trapframe *)argp;
                        break;
                }
                *ip = (db_addr_t)tf->tf_rip;