From a62368ca9a5843aafbe8658a38d75779c764ad0f Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 14 May 2012 14:34:00 +0200
Subject: [PATCH] --- yaml --- r: 305005 b: refs/heads/master c:
 13e099d2f77e1da3e4046860c48d956588633613 h: refs/heads/master i:   305003:
 3518961e9a5518ea000618a93850edcf6787fd28 v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/sched/debug.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1dfaa9d2976f..d5a69487d444 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e44bc5c5d00ee9b56dd87db47ed827d52948b9fa
+refs/heads/master: 13e099d2f77e1da3e4046860c48d956588633613
diff --git a/trunk/kernel/sched/debug.c b/trunk/kernel/sched/debug.c
index 31e4f61a1629..6f79596e0ea9 100644
--- a/trunk/kernel/sched/debug.c
+++ b/trunk/kernel/sched/debug.c
@@ -260,8 +260,14 @@ static void print_cpu(struct seq_file *m, int cpu)
 	SEQ_printf(m, "\ncpu#%d\n", cpu);
 #endif
 
-#define P(x) \
-	SEQ_printf(m, "  .%-30s: %Ld\n", #x, (long long)(rq->x))
+#define P(x)								\
+do {									\
+	if (sizeof(rq->x) == 4)						\
+		SEQ_printf(m, "  .%-30s: %ld\n", #x, (long)(rq->x));	\
+	else								\
+		SEQ_printf(m, "  .%-30s: %Ld\n", #x, (long long)(rq->x));\
+} while (0)
+
 #define PN(x) \
 	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", #x, SPLIT_NS(rq->x))