summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-07 02:39:31 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-07 02:39:31 +0100
commit0adc1803880db728fa7f8cbad5b214ab657e5e0d (patch)
treeca0411dc74842e30b601a22a72d92581a88ba65b
parentMerge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentipmi: Fix compile warning with tv_usec (diff)
downloadlinux-0adc1803880db728fa7f8cbad5b214ab657e5e0d.tar.xz
linux-0adc1803880db728fa7f8cbad5b214ab657e5e0d.zip
Merge tag 'for-linus-3' of git://git.code.sf.net/p/openipmi/linux-ipmi
Pull IPMI fixlet from Corey Minyard: "Fix a compile warning" * tag 'for-linus-3' of git://git.code.sf.net/p/openipmi/linux-ipmi: ipmi: Fix compile warning with tv_usec
-rw-r--r--drivers/char/ipmi/ipmi_ssif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index fd5a5e85d7dc..982b96323f82 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -969,7 +969,8 @@ static void sender(void *send_info,
do_gettimeofday(&t);
pr_info("**Enqueue %02x %02x: %ld.%6.6ld\n",
- msg->data[0], msg->data[1], t.tv_sec, t.tv_usec);
+ msg->data[0], msg->data[1],
+ (long) t.tv_sec, (long) t.tv_usec);
}
}