Merge branch 'linus' into xen-64bit

1 files changed, 5 insertions, 3 deletions

diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 7bf3c0ea7bd9..d8bfa0eb41b2 100644
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -146,8 +146,10 @@ static int nst_seq_show(struct seq_file *seq, void *v)
                            nst->st_task->comm, nst->st_node,
                            nst->st_sc, nst->st_id, nst->st_msg_type,
                            nst->st_msg_key,
-                           nst->st_sock_time.tv_sec, nst->st_sock_time.tv_usec,
-                           nst->st_send_time.tv_sec, nst->st_send_time.tv_usec,
+                           nst->st_sock_time.tv_sec,
+                           (unsigned long)nst->st_sock_time.tv_usec,
+                           nst->st_send_time.tv_sec,
+                           (unsigned long)nst->st_send_time.tv_usec,
                            nst->st_status_time.tv_sec,
                            nst->st_status_time.tv_usec);
         }
@@ -274,7 +276,7 @@ static void *sc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         return sc; /* unused, just needs to be null when done */
 }
 
-#define TV_SEC_USEC(TV) TV.tv_sec, TV.tv_usec
+#define TV_SEC_USEC(TV) TV.tv_sec, (unsigned long)TV.tv_usec
 
 static int sc_seq_show(struct seq_file *seq, void *v)
 {