[PATCH] sched: replace rq->bkl_count with rq->rq_sched_info.bkl_count

Yong Zhang
2011-01-14T07:58:00Z

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: Yong Zhang <yong.zhang0@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
---
kernel/sched.c | 5 +----
kernel/sched_debug.c | 4 +++-
2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index ea3e5ef..3d6df21 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -553,9 +553,6 @@ struct rq {
/* try_to_wake_up() stats */
unsigned int ttwu_count;
unsigned int ttwu_local;
-
- /* BKL stats */
- unsigned int bkl_count;
#endif
};

@@ -3887,7 +3884,7 @@ static inline void schedule_debug(struct task_struct *prev)
schedstat_inc(this_rq(), sched_count);
#ifdef CONFIG_SCHEDSTATS
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);
}
#endif
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 1dfae3d..8ee0aa7 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -262,9 +262,11 @@ static void print_cpu(struct seq_file *m, int cpu)
P(ttwu_count);
P(ttwu_local);

- P(bkl_count);
+ SEQ_printf(m, " .%-30s: %d\n", "bkl_count",
+ rq->rq_sched_info.bkl_count);

#undef P
+#undef P64
#endif
print_cfs_stats(m, cpu);
print_rt_stats(m, cpu);
--
1.7.0.4