PERFORCE change 112639 for review

[Peter Wemm]

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

Change 112639 by peter at 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 $
  */