From owner-p4-projects@FreeBSD.ORG  Thu Aug  3 02:24:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F6FC16A4FC; Thu,  3 Aug 2006 02:24:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1594216A4FA
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 02:24:22 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E127743D45
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 02:24:21 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k732OLTt047289
	for <perforce@freebsd.org>; Thu, 3 Aug 2006 02:24:21 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k732OLVl047286
	for perforce@freebsd.org; Thu, 3 Aug 2006 02:24:21 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 3 Aug 2006 02:24:21 GMT
Message-Id: <200608030224.k732OLVl047286@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 103082 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Aug 2006 02:24:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=103082

Change 103082 by jb@jb_freebsd2 on 2006/08/03 02:24:04

	Comment out some debug code.

Affected files ...

.. //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#5 edit

Differences ...

==== //depot/projects/dtrace/src/sys/sun4v/sun4v/trap.c#5 (text+ko) ====

@@ -44,6 +44,7 @@
 #include "opt_ktr.h"
 #include "opt_kdtrace.h"
 #include "opt_ktrace.h"
+#include "opt_trap_trace.h"
 
 #include <sys/param.h>
 #include <sys/kdb.h>
@@ -290,6 +291,9 @@
 
 	td = PCPU_GET(curthread);
 
+#ifdef TRAP_TRACING
+hv_ttrace_addentry(0, (uint64_t) trap, (uint64_t) td, type, data);
+#endif
 	CTR4(KTR_TRAP, "trap: %p type=%s (%s) pil=%#lx", td,
 	    trap_msg[trap_conversion[trapno]],
 	    (TRAPF_USERMODE(tf) ? "user" : "kernel"), rdpr(pil));
@@ -464,7 +468,7 @@
 	type = type & ~T_KERNEL;
 	va = TLB_TAR_VA(data);
 
-#if 1
+#if 0
 	if (ctx == 0 && (tf->tf_tpc < (uint64_t)copy_nofault_begin || tf->tf_tpc > (uint64_t)fs_nofault_end)) {
 		spinlock_enter();
 		DELAY(10000*curcpu);