Branch HEAD (for b1_6)

b=12348
i=adilger
i=mjmac

fix build errors seen when compiling on cray xt3 systems

diff --git a/lnet/klnds/ptllnd/ptllnd_ptltrace.c b/lnet/klnds/ptllnd/ptllnd_ptltrace.c
index 91ba7af..d826820 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_ptltrace.c
+++ b/lnet/klnds/ptllnd/ptllnd_ptltrace.c
@@ -82,7 +82,7 @@ kptllnd_ptltrace_to_file(char *filename)
                 }
 
                 if (start < tmpbuf || start + len > tmpbuf + PAGE_SIZE) {
-                        CERROR("ptl_proc_read bug: %p for %d not in %p for %d\n",
+                        CERROR("ptl_proc_read bug: %p for %d not in %p for %ld\n",
                                start, len, tmpbuf, PAGE_SIZE);
                         break;
                 }