From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 23:16:05 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 64E5C16A420; Wed,  2 Jan 2008 23:16:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2898116A41A
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 23:16:05 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 17C8A13C46B
	for <perforce@freebsd.org>; Wed,  2 Jan 2008 23:16:05 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m02NG4gf028180
	for <perforce@freebsd.org>; Wed, 2 Jan 2008 23:16:04 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m02NG4p8028177
	for perforce@freebsd.org; Wed, 2 Jan 2008 23:16:04 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 2 Jan 2008 23:16:04 GMT
Message-Id: <200801022316.m02NG4p8028177@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132347 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: Wed, 02 Jan 2008 23:16:05 -0000

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

Change 132347 by imp@imp_paco-paco on 2008/01/02 23:15:51

	use proper, non-conflicting guard variables.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/include/intr_machdep.h#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/include/intr_machdep.h#2 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/mips2-jnpr/src/sys/mips/include/intr_machdep.h#1 $
+ * $P4: //depot/projects/mips2-jnpr/src/sys/mips/include/intr_machdep.h#2 $
  */
 
-#ifndef	_MACHINE_INTR_H_
-#define	_MACHINE_INTR_H_
+#ifndef	_MACHINE_INTR_MACHDEP_H_
+#define	_MACHINE_INTR_MACHDEP_H_
 
 #define NHARD_IRQS	6
 #define NSOFT_IRQS	2
@@ -40,4 +40,4 @@
     void *, int, int, void **);
 void cpu_intr(struct trapframe *);
 
-#endif /* !_MACHINE_INTR_H_ */
+#endif /* !_MACHINE_INTR_MACHDEP_H_ */