take sched_debug.c out of nasal demon territory

C99 6.10.3[11]: preprocessing directive within the argument list of
macro invocation => undefined behaviour.  Don't do that...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 1c61e5315ad2bfcb6d7a2fd9fb87a16c9622f90d..8421b9399e109f9795e70c5854026f89d428b098 100644 (file)
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -36,24 +36,24 @@ print_task(struct seq_file *m, struct rq *rq, struct task_struct *p, u64 now)
        else
                SEQ_printf(m, " ");
 
-       SEQ_printf(m, "%15s %5d %15Ld %13Ld %13Ld %9Ld %5d "
-                     "%15Ld %15Ld %15Ld %15Ld %15Ld\n",
+       SEQ_printf(m, "%15s %5d %15Ld %13Ld %13Ld %9Ld %5d ",
                p->comm, p->pid,
                (long long)p->se.fair_key,
                (long long)(p->se.fair_key - rq->cfs.fair_clock),
                (long long)p->se.wait_runtime,
                (long long)(p->nvcsw + p->nivcsw),
-               p->prio,
+               p->prio);
 #ifdef CONFIG_SCHEDSTATS
+       SEQ_printf(m, "%15Ld %15Ld %15Ld %15Ld %15Ld\n",
                (long long)p->se.sum_exec_runtime,
                (long long)p->se.sum_wait_runtime,
                (long long)p->se.sum_sleep_runtime,
                (long long)p->se.wait_runtime_overruns,
-               (long long)p->se.wait_runtime_underruns
+               (long long)p->se.wait_runtime_underruns);
 #else
-               0LL, 0LL, 0LL, 0LL, 0LL
+       SEQ_printf(m, "%15Ld %15Ld %15Ld %15Ld %15Ld\n",
+               0LL, 0LL, 0LL, 0LL, 0LL);
 #endif
-       );
 }
 
 static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu, u64 now)