Module Name: src Committed By: msaitoh Date: Fri May 31 02:48:41 UTC 2019
Modified Files: src/sys/arch/sparc64/sparc64 [netbsd-8]: db_trace.c Log Message: Pull up following revision(s) (requested by martin in ticket #1274): sys/arch/sparc64/sparc64/db_trace.c: revision 1.51 sys/arch/sparc64/sparc64/db_trace.c: revision 1.52 sys/arch/sparc64/sparc64/db_trace.c: revision 1.53 Relax test for valid stack frame address (now that we have multiple kernel stacks since ... a long time). Just test for a valid kernel VA, using the same test as for "pc". Very close to a patch suggested by Tobias Ulmer in PR port-sparc64/54221. Fix previous and use the original patch from PR port-sparc64/54221 instead (XXX should fix comments in param.h) Add missing include to fix the crash(8) build, from Tobias Ulmer, PR port-sparc64/54221 To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.50.30.1 src/sys/arch/sparc64/sparc64/db_trace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/sparc64/sparc64/db_trace.c diff -u src/sys/arch/sparc64/sparc64/db_trace.c:1.50 src/sys/arch/sparc64/sparc64/db_trace.c:1.50.30.1 --- src/sys/arch/sparc64/sparc64/db_trace.c:1.50 Mon Mar 4 20:17:46 2013 +++ src/sys/arch/sparc64/sparc64/db_trace.c Fri May 31 02:48:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: db_trace.c,v 1.50 2013/03/04 20:17:46 christos Exp $ */ +/* $NetBSD: db_trace.c,v 1.50.30.1 2019/05/31 02:48:41 msaitoh Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.50 2013/03/04 20:17:46 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.50.30.1 2019/05/31 02:48:41 msaitoh Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_trace.c,v #include <sys/systm.h> #include <machine/db_machdep.h> #include <machine/ctlreg.h> +#include <machine/vmparam.h> #include <ddb/db_access.h> #include <ddb/db_proc.h> @@ -163,7 +164,7 @@ db_stack_trace_print(db_expr_t addr, boo if (kernel_only) { if (pc < KERNBASE || pc >= KERNEND) break; - if (frame < KERNBASE || frame >= EINTSTACK) + if (frame < KERNBASE || frame >= VM_MAX_KERNEL_ADDRESS) break; } else { if (frame == 0 || frame == (vaddr_t)-1)