diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 5dc810dd502c1672de3d59ff4ee392d333d1fb2f..c642f2b1b991d1859994447bceb508d686f7825e 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -1685,7 +1685,7 @@ __u32 lustre_msg_calc_cksum(struct lustre_msg *msg)
                 struct ptlrpc_body *pb;
                 pb = lustre_msg_buf_v2(msg, MSG_PTLRPC_BODY_OFF, sizeof(*pb));
                 LASSERTF(pb, "invalid msg %p: no ptlrpc body!\n", msg);
-                return crc32_le(~(__u32)0, (char *)pb, sizeof(*pb));
+                return crc32_le(~(__u32)0, (unsigned char *)pb, sizeof(*pb));
         }
         default:
                 CERROR("incorrect message magic: %08x\n", msg->lm_magic);
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 850dbce194ca5f6a4566be33794cdbcdf19530e0..93c1eaf6eedf0e1debc68b4f43f8745fb176c21a 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -611,7 +611,7 @@ static void ptlrpc_at_set_timer(struct ptlrpc_service *svc)
         else
                 cfs_timer_arm(&svc->srv_at_timer, cfs_time_shift(next));
         spin_unlock(&svc->srv_at_lock);
-        CDEBUG(D_INFO, "armed %s at %+lds\n", svc->srv_name, next);
+        CDEBUG(D_INFO, "armed %s at %+ds\n", svc->srv_name, next);
 }
 
 /* Add rpc to early reply check list */
diff --git a/lustre/utils/ll_recover_lost_found_objs.c b/lustre/utils/ll_recover_lost_found_objs.c
index 0892363aecd5533706ccc251db1a52a868a4b5b5..6c434fbdc956d6e3eaa75411f039daa07f67ad43 100644
--- a/lustre/utils/ll_recover_lost_found_objs.c
+++ b/lustre/utils/ll_recover_lost_found_objs.c
@@ -43,7 +43,9 @@
  * Author: Kalpak Shah <kalpak.shah@sun.com>
  */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lustre/utils/lr_reader.c b/lustre/utils/lr_reader.c
index 084b856c28badc2e45150dcc18de9001b1014bae..b44d6b55d3980824d68ef2df5777276a971b8e3b 100644
--- a/lustre/utils/lr_reader.c
+++ b/lustre/utils/lr_reader.c
@@ -39,7 +39,9 @@
  */
  /* Safely read the last_rcvd file from a device */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index 340b7e4bdea93d15b8fcbae422ecb5301d42bbe4..22a0c837ee6008dda4de5f2b5ebd853e4c098915 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -40,7 +40,9 @@
 
 /* This source file is compiled into both mkfs.lustre and tunefs.lustre */
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/lustre/utils/mount_lustre.c b/lustre/utils/mount_lustre.c
index 2d244b32005183c6c5748895f1fc11676677eca1..c1ed6455de786932cc372f4373f7c46a75749ff5 100644
--- a/lustre/utils/mount_lustre.c
+++ b/lustre/utils/mount_lustre.c
@@ -39,8 +39,9 @@
  * Author: Nathan Rutman <nathan@clusterfs.com>
  */
 
-
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>