Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Two sched debug output related fixes: a console output fix and
formatting fixes"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/debug: Adjust newlines for better alignment
sched/debug: Fix per-task line continuation for console output
+17
-12
+17
-12
kernel/sched/debug.c
+17
-12
kernel/sched/debug.c
···
32
32
if (m) \
33
33
seq_printf(m, x); \
34
34
else \
35
-
printk(x); \
35
+
pr_cont(x); \
36
36
} while (0)
37
37
38
38
/*
···
501
501
{
502
502
struct task_struct *g, *p;
503
503
504
-
SEQ_printf(m,
505
-
"\nrunnable tasks:\n"
506
-
" S task PID tree-key switches prio"
507
-
" wait-time sum-exec sum-sleep\n"
508
-
"-------------------------------------------------------"
509
-
"----------------------------------------------------\n");
504
+
SEQ_printf(m, "\n");
505
+
SEQ_printf(m, "runnable tasks:\n");
506
+
SEQ_printf(m, " S task PID tree-key switches prio"
507
+
" wait-time sum-exec sum-sleep\n");
508
+
SEQ_printf(m, "-------------------------------------------------------"
509
+
"----------------------------------------------------\n");
510
510
511
511
rcu_read_lock();
512
512
for_each_process_thread(g, p) {
···
527
527
unsigned long flags;
528
528
529
529
#ifdef CONFIG_FAIR_GROUP_SCHED
530
-
SEQ_printf(m, "\ncfs_rq[%d]:%s\n", cpu, task_group_path(cfs_rq->tg));
530
+
SEQ_printf(m, "\n");
531
+
SEQ_printf(m, "cfs_rq[%d]:%s\n", cpu, task_group_path(cfs_rq->tg));
531
532
#else
532
-
SEQ_printf(m, "\ncfs_rq[%d]:\n", cpu);
533
+
SEQ_printf(m, "\n");
534
+
SEQ_printf(m, "cfs_rq[%d]:\n", cpu);
533
535
#endif
534
536
SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "exec_clock",
535
537
SPLIT_NS(cfs_rq->exec_clock));
···
597
595
void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
598
596
{
599
597
#ifdef CONFIG_RT_GROUP_SCHED
600
-
SEQ_printf(m, "\nrt_rq[%d]:%s\n", cpu, task_group_path(rt_rq->tg));
598
+
SEQ_printf(m, "\n");
599
+
SEQ_printf(m, "rt_rq[%d]:%s\n", cpu, task_group_path(rt_rq->tg));
601
600
#else
602
-
SEQ_printf(m, "\nrt_rq[%d]:\n", cpu);
601
+
SEQ_printf(m, "\n");
602
+
SEQ_printf(m, "rt_rq[%d]:\n", cpu);
603
603
#endif
604
604
605
605
#define P(x) \
···
628
624
{
629
625
struct dl_bw *dl_bw;
630
626
631
-
SEQ_printf(m, "\ndl_rq[%d]:\n", cpu);
627
+
SEQ_printf(m, "\n");
628
+
SEQ_printf(m, "dl_rq[%d]:\n", cpu);
632
629
633
630
#define PU(x) \
634
631
SEQ_printf(m, " .%-30s: %lu\n", #x, (unsigned long)(dl_rq->x))