From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 23:02:44 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF46F16A4D0; Fri,  7 Nov 2003 23:02:44 -0800 (PST)
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 8680816A4CE
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 23:02:44 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 05E1C43FF7
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 23:02:44 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA872hXJ032797
	for <perforce@freebsd.org>; Fri, 7 Nov 2003 23:02:43 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA872hZ3032794
	for perforce@freebsd.org; Fri, 7 Nov 2003 23:02:43 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 7 Nov 2003 23:02:43 -0800 (PST)
Message-Id: <200311080702.hA872hZ3032794@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>
Subject: PERFORCE change 41730 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 08 Nov 2003 07:02:45 -0000

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

Change 41730 by peter@peter_overcee on 2003/11/07 23:02:32

	tidy up some loose ends

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#10 edit
.. //depot/projects/hammer/sys/amd64/amd64/fpu.c#2 edit
.. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#7 edit
.. //depot/projects/hammer/sys/amd64/isa/npx.c#8 delete

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/db_trace.c#10 (text+ko) ====

@@ -246,7 +246,7 @@
 		    strcmp(name, "fork_trampoline") == 0)
 			frame_type = TRAP;
 		else if (strncmp(name, "Xatpic_intr", 11) == 0 ||
-		    strncmp(name, "Xatpic_fastintr", 15) == 0)
+		    strncmp(name, "Xatpic_fastintr", 15) == 0 ||
 		    strncmp(name, "Xapic_isr", 9) == 0)
 			frame_type = INTERRUPT;
 		else if (strcmp(name, "Xfast_syscall") == 0)

==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#2 (text+ko) ====

@@ -55,6 +55,7 @@
 
 #include <machine/cputypes.h>
 #include <machine/frame.h>
+#include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
@@ -63,8 +64,6 @@
 #include <machine/segments.h>
 #include <machine/ucontext.h>
 
-#include <amd64/isa/intr_machdep.h>
-
 /*
  * Floating point support.
  */

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

@@ -76,10 +76,10 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
+#include <machine/intr_machdep.h>
 #include <machine/md_var.h>
 
 #include <amd64/isa/icu.h>
-#include <amd64/isa/intr_machdep.h>
 
 #define	IDTVEC(name)	__CONCAT(X,name)