From owner-p4-projects@FreeBSD.ORG  Mon Jul 24 22:21:42 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 28E9916A4E5; Mon, 24 Jul 2006 22:21:42 +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 0453816A4DA
	for <perforce@freebsd.org>; Mon, 24 Jul 2006 22:21:42 +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 AACF043D45
	for <perforce@freebsd.org>; Mon, 24 Jul 2006 22:21:41 +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 k6OMLf9j048051
	for <perforce@freebsd.org>; Mon, 24 Jul 2006 22:21:41 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6OMLfhp048048
	for perforce@freebsd.org; Mon, 24 Jul 2006 22:21:41 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 24 Jul 2006 22:21:41 GMT
Message-Id: <200607242221.k6OMLfhp048048@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 102321 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: Mon, 24 Jul 2006 22:21:42 -0000

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

Change 102321 by jhb@jhb_mutex on 2006/07/24 22:20:45

	Fix non-witness compile.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/trap.c#46 edit
.. //depot/projects/smpng/sys/arm/arm/trap.c#19 edit
.. //depot/projects/smpng/sys/conf/files#181 edit
.. //depot/projects/smpng/sys/i386/i386/trap.c#95 edit
.. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#9 edit
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#82 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/trap.c#46 (text+ko) ====

@@ -145,9 +145,7 @@
 SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
 	&panic_on_nmi, 0, "Panic on NMI");
 
-#ifdef WITNESS
 extern char *syscallnames[];
-#endif
 
 /*
  * Exception, fault, and trap interface to the FreeBSD kernel.

==== //depot/projects/smpng/sys/arm/arm/trap.c#19 (text+ko) ====

@@ -133,6 +133,7 @@
 #include <machine/machdep.h>
  
 extern char fusubailout[];
+extern char *syscallnames[];
 
 #ifdef DEBUG
 int last_fault_code;	/* For the benefit of pmap_fault_fixup() */

==== //depot/projects/smpng/sys/conf/files#181 (text+ko) ====

@@ -1399,7 +1399,7 @@
 kern/sys_pipe.c			standard
 kern/sys_process.c		standard
 kern/sys_socket.c		standard
-kern/syscalls.c			optional witness
+kern/syscalls.c			optional witness | invariants
 kern/sysv_ipc.c			standard
 kern/sysv_msg.c			optional sysvmsg
 kern/sysv_sem.c			optional sysvsem

==== //depot/projects/smpng/sys/i386/i386/trap.c#95 (text+ko) ====

@@ -159,9 +159,7 @@
 SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
 	&panic_on_nmi, 0, "Panic on NMI");
 
-#ifdef WITNESS
 extern char *syscallnames[];
-#endif
 
 /*
  * Exception, fault, and trap interface to the FreeBSD kernel.

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

@@ -46,9 +46,7 @@
 #include <machine/md_var.h>
 #include <i386/include/psl.h>
 
-#ifdef WITNESS
 extern char *syscallnames[];
-#endif
 
 static void
 ia32_syscall(struct trapframe *tf)

==== //depot/projects/smpng/sys/ia64/ia64/trap.c#82 (text+ko) ====

@@ -85,9 +85,7 @@
  */
 extern struct fpswa_iface *fpswa_iface;
 
-#ifdef WITNESS
 extern char *syscallnames[];
-#endif
 
 static const char *ia64_vector_names[] = {
 	"VHPT Translation",			/* 0 */