svn commit: r185986 - in releng/7.1/sys: . amd64/amd64 contrib/pf dev/cxgb

[Konstantin Belousov]

Author: kib
Date: Fri Dec 12 13:21:31 2008
New Revision: 185986
URL: http://svn.freebsd.org/changeset/base/185986

Log:
  MFC r185634:
  Improve db_backtrace() for compat ia32 on amd64. 32bit image enters
  the kernel via Xint0x80_syscall().
  
  Approved by:	re (kensmith)

Modified:
  releng/7.1/sys/   (props changed)
  releng/7.1/sys/amd64/amd64/db_trace.c
  releng/7.1/sys/contrib/pf/   (props changed)
  releng/7.1/sys/dev/cxgb/   (props changed)

Modified: releng/7.1/sys/amd64/amd64/db_trace.c
==============================================================================
--- releng/7.1/sys/amd64/amd64/db_trace.c	Fri Dec 12 13:09:52 2008	(r185985)
+++ releng/7.1/sys/amd64/amd64/db_trace.c	Fri Dec 12 13:21:31 2008	(r185986)
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
@@ -318,6 +320,10 @@ db_nextframe(struct amd64_frame **fp, db
 			frame_type = INTERRUPT;
 		else if (strcmp(name, "Xfast_syscall") == 0)
 			frame_type = SYSCALL;
+#ifdef COMPAT_IA32
+		else if (strcmp(name, "Xint0x80_syscall") == 0)
+			frame_type = SYSCALL;
+#endif
 		/* XXX: These are interrupts with trap frames. */
 		else if (strcmp(name, "Xtimerint") == 0 ||
 		    strcmp(name, "Xcpustop") == 0 ||