Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / net / ipv4 / tcp_probe.c

diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index be94d526c7cba5719b8e130f5545ea6b721dd353..d7d517a3a238b918862896e114e3ea0261f5652c 100644 (file)
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -68,7 +68,9 @@ static void printl(const char *fmt, ...)
                now.tv_usec += 1000000;
        }
 
-       len = sprintf(tbuf, "%lu.%06lu ", now.tv_sec, now.tv_usec);
+       len = sprintf(tbuf, "%lu.%06lu ",
+                     (unsigned long) now.tv_sec,
+                     (unsigned long) now.tv_usec);
        len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args);
        va_end(args);