From owner-p4-projects@FreeBSD.ORG  Sat Nov  4 01:21:14 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 4B29916A523; Sat,  4 Nov 2006 01:21:10 +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 6026E16A4D0
	for <perforce@freebsd.org>; Sat,  4 Nov 2006 01:16:56 +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 2AC1243D6E
	for <perforce@freebsd.org>; Sat,  4 Nov 2006 01:16:56 +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 kA41GsW4046474
	for <perforce@freebsd.org>; Sat, 4 Nov 2006 01:16:54 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA41GslI046471
	for perforce@freebsd.org; Sat, 4 Nov 2006 01:16:54 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 4 Nov 2006 01:16:54 GMT
Message-Id: <200611040116.kA41GslI046471@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 109182 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: Sat, 04 Nov 2006 01:21:14 -0000

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

Change 109182 by jb@jb_freebsd8 on 2006/11/04 01:16:23

	Manual merge from current.

Affected files ...

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

Differences ...

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

@@ -473,16 +473,11 @@
 	va = TLB_TAR_VA(data);
 
 #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);
-		printf("trap_pfault(type=%ld, data=0x%lx, tpc=0x%lx, ctx=0x%lx)\n", 
-		       type, data, tf->tf_tpc, ctx);
-		spinlock_exit();
-	}
+	printf("trap_pfault(type=%ld, data=0x%lx, tpc=0x%lx, ctx=0x%lx)\n", 
+	       type, data, tf->tf_tpc, ctx);
 
 	CTR4(KTR_TRAP, "trap_pfault: td=%p pm_ctx=%#lx va=%#lx ctx=%#lx",
-	    td, p->p_vmspace->vm_pmap.pm_context, va, ctx);
+	    td, p->p_vmspace->vm_pmap.pm_context[PCPU_GET(cpuid)], va, ctx);
 #endif
 
 	if (type == T_DATA_PROTECTION) {
@@ -651,6 +646,10 @@
 	CTR5(KTR_SYSC, "syscall: td=%p %s(%#lx, %#lx, %#lx)", td,
 	    syscallnames[code], argp[0], argp[1], argp[2]);
 
+	/*
+	 * Try to run the syscall without the MP lock if the syscall
+	 * is MP safe.
+	 */
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_SYSCALL))
 		ktrsyscall(code, narg, argp);