svn commit: r212409 - in head/sys/mips/rmi: . dev/nlge dev/xlr

[Jayachandran C.]

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);