[openib-general] [PATCH] SDP warnings on x86_64

[Libor Michalek]

On Mon, Feb 14, 2005 at 02:39:21PM -0800, Tom Duffy wrote:
> On Mon, 2005-02-14 at 14:20 -0800, Libor Michalek wrote:
> >   Here's a patch for the print format warning in the debug data path.
> 
> OK, good.  Thanks.  Now clean on x86_64 with data debug on.  Still
> seeing these on sparc64:

Tom,

  This patch should clear up all the warnings, can you give it
a try and let me know if it works.

Thanks.

-Libor

Index: sdp_write.c
===================================================================
--- sdp_write.c	(revision 1799)
+++ sdp_write.c	(working copy)
@@ -124,7 +124,7 @@
 
 			sdp_dbg_warn(conn, 
 				     "No IOCB on write complete <%llu:%d:%d>",
-				     comp->wr_id,
+				     (unsigned long long)comp->wr_id,
 				     sdp_desc_q_size(&conn->w_snk),
 				     sdp_desc_q_size(&conn->send_queue));
 			
Index: sdp_rcvd.c
===================================================================
--- sdp_rcvd.c	(revision 1799)
+++ sdp_rcvd.c	(working copy)
@@ -1310,7 +1310,8 @@
 	if (comp->wr_id != buff->wrid) {
 
 		sdp_dbg_warn(conn, "work request ID mismatch. <%llu:%llu>",
-			     comp->wr_id, buff->wrid);
+			     (unsigned long long)comp->wr_id,
+			     (unsigned long long)buff->wrid);
 
 		result = -ERANGE;
 		goto drop;
Index: sdp_read.c
===================================================================
--- sdp_read.c	(revision 1799)
+++ sdp_read.c	(working copy)
@@ -172,7 +172,8 @@
 		if (comp->wr_id != buff->wrid) {
 
 			sdp_dbg_warn(conn, "work request mismatch <%llu:%llu>",
-				     comp->wr_id, buff->wrid);
+				     (unsigned long long)comp->wr_id,
+				     (unsigned long long)buff->wrid);
 
 			(void)sdp_buff_pool_put(buff);
 			result = -EPROTO;
Index: sdp_actv.c
===================================================================
--- sdp_actv.c	(revision 1799)
+++ sdp_actv.c	(working copy)
@@ -382,7 +382,8 @@
 	if (id != conn->plid) {
 
 		sdp_dbg_warn(conn, "Path record ID mismatch <%016llx:%016llx>",
-			     id, conn->plid);
+			     (unsigned long long)id, 
+			     (unsigned long long)conn->plid);
 		goto done;
 	}
 
@@ -409,7 +410,9 @@
 	}
 	
 	sdp_dbg_ctrl(conn, "Path record lookup complete <%016llx:%016llx:%d>",
+		     (unsigned long long)
 		     cpu_to_be64(path->dgid.global.subnet_prefix),
+		     (unsigned long long)
 		     cpu_to_be64(path->dgid.global.interface_id),
 		     path->dlid);
 	/*
Index: sdp_pass.c
===================================================================
--- sdp_pass.c	(revision 1799)
+++ sdp_pass.c	(working copy)
@@ -380,7 +380,7 @@
 
 	sdp_dbg_ctrl(NULL, 
 		     "CM REQ. comm <%08x> SID <%016llx> ca <%s> port <%d>",
-		     cm_id->local_id, cm_id->service_id,
+		     cm_id->local_id, (unsigned long long)cm_id->service_id,
 		     event->param.req_rcvd.device->name, 
 		     event->param.req_rcvd.port);
 	/*
Index: sdp_sent.c
===================================================================
--- sdp_sent.c	(revision 1799)
+++ sdp_sent.c	(working copy)
@@ -448,8 +448,8 @@
 			 */
 			sdp_dbg_warn(conn, 
 				     "Send wrid mismatch. <%llu:%llu:%d>",
-				     comp->wr_id,
-				     buff->wrid,
+				     (unsigned long long)comp->wr_id,
+				     (unsigned long long)buff->wrid,
 				     conn->send_usig);
 			result = -EINVAL;
 			goto drop;
@@ -536,8 +536,9 @@
 
 		sdp_dbg_warn(conn, 
 			     "Send processing mismatch. <%llu:%llu:%d:%d>",
-			     comp->wr_id, current_wrid, free_count,
-			     conn->send_usig);
+			     (unsigned long long)comp->wr_id,
+			     (unsigned long long)current_wrid,
+			     free_count, conn->send_usig);
 		result = -EINVAL;
 		goto done;
 	}
Index: sdp_event.c
===================================================================
--- sdp_event.c	(revision 1799)
+++ sdp_event.c	(working copy)
@@ -45,7 +45,7 @@
 		 */
 		sdp_dbg_warn(conn, "Event <%d:%llu:%u:%u:%u> ignored in state",
 			     comp->status,
-			     comp->wr_id,
+			     (unsigned long long)comp->wr_id,
 			     comp->opcode,
 			     comp->byte_len,
 			     comp->imm_data);
@@ -105,7 +105,7 @@
 		sdp_dbg_warn(conn, "ABORT on error <%d> event <%u:%llu:%u:%u>",
 			     result,
 			     comp->status,
-			     comp->wr_id,
+			     (unsigned long long)comp->wr_id,
 			     comp->opcode,
 			     comp->byte_len);
 		/*