From owner-p4-projects@FreeBSD.ORG  Sun Jan  7 06:55:46 2007
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 1103716A407; Sun,  7 Jan 2007 06:55:46 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DB4E116A412
	for <perforce@freebsd.org>; Sun,  7 Jan 2007 06:55:45 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id CD63413C442
	for <perforce@freebsd.org>; Sun,  7 Jan 2007 06:55:45 +0000 (UTC)
	(envelope-from peter@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 l076tjnI098050
	for <perforce@freebsd.org>; Sun, 7 Jan 2007 06:55:45 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l076tjC6098047
	for perforce@freebsd.org; Sun, 7 Jan 2007 06:55:45 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 7 Jan 2007 06:55:45 GMT
Message-Id: <200701070655.l076tjC6098047@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 112639 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: Sun, 07 Jan 2007 06:55:46 -0000

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

Change 112639 by peter@peter_overcee on 2007/01/07 06:55:45

	grr. change filetype to text

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/trap.c#93 edit
.. //depot/projects/hammer/sys/bsm/audit.h#5 edit
.. //depot/projects/hammer/sys/bsm/audit_kevents.h#6 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/trap.c#93 (text+ko) ====

@@ -420,7 +420,7 @@
 			 * Handle invalid userland selectors causing a trap
 			 * by turning it onto a SIGBUS.
 			 */
-			if (frame.tf_rip == (long)load_gs_load) {
+			if (frame->tf_rip == (long)load_gs_load) {
 				ucode = code + BUS_SEGM_FAULT;
 				i = SIGBUS;
 				goto out;

==== //depot/projects/hammer/sys/bsm/audit.h#5 (text/text+ko) ====

@@ -30,6 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#34 $
  * $FreeBSD: src/sys/bsm/audit.h,v 1.6 2006/09/21 07:27:02 rwatson Exp $
  */
 

==== //depot/projects/hammer/sys/bsm/audit_kevents.h#6 (text/text+ko) ====

@@ -30,6 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#29 $
  * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.9 2006/09/25 12:22:07 rwatson Exp $
  */