sched: fix compilation warning on !SMP
From: Hiroshi Shimamoto <[email protected]>
CC kernel/sched/fair.okernel/sched/fair.c:218:36: warning: 'max_load_balance_interval' defined but not used [-Wunused-variable]
--- kernel/sched/fair.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/fair.c +2 -2
@@ -215,8 +215,6 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight,const struct sched_class fair_sched_class; -static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; -/************************************************************** * CFS operations on generic schedulable entities: */
@@ -3086,6 +3084,8 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp* Fair scheduling class load-balancing methods: */ +static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; +/* * pull_task - move a task from a remote runqueue to the local runqueue. * Both runqueues must be locked.
Signature · 1 line
1.7.7.6
Vincent Guittot
maintainer2012/1/31 Hiroshi Shimamoto <[email protected]>:
Quoted 26 lines
From: Hiroshi Shimamoto <[email protected]>
CC kernel/sched/fair.o
kernel/sched/fair.c:218:36: warning: 'max_load_balance_interval' defined but not used [-Wunused-variable]Signed-off-by Hiroshi Shimamoto <[email protected]>CC Peter Zijlstra <[email protected]>CC Vincent Guittot <[email protected]>---
kernel/sched/fair.c | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)kernel/sched/fair.c +0
-2@@ -215,8 +215,6 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, const struct sched_class fair_sched_class; -static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; - /*************************************************************** CFS operations on generic schedulable entities: */
kernel/sched/fair.c static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp · line 3088
Quoted 5 lines
kernel/sched/fair.c +2
-0@@ -3086,6 +3084,8 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp* Fair scheduling class load-balancing methods: */ +static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; +
Sorry for moving it out of SMP. Thanks for fixing this
Quoted 6 lines
kernel/sched/fair.c +0
-1/** pull_task - move a task from a remote runqueue to the local runqueue. * Both runqueues must be locked. -- 1.7.7.6
Quoted 30 lines · Vincent Guittot
2012/1/31 Hiroshi Shimamoto <[email protected]>:
Quoted 29 lines
From: Hiroshi Shimamoto <[email protected]>
CC kernel/sched/fair.o
kernel/sched/fair.c:218:36: warning: 'max_load_balance_interval' defined but not used [-Wunused-variable]Signed-off-by Hiroshi Shimamoto <[email protected]>CC Peter Zijlstra <[email protected]>CC Vincent Guittot <[email protected]>---
kernel/sched/fair.c | 4 ++--1 files changed, 2 insertions(+), 2 deletions(-)kernel/sched/fair.c +0
-2@@ -215,8 +215,6 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, const struct sched_class fair_sched_class; -static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; - /*************************************************************** CFS operations on generic schedulable entities: */ @@ -3086,6 +3084,8 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp* Fair scheduling class load-balancing methods: */
Quoted 5 lines
kernel/sched/fair.c static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp · line 3088
Quoted 2 lines
kernel/sched/fair.c +2
-0+static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; +Sorry for moving it out of SMP. Thanks for fixing this
Quoted 6 lines
Quoted 6 lines
kernel/sched/fair.c +0
-1/** pull_task - move a task from a remote runqueue to the local runqueue. * Both runqueues must be locked. -- 1.7.7.6
[tip:sched/core] sched: Move SMP-only variable into the SMP section
In reply to Hiroshi ShimamotoCommit-ID: ed387b781ea6e14b78f449aa2ee4f270b60b01ac Gitweb: http://git.kernel.org/tip/ed387b781ea6e14b78f449aa2ee4f270b60b01ac Author: Hiroshi Shimamoto <[email protected]> AuthorDate: Tue, 31 Jan 2012 11:40:32 +0900 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 31 Jan 2012 13:40:59 +0100
sched: Move SMP-only variable into the SMP section
This also fixes the following compilation warning on !SMP:
CC kernel/sched/fair.o
kernel/sched/fair.c:218:36: warning: 'max_load_balance_interval' defined but not used [-Wunused-variable]
--- kernel/sched/fair.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/sched/fair.c +2 -2
@@ -215,8 +215,6 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight,const struct sched_class fair_sched_class; -static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; -/************************************************************** * CFS operations on generic schedulable entities: */
@@ -3086,6 +3084,8 @@ static bool yield_to_task_fair(struct rq *rq, struct task_struct *p, bool preemp* Fair scheduling class load-balancing methods: */ +static unsigned long __read_mostly max_load_balance_interval =HZ /10 ; +/* * pull_task - move a task from a remote runqueue to the local runqueue. * Both runqueues must be locked.