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

Commit fce20979 authored by Yong Zhang's avatar Yong Zhang Committed by Ingo Molnar
Browse files

sched: Replace rq->bkl_count with rq->rq_sched_info.bkl_count 



Now rq->rq_sched_info.bkl_count is not used for rq, scroll
rq->bkl_count into it. Thus we can save some space for rq.

Signed-off-by: default avatarYong Zhang <yong.zhang0@gmail.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294991859-13246-1-git-send-email-yong.zhang0@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f4493771

kernel/sched.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -553,9 +553,6 @@ struct rq { 
	/* try_to_wake_up() stats */

	/* try_to_wake_up() stats */

	unsigned int ttwu_count;

	unsigned int ttwu_count;

	unsigned int ttwu_local;

	unsigned int ttwu_local;



	/* BKL stats */

	unsigned int bkl_count;

#endif

#endif

};

};
@@ -3887,7 +3884,7 @@ static inline void schedule_debug(struct task_struct *prev) 
	schedstat_inc(this_rq(), sched_count);

	schedstat_inc(this_rq(), sched_count);

#ifdef CONFIG_SCHEDSTATS

#ifdef CONFIG_SCHEDSTATS

	if (unlikely(prev->lock_depth >= 0)) {

	if (unlikely(prev->lock_depth >= 0)) {

		schedstat_inc(this_rq(), bkl_count);

		schedstat_inc(this_rq(), rq_sched_info.bkl_count);

		schedstat_inc(prev, sched_info.bkl_count);

		schedstat_inc(prev, sched_info.bkl_count);

	}

	}

#endif

#endif

kernel/sched_debug.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -296,9 +296,11 @@ static void print_cpu(struct seq_file *m, int cpu) 
	P(ttwu_count);

	P(ttwu_count);

	P(ttwu_local);

	P(ttwu_local);





	P(bkl_count);

	SEQ_printf(m, "  .%-30s: %d\n", "bkl_count",

				rq->rq_sched_info.bkl_count);





#undef P

#undef P

#undef P64

#endif

#endif

	spin_lock_irqsave(&sched_debug_lock, flags);

	spin_lock_irqsave(&sched_debug_lock, flags);

	print_cfs_stats(m, cpu);

	print_cfs_stats(m, cpu);