Date: Mon, 13 Apr 2009 14:15:36 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r191001 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb powerpc/powerpc Message-ID: <200904131415.n3DEFaxk074035@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Mon Apr 13 14:15:36 2009 New Revision: 191001 URL: http://svn.freebsd.org/changeset/base/191001 Log: MFC r190946: Fix recognition of kernel-mode traps that pass through the KDB trap handler but do not actually invoke KDB. This includes recoverable machine checks encountered in kernel mode. This patch causes machines with Grackle host-PCI bridges to be able to correctly enumerate them again. Reviewed by: marcel Approved by: re Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/powerpc/powerpc/trap_subr.S Modified: stable/7/sys/powerpc/powerpc/trap_subr.S ============================================================================== --- stable/7/sys/powerpc/powerpc/trap_subr.S Mon Apr 13 13:51:53 2009 (r191000) +++ stable/7/sys/powerpc/powerpc/trap_subr.S Mon Apr 13 14:15:36 2009 (r191001) @@ -539,7 +539,7 @@ dbtrap: mflr %r28 mfcr %r29 lwz %r31,(PC_DBSAVE+CPUSAVE_R31)(%r1) - mtlr %r31 + mtsprg3 %r31 /* SPRG3 was clobbered by FRAME_LEAVE */ mfsprg1 %r1 b realtrap dbleave:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904131415.n3DEFaxk074035>