--- src/linux-kernel/infiniband/ulp/kdapl/ib/dapl_openib_cm.c	2005-07-26 00:00:10.000000000 -0500
+++ src/linux-kernel/infiniband/ulp/kdapl/ib/dapl_openib_cm.c	2005-08-01 11:56:25.240418715 -0500
@@ -342,7 +342,7 @@
 					      &cm_ctx->dapl_comp);
 		if (status) {
 			printk(KERN_ERR "dapl_path_comp_handler: "
-			       "ib_at_paths_by_route returned %d id %lld\n",
+			       "ib_at_paths_by_route returned %d id %lu\n",
 			       status, cm_ctx->dapl_comp.req_id);
 			event = DAT_CONNECTION_EVENT_BROKEN;
 			goto error;
@@ -413,7 +413,7 @@
 				      &cm_ctx->dapl_comp);
 	if (status) {
 		printk(KERN_ERR "dapl_rt_comp_handler: ib_at_paths_by_route "
-		       "returned %d id %lld\n", status, cm_ctx->dapl_comp.req_id);
+		       "returned %d id %lu\n", status, cm_ctx->dapl_comp.req_id);
 		event = DAT_CONNECTION_EVENT_BROKEN;
 		goto error;
 	}
--- src/linux-kernel/infiniband/ulp/kdapl/ib/dapl_util.h	2005-07-26 00:00:10.000000000 -0500
+++ src/linux-kernel/infiniband/ulp/kdapl/ib/dapl_util.h	2005-08-01 11:12:16.418589653 -0500
@@ -71,7 +71,7 @@
 
 #ifdef __ia64__
 
-	current_value = ia64_cmpxchg("acq", v, match_value, new_value, 4);
+	current_value = ia64_cmpxchg(acq, v, match_value, new_value, 4);
 
 #elif defined (__PPC__)
 
