From owner-p4-projects@FreeBSD.ORG  Thu Jul 27 20:37:18 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 95F4916A4E5; Thu, 27 Jul 2006 20:37:18 +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 5CB1816A4E1
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 20:37:18 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 03FFE43D69
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 20:37:13 +0000 (GMT)
	(envelope-from jhb@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 k6RKbCBo018224
	for <perforce@freebsd.org>; Thu, 27 Jul 2006 20:37:12 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RKbCRB018220
	for perforce@freebsd.org; Thu, 27 Jul 2006 20:37:12 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 27 Jul 2006 20:37:12 GMT
Message-Id: <200607272037.k6RKbCRB018220@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102596 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, 27 Jul 2006 20:37:18 -0000

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

Change 102596 by jhb@jhb_mutex on 2006/07/27 20:37:01

	Fix mismerges.

Affected files ...

.. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#15 edit
.. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#11 edit
.. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#52 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#15 (text+ko) ====

@@ -276,8 +276,6 @@
 	STOPEVENT(p, S_SCX, code);
  
 	PTRACESTOP_SC(p, td, S_PT_SCX);
-
-	PTRACESTOP_SC(p, td, S_PT_SCX);
 }
 
 

==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#11 (text+ko) ====

@@ -211,8 +211,6 @@
 	STOPEVENT(p, S_SCX, code);
  
 	PTRACESTOP_SC(p, td, S_PT_SCX);
-
-	PTRACESTOP_SC(p, td, S_PT_SCX);
 }
 
 /*

==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#52 (text+ko) ====

@@ -494,8 +494,6 @@
 	STOPEVENT(p, S_SCX, code);
  
 	PTRACESTOP_SC(p, td, S_PT_SCX);
-
-	PTRACESTOP_SC(p, td, S_PT_SCX);
 }
 
 static int