diff options
Diffstat (limited to 'kernel/sched/debug.c')
-rw-r--r-- | kernel/sched/debug.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 1ca0130ed4f9..72c401b3b15c 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c | |||
@@ -32,7 +32,7 @@ static DEFINE_SPINLOCK(sched_debug_lock); | |||
32 | if (m) \ | 32 | if (m) \ |
33 | seq_printf(m, x); \ | 33 | seq_printf(m, x); \ |
34 | else \ | 34 | else \ |
35 | printk(x); \ | 35 | pr_cont(x); \ |
36 | } while (0) | 36 | } while (0) |
37 | 37 | ||
38 | /* | 38 | /* |
@@ -501,12 +501,12 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu) | |||
501 | { | 501 | { |
502 | struct task_struct *g, *p; | 502 | struct task_struct *g, *p; |
503 | 503 | ||
504 | SEQ_printf(m, | 504 | SEQ_printf(m, "\n"); |
505 | "\nrunnable tasks:\n" | 505 | SEQ_printf(m, "runnable tasks:\n"); |
506 | " S task PID tree-key switches prio" | 506 | SEQ_printf(m, " S task PID tree-key switches prio" |
507 | " wait-time sum-exec sum-sleep\n" | 507 | " wait-time sum-exec sum-sleep\n"); |
508 | "-------------------------------------------------------" | 508 | SEQ_printf(m, "-------------------------------------------------------" |
509 | "----------------------------------------------------\n"); | 509 | "----------------------------------------------------\n"); |
510 | 510 | ||
511 | rcu_read_lock(); | 511 | rcu_read_lock(); |
512 | for_each_process_thread(g, p) { | 512 | for_each_process_thread(g, p) { |
@@ -527,9 +527,11 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) | |||
527 | unsigned long flags; | 527 | unsigned long flags; |
528 | 528 | ||
529 | #ifdef CONFIG_FAIR_GROUP_SCHED | 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 | #else | 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 | #endif | 535 | #endif |
534 | SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "exec_clock", | 536 | SEQ_printf(m, " .%-30s: %Ld.%06ld\n", "exec_clock", |
535 | SPLIT_NS(cfs_rq->exec_clock)); | 537 | SPLIT_NS(cfs_rq->exec_clock)); |
@@ -595,9 +597,11 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) | |||
595 | void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq) | 597 | void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq) |
596 | { | 598 | { |
597 | #ifdef CONFIG_RT_GROUP_SCHED | 599 | #ifdef CONFIG_RT_GROUP_SCHED |
598 | SEQ_printf(m, "\nrt_rq[%d]:%s\n", cpu, task_group_path(rt_rq->tg)); | 600 | SEQ_printf(m, "\n"); |
601 | SEQ_printf(m, "rt_rq[%d]:%s\n", cpu, task_group_path(rt_rq->tg)); | ||
599 | #else | 602 | #else |
600 | SEQ_printf(m, "\nrt_rq[%d]:\n", cpu); | 603 | SEQ_printf(m, "\n"); |
604 | SEQ_printf(m, "rt_rq[%d]:\n", cpu); | ||
601 | #endif | 605 | #endif |
602 | 606 | ||
603 | #define P(x) \ | 607 | #define P(x) \ |
@@ -624,7 +628,8 @@ void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq) | |||
624 | { | 628 | { |
625 | struct dl_bw *dl_bw; | 629 | struct dl_bw *dl_bw; |
626 | 630 | ||
627 | SEQ_printf(m, "\ndl_rq[%d]:\n", cpu); | 631 | SEQ_printf(m, "\n"); |
632 | SEQ_printf(m, "dl_rq[%d]:\n", cpu); | ||
628 | 633 | ||
629 | #define PU(x) \ | 634 | #define PU(x) \ |
630 | SEQ_printf(m, " .%-30s: %lu\n", #x, (unsigned long)(dl_rq->x)) | 635 | SEQ_printf(m, " .%-30s: %lu\n", #x, (unsigned long)(dl_rq->x)) |