Skip to content

Commit 55627e3

Browse files
deggemanIngo Molnar
authored andcommitted
sched/core: Remove rq->cpu_load[]
The per rq load array values also disappear from the cpu#X sections in /proc/sched_debug. Signed-off-by: Dietmar Eggemann <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Acked-by: Rik van Riel <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Morten Rasmussen <[email protected]> Cc: Patrick Bellasi <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Quentin Perret <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Valentin Schneider <[email protected]> Cc: Vincent Guittot <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 3d8d535 commit 55627e3

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

kernel/sched/core.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5901,8 +5901,8 @@ DECLARE_PER_CPU(cpumask_var_t, select_idle_mask);
59015901

59025902
void __init sched_init(void)
59035903
{
5904-
int i, j;
59055904
unsigned long alloc_size = 0, ptr;
5905+
int i;
59065906

59075907
wait_bit_init();
59085908

@@ -6004,10 +6004,6 @@ void __init sched_init(void)
60046004
#ifdef CONFIG_RT_GROUP_SCHED
60056005
init_tg_rt_entry(&root_task_group, &rq->rt, NULL, i, NULL);
60066006
#endif
6007-
6008-
for (j = 0; j < CPU_LOAD_IDX_MAX; j++)
6009-
rq->cpu_load[j] = 0;
6010-
60116007
#ifdef CONFIG_SMP
60126008
rq->sd = NULL;
60136009
rq->rd = NULL;

kernel/sched/debug.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -654,11 +654,6 @@ do { \
654654
SEQ_printf(m, " .%-30s: %ld\n", "curr->pid", (long)(task_pid_nr(rq->curr)));
655655
PN(clock);
656656
PN(clock_task);
657-
P(cpu_load[0]);
658-
P(cpu_load[1]);
659-
P(cpu_load[2]);
660-
P(cpu_load[3]);
661-
P(cpu_load[4]);
662657
#undef P
663658
#undef PN
664659

kernel/sched/sched.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -812,8 +812,6 @@ struct rq {
812812
unsigned int nr_preferred_running;
813813
unsigned int numa_migrate_on;
814814
#endif
815-
#define CPU_LOAD_IDX_MAX 5
816-
unsigned long cpu_load[CPU_LOAD_IDX_MAX];
817815
#ifdef CONFIG_NO_HZ_COMMON
818816
#ifdef CONFIG_SMP
819817
unsigned long last_load_update_tick;

0 commit comments

Comments
 (0)