From owner-svn-src-head@FreeBSD.ORG  Sat Aug 25 08:02:47 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2EBFE106564A;
	Sat, 25 Aug 2012 08:02:47 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1AC1C8FC0A;
	Sat, 25 Aug 2012 08:02:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7P82k2l003488;
	Sat, 25 Aug 2012 08:02:46 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7P82ksh003486;
	Sat, 25 Aug 2012 08:02:46 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201208250802.q7P82ksh003486@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 25 Aug 2012 08:02:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239669 - head/sys/mips/mips
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 08:02:47 -0000

Author: rwatson
Date: Sat Aug 25 08:02:46 2012
New Revision: 239669
URL: http://svn.freebsd.org/changeset/base/239669

Log:
  On MIPS, when printing page fault information for an unexpected exception
  type, explicitly print out "unknown" rather than the empty string, and
  include the exception type number for ease of debugging.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/mips/mips/trap.c

Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c	Sat Aug 25 07:48:52 2012	(r239668)
+++ head/sys/mips/mips/trap.c	Sat Aug 25 08:02:46 2012	(r239669)
@@ -1465,15 +1465,17 @@ log_bad_page_fault(char *msg, struct tra
 		read_or_write = "read";
 		break;
 	default:
-		read_or_write = "";
+		read_or_write = "unknown";
 	}
 
 	pc = frame->pc + (DELAYBRANCH(frame->cause) ? 4 : 0);
-	log(LOG_ERR, "%s: pid %d tid %ld (%s), uid %d: pc %#jx got a %s fault at %#jx\n",
+	log(LOG_ERR, "%s: pid %d tid %ld (%s), uid %d: pc %#jx got a %s fault "
+	    "(type %#x) at %#jx\n",
 	    msg, p->p_pid, (long)td->td_tid, p->p_comm,
 	    p->p_ucred ? p->p_ucred->cr_uid : -1,
 	    (intmax_t)pc,
 	    read_or_write,
+	    trap_type,
 	    (intmax_t)frame->badvaddr);
 
 	/* log registers in trap frame */