From 2f1e61110dd4570e52a3d385d985d7703d750a53 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Oct 2008 17:43:28 +1100
Subject: [PATCH] --- yaml --- r: 118011 b: refs/heads/master c:
 e2862c9470beb842d3f1c1965b03a2112114c160 h: refs/heads/master i:   118009:
 42611b6fd79a1b940eb1337bd6e44893125a394c   118007:
 e1865e898171f47862d22de0e38981b68ff8f2be v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 67b45ff59cf4..b8810e35949e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4944dd62de21230af039eda7cd218e9a09021d11
+refs/heads/master: e2862c9470beb842d3f1c1965b03a2112114c160
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 091aeefe321e..cedf4e268285 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -966,7 +966,9 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
 	if (unlikely(*delta > (1ULL << 59) && !once++)) {
 		printk(KERN_WARNING "Delta way too big! %llu"
 		       " ts=%llu write stamp = %llu\n",
-		       *delta, *ts, cpu_buffer->write_stamp);
+		       (unsigned long long)*delta,
+		       (unsigned long long)*ts,
+		       (unsigned long long)cpu_buffer->write_stamp);
 		WARN_ON(1);
 	}