From owner-svn-src-all@FreeBSD.ORG  Fri Sep 10 07:06:06 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D6F8106564A;
	Fri, 10 Sep 2010 07:06:06 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C5278FC14;
	Fri, 10 Sep 2010 07:06:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8A766ZP097840;
	Fri, 10 Sep 2010 07:06:06 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8A766v6097835;
	Fri, 10 Sep 2010 07:06:06 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201009100706.o8A766v6097835@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Fri, 10 Sep 2010 07:06:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212409 - in head/sys/mips/rmi: . dev/nlge dev/xlr
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Sep 2010 07:06:06 -0000

Author: jchandra
Date: Fri Sep 10 07:06:06 2010
New Revision: 212409
URL: http://svn.freebsd.org/changeset/base/212409

Log:
  Compilation fix - when INVARIANTS are turned off.

Modified:
  head/sys/mips/rmi/dev/nlge/if_nlge.c
  head/sys/mips/rmi/dev/xlr/rge.c
  head/sys/mips/rmi/msgring.h

Modified: head/sys/mips/rmi/dev/nlge/if_nlge.c
==============================================================================
--- head/sys/mips/rmi/dev/nlge/if_nlge.c	Fri Sep 10 06:26:28 2010	(r212408)
+++ head/sys/mips/rmi/dev/nlge/if_nlge.c	Fri Sep 10 07:06:06 2010	(r212409)
@@ -1953,7 +1953,10 @@ send_fmn_msg_tx(struct nlge_softc *sc, s
     uint32_t n_entries)
 {
 	uint32_t msgrng_flags;
-	int i = 0, ret;
+	int ret;
+#ifdef INVARIANTS
+	int i = 0;
+#endif
 
 	do {
 		msgrng_flags = msgrng_access_enable();

Modified: head/sys/mips/rmi/dev/xlr/rge.c
==============================================================================
--- head/sys/mips/rmi/dev/xlr/rge.c	Fri Sep 10 06:26:28 2010	(r212408)
+++ head/sys/mips/rmi/dev/xlr/rge.c	Fri Sep 10 07:06:06 2010	(r212409)
@@ -713,8 +713,11 @@ xlr_mac_send_fr(struct driver_data *priv
 {
 	struct msgrng_msg msg;
 	int stid = priv->rfrbucket;
-	int i = 0, code, ret;
+	int code, ret;
 	uint32_t msgrng_flags;
+#ifdef INVARIANTS
+	int i = 0;
+#endif
 
 	mac_make_desc_rfr(&msg, addr);
 

Modified: head/sys/mips/rmi/msgring.h
==============================================================================
--- head/sys/mips/rmi/msgring.h	Fri Sep 10 06:26:28 2010	(r212408)
+++ head/sys/mips/rmi/msgring.h	Fri Sep 10 07:06:06 2010	(r212409)
@@ -306,7 +306,9 @@ message_send(unsigned int size, unsigned
 {
 	unsigned int dest = 0;
 	unsigned long long status = 0;
+#ifdef INVARIANTS
 	int i = 0;
+#endif
 
 	msgrng_load_tx_msg0(msg->msg0);
 	msgrng_load_tx_msg1(msg->msg1);