Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf45bae9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents eaf67993 e9ca2670

kernel/sched/debug.c

+17 −12
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ static DEFINE_SPINLOCK(sched_debug_lock); 
	if (m)					\

	if (m)					\

		seq_printf(m, x);		\

		seq_printf(m, x);		\

	else					\

	else					\

		printk(x);			\

		pr_cont(x);			\

 } while (0)

 } while (0)





/*

/*
@@ -501,11 +501,11 @@ static void print_rq(struct seq_file *m, struct rq *rq, int rq_cpu) 
{

{

	struct task_struct *g, *p;

	struct task_struct *g, *p;





	SEQ_printf(m,

	SEQ_printf(m, "\n");

	"\nrunnable tasks:\n"

	SEQ_printf(m, "runnable tasks:\n");

	" S           task   PID         tree-key  switches  prio"

	SEQ_printf(m, " S           task   PID         tree-key  switches  prio"

	"     wait-time             sum-exec        sum-sleep\n"

		   "     wait-time             sum-exec        sum-sleep\n");

	"-------------------------------------------------------"

	SEQ_printf(m, "-------------------------------------------------------"

		   "----------------------------------------------------\n");

		   "----------------------------------------------------\n");





	rcu_read_lock();

	rcu_read_lock();
@@ -527,9 +527,11 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
	unsigned long flags;

	unsigned long flags;





#ifdef CONFIG_FAIR_GROUP_SCHED

#ifdef CONFIG_FAIR_GROUP_SCHED

	SEQ_printf(m, "\ncfs_rq[%d]:%s\n", cpu, task_group_path(cfs_rq->tg));

	SEQ_printf(m, "\n");

	SEQ_printf(m, "cfs_rq[%d]:%s\n", cpu, task_group_path(cfs_rq->tg));

#else

#else

	SEQ_printf(m, "\ncfs_rq[%d]:\n", cpu);

	SEQ_printf(m, "\n");

	SEQ_printf(m, "cfs_rq[%d]:\n", cpu);

#endif

#endif

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "exec_clock",

	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", "exec_clock",

			SPLIT_NS(cfs_rq->exec_clock));

			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) 
void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)

void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)

{

{

#ifdef CONFIG_RT_GROUP_SCHED

#ifdef CONFIG_RT_GROUP_SCHED

	SEQ_printf(m, "\nrt_rq[%d]:%s\n", cpu, task_group_path(rt_rq->tg));

	SEQ_printf(m, "\n");

	SEQ_printf(m, "rt_rq[%d]:%s\n", cpu, task_group_path(rt_rq->tg));

#else

#else

	SEQ_printf(m, "\nrt_rq[%d]:\n", cpu);

	SEQ_printf(m, "\n");

	SEQ_printf(m, "rt_rq[%d]:\n", cpu);

#endif

#endif





#define P(x) \

#define P(x) \
@@ -624,7 +628,8 @@ void print_dl_rq(struct seq_file *m, int cpu, struct dl_rq *dl_rq) 
{

{

	struct dl_bw *dl_bw;

	struct dl_bw *dl_bw;





	SEQ_printf(m, "\ndl_rq[%d]:\n", cpu);

	SEQ_printf(m, "\n");

	SEQ_printf(m, "dl_rq[%d]:\n", cpu);





#define PU(x) \

#define PU(x) \

	SEQ_printf(m, "  .%-30s: %lu\n", #x, (unsigned long)(dl_rq->x))

	SEQ_printf(m, "  .%-30s: %lu\n", #x, (unsigned long)(dl_rq->x))